Migrates InfrastructureManagement to generated rtiddsgen API

Converts accessor calls to plain member access across ism service.
This commit is contained in:
berrux-dev committed 2026-09-21 02:45:09 +02:00
1 parent 472f537313
commit 82356f23e5
30 files changed
+1322 -1314

No files matched your search

@@ -188,9 +188,9 @@ static void addElementToRequest(MainStructureElementModifyRequest &request,
const StructureElement &se,
int parentIdx)
{
const size_t size = request.elements().size();
request.elements().resize(size + 1, se);
request.childParentRelations().resize(size + 1, parentIdx);
const size_t size = request.elements.size();
request.elements.resize(size + 1, se);
request.childParentRelations.resize(size + 1, parentIdx);
}
// ************* MAIN STRUCTURE ELEMENT **********************************************
@@ -202,199 +202,199 @@ void IsmTests::tryCreateMainStructureElement()
MainStructureElementModifyRequest data;
// Building 56
data.name("Test Building");
data.name = "Test Building";
QJsonObject jsonObj;
jsonObj[QStringLiteral("street")] = QStringLiteral("Brueggeweg");
jsonObj[QStringLiteral("number")] = QStringLiteral("56");
// '{"street":"Brueggeweg", "number":"56"}'
QJsonDocument doc(jsonObj);
data.description(doc.toJson().toStdString());
data.angle(30.5);
data.modelId(1001);
data.externalWlsId(1001);
data.geoPosition().lon(0.1552736550);
data.geoPosition().lat(0.9259746511);
data.geoPosition().z(0.00);
data.properties("{}");
data.structureElementTypeId(InfrastructureManagement::StructureElementType::Building);
data.description = doc.toJson().toStdString();
data.angle = 30.5;
data.modelId = 1001;
data.externalWlsId = 1001;
data.geoPosition.lon = 0.1552736550;
data.geoPosition.lat = 0.9259746511;
data.geoPosition.z = 0.00;
data.properties = "{}";
data.structureElementTypeId = InfrastructureManagement::StructureElementType::Building;
StructureElement seData;
// element 1 & 2 -> see ParseBuildingXml::parseXmlInternal()
// building, idx = 0
seData.name("Test Building");
seData.displayName("Building 56");
seData.structureElementTypeId(InfrastructureManagement::StructureElementType::Building);
seData.relPosition().offsetX(0);
seData.relPosition().offsetY(0);
seData.relPosition().offsetZ(0);
seData.mountingPointTypeId(InfrastructureManagement::MountingPointType::Unknown);
seData.properties("{\"description\":\"Info Test Building\"}");
seData.name = "Test Building";
seData.displayName = "Building 56";
seData.structureElementTypeId = InfrastructureManagement::StructureElementType::Building;
seData.relPosition.offsetX = 0;
seData.relPosition.offsetY = 0;
seData.relPosition.offsetZ = 0;
seData.mountingPointTypeId = InfrastructureManagement::MountingPointType::Unknown;
seData.properties = "{\"description\":\"Info Test Building\"}";
addElementToRequest(data, seData, -1); // root element has no parent
// building mounting point, idx = 1
seData.name("Test Building - Mounting Point");
seData.displayName("Building 56 - MP");
seData.structureElementTypeId(InfrastructureManagement::StructureElementType::MountingPoint);
seData.barcode("4711");
seData.relPosition().offsetX(0);
seData.relPosition().offsetY(0);
seData.relPosition().offsetZ(0);
seData.mountingPointTypeId(InfrastructureManagement::MountingPointType::BuildingControlUnit);
seData.properties("{\"description\":\"Info Test Mounting Point\"}");
seData.name = "Test Building - Mounting Point";
seData.displayName = "Building 56 - MP";
seData.structureElementTypeId = InfrastructureManagement::StructureElementType::MountingPoint;
seData.barcode = "4711";
seData.relPosition.offsetX = 0;
seData.relPosition.offsetY = 0;
seData.relPosition.offsetZ = 0;
seData.mountingPointTypeId = InfrastructureManagement::MountingPointType::BuildingControlUnit;
seData.properties = "{\"description\":\"Info Test Mounting Point\"}";
addElementToRequest(data, seData, 0);
// Floor 1, idx = 1
seData.name("Floor 01");
seData.displayName("Floor 1");
seData.structureElementTypeId(InfrastructureManagement::StructureElementType::Floor); // type floor
seData.barcode("123xxxx");
seData.relPosition().offsetX(70000);
seData.relPosition().offsetY(90000);
seData.relPosition().offsetZ(10);
seData.mountingPointTypeId(InfrastructureManagement::MountingPointType::Unknown);
seData.orientation(Core::Orientation(0, 0, 0));
seData.properties("{\"description\":\"Info-Building-56-Floor-01\"}");
seData.name = "Floor 01";
seData.displayName = "Floor 1";
seData.structureElementTypeId = InfrastructureManagement::StructureElementType::Floor; // type floor
seData.barcode = "123xxxx";
seData.relPosition.offsetX = 70000;
seData.relPosition.offsetY = 90000;
seData.relPosition.offsetZ = 10;
seData.mountingPointTypeId = InfrastructureManagement::MountingPointType::Unknown;
seData.orientation = Core::Orientation(0, 0, 0);
seData.properties = "{\"description\":\"Info-Building-56-Floor-01\"}";
addElementToRequest(data, seData, 0);
// Floor 2, idx = 2
seData.name("Floor 02");
seData.displayName("Floor 2");
seData.structureElementTypeId(InfrastructureManagement::StructureElementType::Floor); // type floor
seData.barcode("123xxxx");
seData.relPosition().offsetX(70000);
seData.relPosition().offsetY(90000);
seData.relPosition().offsetZ(10);
seData.mountingPointTypeId(InfrastructureManagement::MountingPointType::Unknown);
seData.orientation(Core::Orientation(0, 0, 0));
seData.properties("{\"description\":\"Info-Building-56-Floor-02\"}");
seData.name = "Floor 02";
seData.displayName = "Floor 2";
seData.structureElementTypeId = InfrastructureManagement::StructureElementType::Floor; // type floor
seData.barcode = "123xxxx";
seData.relPosition.offsetX = 70000;
seData.relPosition.offsetY = 90000;
seData.relPosition.offsetZ = 10;
seData.mountingPointTypeId = InfrastructureManagement::MountingPointType::Unknown;
seData.orientation = Core::Orientation(0, 0, 0);
seData.properties = "{\"description\":\"Info-Building-56-Floor-02\"}";
addElementToRequest(data, seData, 0);
// Room 01-01, idx = 3
seData.name("Room 01");
seData.displayName("Room 01");
seData.structureElementTypeId(InfrastructureManagement::StructureElementType::Room); // type room
seData.barcode("123xxxx");
seData.relPosition().offsetX(70000);
seData.relPosition().offsetY(90000);
seData.relPosition().offsetZ(10);
seData.mountingPointTypeId(InfrastructureManagement::MountingPointType::Unknown);
seData.orientation(Core::Orientation(0, 0, 0));
seData.properties("{\"description\":\"Info-Building-56-Floor-01-Room-01\"}");
seData.name = "Room 01";
seData.displayName = "Room 01";
seData.structureElementTypeId = InfrastructureManagement::StructureElementType::Room; // type room
seData.barcode = "123xxxx";
seData.relPosition.offsetX = 70000;
seData.relPosition.offsetY = 90000;
seData.relPosition.offsetZ = 10;
seData.mountingPointTypeId = InfrastructureManagement::MountingPointType::Unknown;
seData.orientation = Core::Orientation(0, 0, 0);
seData.properties = "{\"description\":\"Info-Building-56-Floor-01-Room-01\"}";
addElementToRequest(data, seData, 1);
// Room 01-02, idx = 4
seData.name("Room 02");
seData.displayName("Room 02");
seData.structureElementTypeId(InfrastructureManagement::StructureElementType::Room); // type room
seData.barcode("123xxxx");
seData.relPosition().offsetX(70000);
seData.relPosition().offsetY(90000);
seData.relPosition().offsetZ(10);
seData.mountingPointTypeId(InfrastructureManagement::MountingPointType::Unknown);
seData.orientation(Core::Orientation(0, 0, 0));
seData.properties("{\"description\":\"Info-Building-56-Floor-01-Room-02\"}");
seData.name = "Room 02";
seData.displayName = "Room 02";
seData.structureElementTypeId = InfrastructureManagement::StructureElementType::Room; // type room
seData.barcode = "123xxxx";
seData.relPosition.offsetX = 70000;
seData.relPosition.offsetY = 90000;
seData.relPosition.offsetZ = 10;
seData.mountingPointTypeId = InfrastructureManagement::MountingPointType::Unknown;
seData.orientation = Core::Orientation(0, 0, 0);
seData.properties = "{\"description\":\"Info-Building-56-Floor-01-Room-02\"}";
addElementToRequest(data, seData, 1);
// Room 02-01, idx = 5
seData.name("Room 01");
seData.displayName("Room 01");
seData.structureElementTypeId(InfrastructureManagement::StructureElementType::Room); // type room
seData.barcode("123xxxx");
seData.relPosition().offsetX(70000);
seData.relPosition().offsetY(90000);
seData.relPosition().offsetZ(10);
seData.mountingPointTypeId(InfrastructureManagement::MountingPointType::Unknown);
seData.orientation(Core::Orientation(0, 0, 0));
seData.properties("{\"description\":\"Info-Building-56-Floor-02-Room-01\"}");
seData.name = "Room 01";
seData.displayName = "Room 01";
seData.structureElementTypeId = InfrastructureManagement::StructureElementType::Room; // type room
seData.barcode = "123xxxx";
seData.relPosition.offsetX = 70000;
seData.relPosition.offsetY = 90000;
seData.relPosition.offsetZ = 10;
seData.mountingPointTypeId = InfrastructureManagement::MountingPointType::Unknown;
seData.orientation = Core::Orientation(0, 0, 0);
seData.properties = "{\"description\":\"Info-Building-56-Floor-02-Room-01\"}";
addElementToRequest(data, seData, 2);
// Room 02-02, idx = 6
seData.name("Room 02");
seData.displayName("Room 02");
seData.structureElementTypeId(InfrastructureManagement::StructureElementType::Room); // type room
seData.barcode("123xxxx");
seData.relPosition().offsetX(70000);
seData.relPosition().offsetY(90000);
seData.relPosition().offsetZ(10);
seData.mountingPointTypeId(InfrastructureManagement::MountingPointType::Unknown);
seData.orientation(Core::Orientation(0, 0, 0));
seData.properties("{\"description\":\"Info-Building-56-Floor-02-Room-02\"}");
seData.name = "Room 02";
seData.displayName = "Room 02";
seData.structureElementTypeId = InfrastructureManagement::StructureElementType::Room; // type room
seData.barcode = "123xxxx";
seData.relPosition.offsetX = 70000;
seData.relPosition.offsetY = 90000;
seData.relPosition.offsetZ = 10;
seData.mountingPointTypeId = InfrastructureManagement::MountingPointType::Unknown;
seData.orientation = Core::Orientation(0, 0, 0);
seData.properties = "{\"description\":\"Info-Building-56-Floor-02-Room-02\"}";
addElementToRequest(data, seData, 2);
// Mounting Point 01-01-01
seData.name("Mounting Point 56-01-01-01");
seData.displayName("MP 1");
seData.structureElementTypeId(InfrastructureManagement::StructureElementType::MountingPoint); // type mounting point
seData.barcode("123xxxx");
seData.relPosition().offsetX(70000);
seData.relPosition().offsetY(90000);
seData.relPosition().offsetZ(10);
seData.mountingPointTypeId(InfrastructureManagement::MountingPointType::IndoorCamera);
seData.orientation(Core::Orientation(0, 0, 0));
seData.properties("{\"description\":\"Info-Building-56-Floor-01-Room-01-MP-01\"}");
seData.name = "Mounting Point 56-01-01-01";
seData.displayName = "MP 1";
seData.structureElementTypeId = InfrastructureManagement::StructureElementType::MountingPoint; // type mounting point
seData.barcode = "123xxxx";
seData.relPosition.offsetX = 70000;
seData.relPosition.offsetY = 90000;
seData.relPosition.offsetZ = 10;
seData.mountingPointTypeId = InfrastructureManagement::MountingPointType::IndoorCamera;
seData.orientation = Core::Orientation(0, 0, 0);
seData.properties = "{\"description\":\"Info-Building-56-Floor-01-Room-01-MP-01\"}";
addElementToRequest(data, seData, 3);
// Mounting Point 01-01-02
seData.name("Mounting Point 56-01-01-02");
seData.displayName("MP 2");
seData.structureElementTypeId(InfrastructureManagement::StructureElementType::MountingPoint); // type mounting point
seData.barcode("123xxxx");
seData.relPosition().offsetX(70000);
seData.relPosition().offsetY(90000);
seData.relPosition().offsetZ(10);
seData.mountingPointTypeId(InfrastructureManagement::MountingPointType::IndoorCamera);
seData.orientation(Core::Orientation(0, 0, 0));
seData.properties("{\"description\":\"Info-Building-56-Floor-01-Room-01-MP-02\"}");
seData.name = "Mounting Point 56-01-01-02";
seData.displayName = "MP 2";
seData.structureElementTypeId = InfrastructureManagement::StructureElementType::MountingPoint; // type mounting point
seData.barcode = "123xxxx";
seData.relPosition.offsetX = 70000;
seData.relPosition.offsetY = 90000;
seData.relPosition.offsetZ = 10;
seData.mountingPointTypeId = InfrastructureManagement::MountingPointType::IndoorCamera;
seData.orientation = Core::Orientation(0, 0, 0);
seData.properties = "{\"description\":\"Info-Building-56-Floor-01-Room-01-MP-02\"}";
addElementToRequest(data, seData, 3);
// Mounting Point 01-02-01
seData.name("Mounting Point 56-01-02-01");
seData.displayName("MP 3");
seData.structureElementTypeId(InfrastructureManagement::StructureElementType::MountingPoint); // type mounting point
seData.barcode("123xxxx");
seData.relPosition().offsetX(70000);
seData.relPosition().offsetY(90000);
seData.relPosition().offsetZ(10);
seData.mountingPointTypeId(InfrastructureManagement::MountingPointType::IndoorCamera);
seData.orientation(Core::Orientation(0, 0, 0));
seData.properties("{\"description\":\"Info-Building-56-Floor-01-Room-02-MP-01\"}");
seData.name = "Mounting Point 56-01-02-01";
seData.displayName = "MP 3";
seData.structureElementTypeId = InfrastructureManagement::StructureElementType::MountingPoint; // type mounting point
seData.barcode = "123xxxx";
seData.relPosition.offsetX = 70000;
seData.relPosition.offsetY = 90000;
seData.relPosition.offsetZ = 10;
seData.mountingPointTypeId = InfrastructureManagement::MountingPointType::IndoorCamera;
seData.orientation = Core::Orientation(0, 0, 0);
seData.properties = "{\"description\":\"Info-Building-56-Floor-01-Room-02-MP-01\"}";
addElementToRequest(data, seData, 4);
// Mounting Point 01-02-02
seData.name("Mounting Point 56-01-02-02");
seData.displayName("MP 4");
seData.structureElementTypeId(InfrastructureManagement::StructureElementType::MountingPoint); // type mounting point
seData.barcode("123xxxx");
seData.relPosition().offsetX(70000);
seData.relPosition().offsetY(90000);
seData.relPosition().offsetZ(10);
seData.mountingPointTypeId(InfrastructureManagement::MountingPointType::IndoorCamera);
seData.orientation(Core::Orientation(0, 0, 0));
seData.properties("{\"description\":\"Info-Building-56-Floor-01-Room-02-MP-02\"}");
seData.name = "Mounting Point 56-01-02-02";
seData.displayName = "MP 4";
seData.structureElementTypeId = InfrastructureManagement::StructureElementType::MountingPoint; // type mounting point
seData.barcode = "123xxxx";
seData.relPosition.offsetX = 70000;
seData.relPosition.offsetY = 90000;
seData.relPosition.offsetZ = 10;
seData.mountingPointTypeId = InfrastructureManagement::MountingPointType::IndoorCamera;
seData.orientation = Core::Orientation(0, 0, 0);
seData.properties = "{\"description\":\"Info-Building-56-Floor-01-Room-02-MP-02\"}";
addElementToRequest(data, seData, 4);
// mounting point building central unit
seData.name("Test MP Building");
seData.displayName("MP 5");
seData.structureElementTypeId(InfrastructureManagement::StructureElementType::MountingPoint);
seData.barcode("4711");
seData.relPosition().offsetX(0);
seData.relPosition().offsetY(0);
seData.relPosition().offsetZ(0);
seData.mountingPointTypeId(InfrastructureManagement::MountingPointType::BuildingControlUnit);
seData.properties("{\"description\":\"Info MP Test Building\"}");
seData.name = "Test MP Building";
seData.displayName = "MP 5";
seData.structureElementTypeId = InfrastructureManagement::StructureElementType::MountingPoint;
seData.barcode = "4711";
seData.relPosition.offsetX = 0;
seData.relPosition.offsetY = 0;
seData.relPosition.offsetZ = 0;
seData.mountingPointTypeId = InfrastructureManagement::MountingPointType::BuildingControlUnit;
seData.properties = "{\"description\":\"Info MP Test Building\"}";
addElementToRequest(data, seData, 0);
@@ -404,38 +404,38 @@ void IsmTests::tryCreateMainStructureElement()
elements.resize(4);
// index 1
feData.id(1);
feData.relPosition().offsetX(0);
feData.relPosition().offsetY(0);
feData.relPosition().offsetZ(0);
feData.id = 1;
feData.relPosition.offsetX = 0;
feData.relPosition.offsetY = 0;
feData.relPosition.offsetZ = 0;
elements[0] = feData;
// index 2
feData.id(2);
feData.relPosition().offsetX(9.11999988555908);
feData.relPosition().offsetY(0);
feData.relPosition().offsetZ(0);
feData.id = 2;
feData.relPosition.offsetX = 9.11999988555908;
feData.relPosition.offsetY = 0;
feData.relPosition.offsetZ = 0;
elements[1] = feData;
// index 3
feData.id(3);
feData.relPosition().offsetX(9.11999988555908);
feData.relPosition().offsetY(9.02999973297119);
feData.relPosition().offsetZ(0);
feData.id = 3;
feData.relPosition.offsetX = 9.11999988555908;
feData.relPosition.offsetY = 9.02999973297119;
feData.relPosition.offsetZ = 0;
elements[2] = feData;
// index 4
feData.id(4);
feData.relPosition().offsetX(0);
feData.relPosition().offsetY(9.02999973297119);
feData.relPosition().offsetZ(0);
feData.id = 4;
feData.relPosition.offsetX = 0;
feData.relPosition.offsetY = 9.02999973297119;
feData.relPosition.offsetZ = 0;
elements[3] = feData;
data.footprint(elements);
data.footprint = elements;
QByteArray vmTest;
vmTest += "bla-bla-bla";
@@ -458,28 +458,28 @@ void IsmTests::tryModifyMainStructureElement()
InfrastructureManagement::MainStructureElement mse = m_dtc->mainStructureElement(m_mainStructureElementId);
InfrastructureManagement::MainStructureElementModifyRequest data;
if (mse.id() == 0)
if (mse.id == 0)
{
ERROR_LOG(m_logger) << "Error requesting modify data";
failExit();
}
DEBUG_LOG(m_logger) << "Modify MainStructureElement with id = " << mse.id();
DEBUG_LOG(m_logger) << "Modify MainStructureElement with id = " << mse.id;
// creating ModifyRequest
data.id(mse.id());
data.name(mse.name());
data.description(mse.description());
data.angle(mse.angle());
data.modelId(mse.modelId());
data.externalWlsId(mse.externalWlsId());
data.geoPosition(mse.geoPosition());
data.elements(mse.elements());
data.properties(mse.properties());
data.structureElementTypeId(mse.structureElementTypeId());
data.id = mse.id;
data.name = mse.name;
data.description = mse.description;
data.angle = mse.angle;
data.modelId = mse.modelId;
data.externalWlsId = mse.externalWlsId;
data.geoPosition = mse.geoPosition;
data.elements = mse.elements;
data.properties = mse.properties;
data.structureElementTypeId = mse.structureElementTypeId;
// changing MSE name
data.name("TestBuilding-Updated");
data.name = "TestBuilding-Updated";
m_replyFinished = false;
if (!m_ftc->mainStructureElementModifyRequest(data, this))
@@ -494,16 +494,16 @@ void IsmTests::tryModifyMainStructureElement()
InfrastructureManagement::StructureElement se;
InfrastructureManagement::StructureElementModifyRequest seData;
seData.mainStructureElementId(mse.id());
seData.elements().reserve(mse.elements().size());
seData.mainStructureElementId = mse.id;
seData.elements.reserve(mse.elements.size());
for (size_t i = 0; i < mse.elements().size(); ++i)
for (size_t i = 0; i < mse.elements.size(); ++i)
{
se = mse.elements().at(i);
DEBUG_LOG(m_logger) << "Updating barcode for element (" << i << ") with old barcode = " << se.barcode();
se = mse.elements.at(i);
DEBUG_LOG(m_logger) << "Updating barcode for element (" << i << ") with old barcode = " << se.barcode;
se.barcode("BARCODE");
seData.elements().push_back(se);
se.barcode = "BARCODE";
seData.elements.push_back(se);
}
if (!m_ftc->structureElementModifyRequest(seData, this))
@@ -523,7 +523,7 @@ void IsmTests::tryRemoveMainStructureElement()
m_dtc->waitForHistoricalDataMainStructureElement();
InfrastructureManagement::MainStructureElement mse = m_dtc->mainStructureElement(m_mainStructureElementId);
if (mse.id() == 0)
if (mse.id == 0)
{
ERROR_LOG(m_logger) << "Cannot find main structure element with id = " << m_mainStructureElementId;
failExit();
@@ -545,30 +545,30 @@ void IsmTests::tryCreateBridge()
MainStructureElementModifyRequest data;
data.name("Test Bridge");
data.name = "Test Bridge";
QJsonObject jsonObj;
jsonObj[QStringLiteral("bridgeStatus")] = 0;
// '{"bridgeStatus":0}'
QJsonDocument doc(jsonObj);
data.properties(doc.toJson().toStdString());
data.angle(30.5);
data.modelId(0);
data.externalWlsId(0);
data.geoPosition().lon(0.1552736550);
data.geoPosition().lat(0.9259746511);
data.geoPosition().z(0.00);
data.description("{}");
data.structureElementTypeId(InfrastructureManagement::StructureElementType::Bridge);
data.properties = doc.toJson().toStdString();
data.angle = 30.5;
data.modelId = 0;
data.externalWlsId = 0;
data.geoPosition.lon = 0.1552736550;
data.geoPosition.lat = 0.9259746511;
data.geoPosition.z = 0.00;
data.description = "{}";
data.structureElementTypeId = InfrastructureManagement::StructureElementType::Bridge;
StructureElement seData;
seData.name("Test Bridge");
seData.displayName("Bridge 001");
seData.structureElementTypeId(InfrastructureManagement::StructureElementType::Bridge);
seData.relPosition().offsetX(0);
seData.relPosition().offsetY(0);
seData.relPosition().offsetZ(0);
seData.mountingPointTypeId(InfrastructureManagement::MountingPointType::Unknown);
seData.properties("{\"description\":\"Info Test Bridge\"}");
seData.name = "Test Bridge";
seData.displayName = "Bridge 001";
seData.structureElementTypeId = InfrastructureManagement::StructureElementType::Bridge;
seData.relPosition.offsetX = 0;
seData.relPosition.offsetY = 0;
seData.relPosition.offsetZ = 0;
seData.mountingPointTypeId = InfrastructureManagement::MountingPointType::Unknown;
seData.properties = "{\"description\":\"Info Test Bridge\"}";
addElementToRequest(data, seData, -1); // root element has no parent
@@ -590,20 +590,20 @@ void IsmTests::tryChangeBridgeStatus()
InfrastructureManagement::MainStructureElement mse = m_dtc->mainStructureElement(m_mainStructureElementId);
InfrastructureManagement::MainStructureElementModifyBridgeStatusRequest data;
if (mse.id() == 0)
if (mse.id == 0)
{
ERROR_LOG(m_logger) << "Error requesting modify data";
failExit();
}
DEBUG_LOG(m_logger) << "Modify MainStructureElement with id = " << mse.id();
DEBUG_LOG(m_logger) << "Modify MainStructureElement with id = " << mse.id;
// creating ModifyRequest
data.id(mse.id());
data.id = mse.id;
if (m_dtc->getBridgeStatus(m_mainStructureElementId) == BridgeStatus::Intact)
data.status(BridgeStatus::Broken);
data.status = BridgeStatus::Broken;
else
data.status(BridgeStatus::Intact);
data.status = BridgeStatus::Intact;
m_replyFinished = false;
if (!m_ftc->mainStructureElementModifyBridgeStatusRequest(data, this))
@@ -626,10 +626,10 @@ void IsmTests::tryCreateAsset()
InstrumentationAssetModifyRequest data;
data.name("Camera-01");
data.mountingPointTypeId(InfrastructureManagement::MountingPointType::IndoorCamera);
data.barcode("1");
data.properties("{\"description\":\"Info-Camera-01\"}");
data.name = "Camera-01";
data.mountingPointTypeId = InfrastructureManagement::MountingPointType::IndoorCamera;
data.barcode = "1";
data.properties = "{\"description\":\"Info-Camera-01\"}";
if (!m_ftc->instrumentationAssetModifyRequest(data, this))
{
@@ -639,10 +639,10 @@ void IsmTests::tryCreateAsset()
QTest::qWait(1000);
data.name("Camera-02");
data.barcode("2");
data.mountingPointTypeId(InfrastructureManagement::MountingPointType::IndoorCamera);
data.properties("{\"description\":\"Info-Camera-02\"}");
data.name = "Camera-02";
data.barcode = "2";
data.mountingPointTypeId = InfrastructureManagement::MountingPointType::IndoorCamera;
data.properties = "{\"description\":\"Info-Camera-02\"}";
if (!m_ftc->instrumentationAssetModifyRequest(data, this))
{
@@ -652,10 +652,10 @@ void IsmTests::tryCreateAsset()
QTest::qWait(1000);
data.name("Camera-03");
data.barcode("3");
data.mountingPointTypeId(InfrastructureManagement::MountingPointType::MeteoDataUnit);
data.properties("{\"description\":\"Info-Camera-03\"}");
data.name = "Camera-03";
data.barcode = "3";
data.mountingPointTypeId = InfrastructureManagement::MountingPointType::MeteoDataUnit;
data.properties = "{\"description\":\"Info-Camera-03\"}";
if (!m_ftc->instrumentationAssetModifyRequest(data, this))
{
@@ -665,10 +665,10 @@ void IsmTests::tryCreateAsset()
QTest::qWait(1000);
data.name("Camera-04");
data.barcode("4");
data.mountingPointTypeId(InfrastructureManagement::MountingPointType::MeteoDataUnit);
data.properties("{\"description\":\"Info-Camera-03\"}");
data.name = "Camera-04";
data.barcode = "4";
data.mountingPointTypeId = InfrastructureManagement::MountingPointType::MeteoDataUnit;
data.properties = "{\"description\":\"Info-Camera-03\"}";
if (!m_ftc->instrumentationAssetModifyRequest(data, this))
{
@@ -692,25 +692,25 @@ void IsmTests::tryModifyAsset()
// const InfrastructureManagement::InstrumentationAsset &ast1 = m_dtc->instrumentationAssets()[m_assetId];
InfrastructureManagement::InstrumentationAssetModifyRequest data;
DEBUG_LOG(m_logger) << "ast.id() = " << ast.id();
DEBUG_LOG(m_logger) << "ast.id() = " << ast.id;
// DEBUG_LOG(m_logger) << "ast1.id() = " << ast1.id();
if (ast.id() == 0)
if (ast.id == 0)
{
ERROR_LOG(m_logger) << "Cannot find Asset Id = " << m_assetId;
failExit();
}
else
{
data.id(ast.id());
data.name(ast.name());
data.barcode(ast.barcode());
data.mountingPointTypeId(ast.mountingPointTypeId());
data.instrumentationAssetStateId(ast.assetStateId());
data.properties(ast.properties());
data.id = ast.id;
data.name = ast.name;
data.barcode = ast.barcode;
data.mountingPointTypeId = ast.mountingPointTypeId;
data.instrumentationAssetStateId = ast.assetStateId;
data.properties = ast.properties;
// changing only name
data.name("Asset-Updated");
data.name = "Asset-Updated";
if (!m_ftc->instrumentationAssetModifyRequest(InstrumentationAssetModifyRequest(data), this))
{
@@ -730,7 +730,7 @@ void IsmTests::tryRemoveAsset()
m_dtc->waitForHistoricalDataInstrumentationAsset();
const InfrastructureManagement::InstrumentationAsset &ast = m_dtc->instrumentationAsset(m_assetId);
if (ast.id() == 0)
if (ast.id == 0)
{
ERROR_LOG(m_logger) << "Cannot find Asset Id = " << m_assetId;
failExit();
@@ -756,18 +756,18 @@ void IsmTests::tryUnmountAsset()
// const InfrastructureManagement::InstrumentationAsset &ast1 = m_dtc->instrumentationAssets()[m_assetId];
InfrastructureManagement::InstrumentationAssetSetStateRequest data;
DEBUG_LOG(m_logger) << "ast.id() = " << ast.id();
DEBUG_LOG(m_logger) << "ast.id() = " << ast.id;
// DEBUG_LOG(m_logger) << "ast1.id() = " << ast1.id();
if (ast.id() == 0)
if (ast.id == 0)
{
ERROR_LOG(m_logger) << "Cannot find Asset Id = " << m_assetId;
failExit();
}
else
{
data.id(ast.id());
data.instrumentationAssetStateId(InstrumentationAssetState::Unmounted);
data.id = ast.id;
data.instrumentationAssetStateId = InstrumentationAssetState::Unmounted;
if (!m_ftc->instrumentationAssetSetStateRequest(InstrumentationAssetSetStateRequest(data), this))
{
@@ -787,9 +787,9 @@ void IsmTests::tryCreateMountingPointAsset()
MountingPointAssetModifyRequest data;
data.assetId(m_assetId);
data.structureElementId(m_structureElementId);
data.lastUpdated(QDateTime::currentMSecsSinceEpoch());
data.assetId = m_assetId;
data.structureElementId = m_structureElementId;
data.lastUpdated = QDateTime::currentMSecsSinceEpoch();
if (!m_ftc->mountingPointAssetModifyRequest(data, this))
{
@@ -831,14 +831,14 @@ void IsmTests::tryCreateMainSchedule()
MainScheduleModifyRequest data0, data1, data2;
data1.id(0); // to be inserted
data1.name("Instrumentation Plan 1 (ex 42)");
data1.exerciseId(42);
data1.statusId(InfrastructureManagement::ScheduleStatus::Inactive);
data1.timeCreated(10000000);
data1.timeStart(12000000);
data1.timeEnd( 13000000);
data1.description("Info-Main-Schedule-01");
data1.id = 0; // to be inserted
data1.name = "Instrumentation Plan 1 (ex 42)";
data1.exerciseId = 42;
data1.statusId = InfrastructureManagement::ScheduleStatus::Inactive;
data1.timeCreated = 10000000;
data1.timeStart = 12000000;
data1.timeEnd = 13000000;
data1.description = "Info-Main-Schedule-01";
if (!m_ftc->mainScheduleModifyRequest(data1, this))
{
@@ -848,14 +848,14 @@ void IsmTests::tryCreateMainSchedule()
QTest::qWait(1000);
data2.id(0); // to be inserted
data2.name("Instrumentation Plan 2 (ex 42)");
data2.exerciseId(42);
data2.statusId(InfrastructureManagement::ScheduleStatus::Inactive);
data2.timeCreated(14000000);
data2.timeStart(16000000);
data2.timeEnd( 17000000);
data2.description("Info-Main-Schedule-02");
data2.id = 0; // to be inserted
data2.name = "Instrumentation Plan 2 (ex 42)";
data2.exerciseId = 42;
data2.statusId = InfrastructureManagement::ScheduleStatus::Inactive;
data2.timeCreated = 14000000;
data2.timeStart = 16000000;
data2.timeEnd = 17000000;
data2.description = "Info-Main-Schedule-02";
if (!m_ftc->mainScheduleModifyRequest(data2, this))
{
@@ -865,13 +865,13 @@ void IsmTests::tryCreateMainSchedule()
QTest::qWait(1000);
data0.id(0); // to be inserted
data0.name("No exercise");
data0.statusId(InfrastructureManagement::ScheduleStatus::Active);
data0.timeCreated(14000000);
data0.timeStart(15000000);
data0.timeEnd( 19000000);
data0.description("Info-Main-Schedule-03");
data0.id = 0; // to be inserted
data0.name = "No exercise";
data0.statusId = InfrastructureManagement::ScheduleStatus::Active;
data0.timeCreated = 14000000;
data0.timeStart = 15000000;
data0.timeEnd = 19000000;
data0.description = "Info-Main-Schedule-03";
if (!m_ftc->mainScheduleModifyRequest(data0, this))
{
@@ -894,22 +894,22 @@ void IsmTests::tryModifyMainSchedule()
DEBUG_LOG(m_logger) << "m_assetId = " << m_assetId;
DEBUG_LOG(m_logger) << "ast.id() = " << ast.id();
DEBUG_LOG(m_logger) << "ast.id() = " << ast.id;
// creating ModifyRequest
if (ast.id() > 0)
if (ast.id > 0)
{
data.id(ast.id());
data.name(ast.name());
data.statusId(ast.statusId());
data.exerciseId(ast.exerciseId());
data.timeCreated(ast.timeCreated());
data.timeStart(ast.timeStart());
data.timeEnd(ast.timeEnd());
data.description(ast.description());
data.id = ast.id;
data.name = ast.name;
data.statusId = ast.statusId;
data.exerciseId = ast.exerciseId;
data.timeCreated = ast.timeCreated;
data.timeStart = ast.timeStart;
data.timeEnd = ast.timeEnd;
data.description = ast.description;
// changing name
data.name("MPS-Updated");
data.name = "MPS-Updated";
if (!m_ftc->mainScheduleModifyRequest(MainScheduleModifyRequest(data), this))
{
@@ -937,35 +937,35 @@ void IsmTests::tryChangeStatusSchedule()
DEBUG_LOG(m_logger) << "m_assetId = " << m_assetId;
DEBUG_LOG(m_logger) << "ast.id() = " << ast.id();
DEBUG_LOG(m_logger) << "ast.id() = " << ast.id;
// creating ModifyRequest
if (ast.id() > 0)
if (ast.id > 0)
{
data.id(ast.id());
data.name(ast.name());
data.statusId(ast.statusId());
data.exerciseId(ast.exerciseId());
data.timeCreated(ast.timeCreated());
data.timeStart(ast.timeStart());
data.timeEnd(ast.timeEnd());
data.description(ast.description());
data.id = ast.id;
data.name = ast.name;
data.statusId = ast.statusId;
data.exerciseId = ast.exerciseId;
data.timeCreated = ast.timeCreated;
data.timeStart = ast.timeStart;
data.timeEnd = ast.timeEnd;
data.description = ast.description;
// changing name and status
switch (data.statusId().underlying())
switch (data.statusId)
{
case InfrastructureManagement::ScheduleStatus::Inactive:
{
data.name("MPS-UpdatedStatus-Activated");
data.statusId(InfrastructureManagement::ScheduleStatus::Active);
data.timeStart(QDateTime::currentMSecsSinceEpoch());
data.name = "MPS-UpdatedStatus-Activated";
data.statusId = InfrastructureManagement::ScheduleStatus::Active;
data.timeStart = QDateTime::currentMSecsSinceEpoch();
break;
}
case InfrastructureManagement::ScheduleStatus::Active:
{
data.name("MPS-UpdatedStatus-Inactivated");
data.statusId(InfrastructureManagement::ScheduleStatus::Inactive);
data.timeEnd(QDateTime::currentMSecsSinceEpoch());
data.name = "MPS-UpdatedStatus-Inactivated";
data.statusId = InfrastructureManagement::ScheduleStatus::Inactive;
data.timeEnd = QDateTime::currentMSecsSinceEpoch();
break;
}
default:
@@ -994,7 +994,7 @@ void IsmTests::tryRemoveMainSchedule()
m_dtc->waitForHistoricalDataMainSchedule();
InfrastructureManagement::MainSchedule ast = m_dtc->mainSchedule(m_assetId);
if (ast.id() == 0)
if (ast.id == 0)
{
ERROR_LOG(m_logger) << "Cannot find main schedule id = " << m_assetId;
failExit();
@@ -1018,9 +1018,9 @@ void IsmTests::tryCopySchedule()
InfrastructureManagement::MainSchedule ms = m_dtc->mainSchedule(m_assetId);
DEBUG_LOG(m_logger) << "scheduleId = " << m_assetId;
DEBUG_LOG(m_logger) << "ms.id() = " << ms.id();
DEBUG_LOG(m_logger) << "ms.id() = " << ms.id;
int newId = m_db->copySchedule(ms.id());
int newId = m_db->copySchedule(ms.id);
if (newId <= 0)
{
@@ -1042,7 +1042,7 @@ void IsmTests::checkSchedule()
InfrastructureManagement::MainSchedule ms = m_dtc->mainSchedule(m_assetId);
DEBUG_LOG(m_logger) << "scheduleId = " << m_assetId;
DEBUG_LOG(m_logger) << "ms.id() = " << ms.id();
DEBUG_LOG(m_logger) << "ms.id() = " << ms.id;
QList<MountingPointPlan> diff;
bool ok = m_dtc->getScheduleDifferences(m_assetId, diff);
@@ -1053,7 +1053,7 @@ void IsmTests::checkSchedule()
{
ERROR_LOG(m_logger) << "Instrumentation plan not complete !!!";
for (const MountingPointPlan &mpp : qAsConst(diff))
ERROR_LOG(m_logger) << "Diff - # mpp.structureElementId() = " << mpp.structureElementId();
ERROR_LOG(m_logger) << "Diff - # mpp.structureElementId() = " << mpp.structureElementId;
}
QTest::qWait(1000);
@@ -1068,7 +1068,7 @@ void IsmTests::tryCreateMountingPointPlan()
MountingPointPlanModifyRequest data;
data.mountingPointScheduleId(m_assetId);
data.mountingPointScheduleId = m_assetId;
// data.structureElementId(m_structureElementId);
// data.mountingPointState(InfrastructureManagement::MountingPointState::Equipped);
@@ -1080,7 +1080,7 @@ void IsmTests::tryCreateMountingPointPlan()
QTest::qWait(1000);
data.mountingPointScheduleId(m_assetId);
data.mountingPointScheduleId = m_assetId;
// data.structureElementId(m_mainStructureElementId);
// data.mountingPointState(InfrastructureManagement::MountingPointState::Idle);