Migrates EffectShow and AssetManagement to generated rtiddsgen API
Converts accessor calls to plain member access across esc and asm services.
This commit is contained in:
39 files changed
+818
-818
No files matched your search
+47
-47
@@ -96,86 +96,86 @@ void AsmTests::setRequestData(AssetManagement::TrainingAreaModifyRequest &reques
|
||||
std::vector<AssetManagement::MapDescription> elevation_param;
|
||||
std::vector<AssetManagement::MapDescription> sceneObjects_param;
|
||||
|
||||
mapDescription.name("Topographic 01");
|
||||
mapDescription.description("Description_01");
|
||||
mapDescription.isDeleted(false);
|
||||
mapDescription.mapTypeId(AssetManagement::MapType_def::Topographic);
|
||||
mapDescription.mapDescriptionTypeId(AssetManagement::MapDescriptionType::Map2D);
|
||||
mapDescription.maxScale(20.0);
|
||||
mapDescription.minScale(0.5);
|
||||
mapDescription.name = "Topographic 01";
|
||||
mapDescription.description = "Description_01";
|
||||
mapDescription.isDeleted = false;
|
||||
mapDescription.mapTypeId = AssetManagement::MapType::Topographic;
|
||||
mapDescription.mapDescriptionTypeId = AssetManagement::MapDescriptionType::Map2D;
|
||||
mapDescription.maxScale = 20.0;
|
||||
mapDescription.minScale = 0.5;
|
||||
if (modId > 0)
|
||||
{
|
||||
mapDescription.trainingAreaId(modId);
|
||||
mapDescription.url("URL1 modified");
|
||||
mapDescription.trainingAreaId = modId;
|
||||
mapDescription.url = "URL1 modified";
|
||||
}
|
||||
else
|
||||
mapDescription.url("URL1 initial");
|
||||
mapDescription.url = "URL1 initial";
|
||||
|
||||
map2D_param.resize(2);
|
||||
map2D_param[0] = mapDescription;
|
||||
|
||||
mapDescription.name("Topographic 02");
|
||||
mapDescription.description("Description_02");
|
||||
mapDescription.name = "Topographic 02";
|
||||
mapDescription.description = "Description_02";
|
||||
if (modId > 0)
|
||||
{
|
||||
mapDescription.trainingAreaId(modId);
|
||||
mapDescription.url("URL2 modified");
|
||||
mapDescription.trainingAreaId = modId;
|
||||
mapDescription.url = "URL2 modified";
|
||||
}
|
||||
else
|
||||
mapDescription.url("URL2 initial");
|
||||
mapDescription.url = "URL2 initial";
|
||||
|
||||
map2D_param[1] = mapDescription;
|
||||
request.map2D(map2D_param);
|
||||
request.map2D = map2D_param;
|
||||
|
||||
scene3D_param.resize(1);
|
||||
mapDescription.mapTypeId(AssetManagement::MapType_def::Topographic);
|
||||
mapDescription.mapDescriptionTypeId(AssetManagement::MapDescriptionType::Scene3D);
|
||||
mapDescription.description("Description_03");
|
||||
mapDescription.name("Scene3D");
|
||||
mapDescription.mapTypeId = AssetManagement::MapType::Topographic;
|
||||
mapDescription.mapDescriptionTypeId = AssetManagement::MapDescriptionType::Scene3D;
|
||||
mapDescription.description = "Description_03";
|
||||
mapDescription.name = "Scene3D";
|
||||
if (modId > 0)
|
||||
{
|
||||
mapDescription.trainingAreaId(modId);
|
||||
mapDescription.url("URL3 modified");
|
||||
mapDescription.trainingAreaId = modId;
|
||||
mapDescription.url = "URL3 modified";
|
||||
}
|
||||
else
|
||||
mapDescription.url("URL3 initial");
|
||||
mapDescription.url = "URL3 initial";
|
||||
scene3D_param[0] = mapDescription;
|
||||
request.scene3D(scene3D_param);
|
||||
request.scene3D = scene3D_param;
|
||||
|
||||
if (modId == 0)
|
||||
{
|
||||
elevation_param.resize(1);
|
||||
mapDescription.mapTypeId(AssetManagement::MapType_def::Elevation);
|
||||
mapDescription.mapDescriptionTypeId(AssetManagement::MapDescriptionType::Elevation);
|
||||
mapDescription.url("URL4 initial");
|
||||
mapDescription.description("Description_04");
|
||||
mapDescription.name("Elevation");
|
||||
mapDescription.mapTypeId = AssetManagement::MapType::Elevation;
|
||||
mapDescription.mapDescriptionTypeId = AssetManagement::MapDescriptionType::Elevation;
|
||||
mapDescription.url = "URL4 initial";
|
||||
mapDescription.description = "Description_04";
|
||||
mapDescription.name = "Elevation";
|
||||
elevation_param[0] = mapDescription;
|
||||
request.elevation(elevation_param);
|
||||
request.elevation = elevation_param;
|
||||
|
||||
sceneObjects_param.resize(1);
|
||||
mapDescription.mapTypeId(AssetManagement::MapType_def::SceneObjects);
|
||||
mapDescription.mapDescriptionTypeId(AssetManagement::MapDescriptionType::SceneObj);
|
||||
mapDescription.url("URL5 initial");
|
||||
mapDescription.description("Description_05");
|
||||
mapDescription.name("SceneObjects");
|
||||
mapDescription.mapTypeId = AssetManagement::MapType::SceneObjects;
|
||||
mapDescription.mapDescriptionTypeId = AssetManagement::MapDescriptionType::SceneObj;
|
||||
mapDescription.url = "URL5 initial";
|
||||
mapDescription.description = "Description_05";
|
||||
mapDescription.name = "SceneObjects";
|
||||
sceneObjects_param[0] = mapDescription;
|
||||
request.sceneObjects(sceneObjects_param);
|
||||
request.sceneObjects = sceneObjects_param;
|
||||
|
||||
request.id(0);
|
||||
request.name("TestTrainingAreaCreate");
|
||||
request.bottomLeft(Core::GeoPosition2D(11.61/180*M_PI, 53.07/180*M_PI));
|
||||
request.height(100000);
|
||||
request.width(100000);
|
||||
request.image(imageVector);
|
||||
request.id = 0;
|
||||
request.name = "TestTrainingAreaCreate";
|
||||
request.bottomLeft = Core::GeoPosition2D(11.61/180*M_PI, 53.07/180*M_PI);
|
||||
request.height = 100000;
|
||||
request.width = 100000;
|
||||
request.image = imageVector;
|
||||
}
|
||||
else
|
||||
{
|
||||
request.id(m_trainingAreaId);
|
||||
request.name("TestTrainingAreaModified");
|
||||
request.bottomLeft(Core::GeoPosition2D(11.61/180*M_PI, 53.07/180*M_PI));
|
||||
request.height(140000);
|
||||
request.width(120000);
|
||||
request.id = m_trainingAreaId;
|
||||
request.name = "TestTrainingAreaModified";
|
||||
request.bottomLeft = Core::GeoPosition2D(11.61/180*M_PI, 53.07/180*M_PI);
|
||||
request.height = 140000;
|
||||
request.width = 120000;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user