Migrates InfrastructureManagement to generated rtiddsgen API
Converts accessor calls to plain member access across ism service.
This commit is contained in:
30 files changed
+1322
-1314
No files matched your search
+37
-37
@@ -18,23 +18,23 @@ inline MainStructureElement convert(const Database::IsmMainStructureElement &dbD
|
||||
{
|
||||
MainStructureElement ddsData;
|
||||
|
||||
ddsData.id(dbData.id);
|
||||
ddsData.name(dbData.name.toStdString());
|
||||
ddsData.description(dbData.description.toStdString());
|
||||
ddsData.geoPosition(Core::GeoPosition(dbData.geoPosition.x(), dbData.geoPosition.y(), dbData.geoPosition.z()));
|
||||
ddsData.angle(dbData.angle);
|
||||
ddsData.externalWlsId(dbData.externalWlsId);
|
||||
ddsData.groupId(dbData.groupId);
|
||||
ddsData.modelId(dbData.modelId);
|
||||
ddsData.properties(dbData.properties.toStdString());
|
||||
ddsData.id = dbData.id;
|
||||
ddsData.name = dbData.name.toStdString();
|
||||
ddsData.description = dbData.description.toStdString();
|
||||
ddsData.geoPosition = Core::GeoPosition(dbData.geoPosition.x(), dbData.geoPosition.y(), dbData.geoPosition.z());
|
||||
ddsData.angle = dbData.angle;
|
||||
ddsData.externalWlsId = dbData.externalWlsId;
|
||||
ddsData.groupId = dbData.groupId;
|
||||
ddsData.modelId = dbData.modelId;
|
||||
ddsData.properties = dbData.properties.toStdString();
|
||||
|
||||
// init data not in db
|
||||
ddsData.isDeleted(false);
|
||||
ddsData.isUsed(false);
|
||||
ddsData.isDeleted = false;
|
||||
ddsData.isUsed = false;
|
||||
|
||||
// TODO: fill additional data?
|
||||
//ddsData.structureElementId();
|
||||
//ddsData.elements();
|
||||
//ddsData.structureElementId;
|
||||
//ddsData.elements;
|
||||
|
||||
return ddsData;
|
||||
}
|
||||
@@ -43,25 +43,25 @@ inline StructureElement convert(const Database::IsmStructureElement &dbData)
|
||||
{
|
||||
StructureElement ddsData;
|
||||
|
||||
ddsData.id(dbData.id);
|
||||
ddsData.name(dbData.name.toStdString());
|
||||
ddsData.displayName(dbData.displayName.toStdString());
|
||||
ddsData.mainStructureElementId(dbData.mainStructureElementId);
|
||||
ddsData.structureElementTypeId(dbData.structureElementTypeId);
|
||||
ddsData.path(dbData.path());
|
||||
ddsData.mountingPointId(dbData.mountingPointId);
|
||||
ddsData.barcode(dbData.barcode.toStdString());
|
||||
ddsData.relPosition(Core::RelativePosition(dbData.relPosition.x(),
|
||||
dbData.relPosition.y(),
|
||||
dbData.relPosition.z()));
|
||||
ddsData.mountingPointTypeId(dbData.mountingPointTypeId);
|
||||
ddsData.orientation(Core::Orientation(dbData.orientation.x(),
|
||||
ddsData.id = dbData.id;
|
||||
ddsData.name = dbData.name.toStdString();
|
||||
ddsData.displayName = dbData.displayName.toStdString();
|
||||
ddsData.mainStructureElementId = dbData.mainStructureElementId;
|
||||
ddsData.structureElementTypeId = dbData.structureElementTypeId;
|
||||
ddsData.path = dbData.path();
|
||||
ddsData.mountingPointId = dbData.mountingPointId;
|
||||
ddsData.barcode = dbData.barcode.toStdString();
|
||||
ddsData.relPosition = Core::RelativePosition(dbData.relPosition.x(),
|
||||
dbData.relPosition.y(),
|
||||
dbData.relPosition.z());
|
||||
ddsData.mountingPointTypeId = dbData.mountingPointTypeId;
|
||||
ddsData.orientation = Core::Orientation(dbData.orientation.x(),
|
||||
dbData.orientation.y(),
|
||||
dbData.orientation.z()));
|
||||
ddsData.properties(dbData.properties.toStdString());
|
||||
dbData.orientation.z());
|
||||
ddsData.properties = dbData.properties.toStdString();
|
||||
// init data not in db
|
||||
ddsData.isDeleted(false);
|
||||
ddsData.isUsed(false);
|
||||
ddsData.isDeleted = false;
|
||||
ddsData.isUsed = false;
|
||||
|
||||
return ddsData;
|
||||
}
|
||||
@@ -70,16 +70,16 @@ inline StructureElement convert(const Database::IsmStructureElement &dbData)
|
||||
inline MainSchedule convert(const Database::IsmMountingPointSchedule &dbData)
|
||||
{
|
||||
MainSchedule ddsData;
|
||||
ddsData.id(dbData.id);
|
||||
ddsData.name(dbData.name.toStdString());
|
||||
ddsData.statusId(dbData.statusId);
|
||||
ddsData.timeCreated(dbData.timeCreated.toMSecsSinceEpoch());
|
||||
ddsData.id = dbData.id;
|
||||
ddsData.name = dbData.name.toStdString();
|
||||
ddsData.statusId = dbData.statusId;
|
||||
ddsData.timeCreated = dbData.timeCreated.toMSecsSinceEpoch();
|
||||
if (!dbData.timeStart.isNull() && dbData.timeStart.isValid())
|
||||
ddsData.timeStart(dbData.timeStart.toMSecsSinceEpoch());
|
||||
ddsData.timeStart = dbData.timeStart.toMSecsSinceEpoch();
|
||||
if (!dbData.timeEnd.isNull() && dbData.timeEnd.isValid())
|
||||
ddsData.timeEnd(dbData.timeEnd.toMSecsSinceEpoch());
|
||||
ddsData.timeEnd = dbData.timeEnd.toMSecsSinceEpoch();
|
||||
if (!dbData.exerciseId.isNull() && dbData.exerciseId.canConvert<unsigned int>())
|
||||
ddsData.exerciseId(dbData.exerciseId.toUInt());
|
||||
ddsData.exerciseId = dbData.exerciseId.toUInt();
|
||||
|
||||
return ddsData;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user