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;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -31,10 +31,10 @@ bool DtcImplCustom::isAARWorkstation(const QString &wsName)
|
||||
int wsId = -1;
|
||||
for (const auto &at : m_dtcAsset->readAlive())
|
||||
{
|
||||
if (at.data().assetTypeId() == AssetManagement::AssetType::MobileAfterActionVehicle &&
|
||||
QString::fromStdString(at.data().name()).toUpper() == wsName.toUpper())
|
||||
if (at.data().assetTypeId == AssetManagement::AssetType::MobileAfterActionVehicle &&
|
||||
QString::fromStdString(at.data().name).toUpper() == wsName.toUpper())
|
||||
{
|
||||
wsId = at.data().id();
|
||||
wsId = at.data().id;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -53,9 +53,9 @@ int DtcImplCustom::getAssetId(const QString &wsName)
|
||||
int wsId = -1;
|
||||
for (const auto &at : m_dtcAsset->readAlive())
|
||||
{
|
||||
if ( QString::fromStdString(at.data().name()).toUpper() == wsName.toUpper())
|
||||
if ( QString::fromStdString(at.data().name).toUpper() == wsName.toUpper())
|
||||
{
|
||||
wsId = at.data().id();
|
||||
wsId = at.data().id;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,31 +20,31 @@ inline TrainingArea convert(const AsmTrainingArea &dbData)
|
||||
{
|
||||
TrainingArea ddsData;
|
||||
|
||||
ddsData.id(dbData.id);
|
||||
ddsData.name(dbData.name.toStdString());
|
||||
ddsData.bottomLeft(Core::GeoPosition2D(dbData.bottomLeft.x(), dbData.bottomLeft.y()));
|
||||
ddsData.height(dbData.height);
|
||||
ddsData.width(dbData.width);
|
||||
ddsData.image() = LtsUtils::convert<std::vector<uint8_t>>(dbData.image);
|
||||
ddsData.id = dbData.id;
|
||||
ddsData.name = dbData.name.toStdString();
|
||||
ddsData.bottomLeft = Core::GeoPosition2D(dbData.bottomLeft.x(), dbData.bottomLeft.y());
|
||||
ddsData.height = dbData.height;
|
||||
ddsData.width = dbData.width;
|
||||
ddsData.image = LtsUtils::convert<std::vector<uint8_t>>(dbData.image);
|
||||
|
||||
// init data not in db
|
||||
ddsData.isDeleted(false);
|
||||
ddsData.isUsed(false);
|
||||
ddsData.isDeleted = false;
|
||||
ddsData.isUsed = false;
|
||||
|
||||
return ddsData;
|
||||
}
|
||||
inline MapDescription convert(const AsmMapDescription &dbData)
|
||||
{
|
||||
MapDescription ddsData;
|
||||
ddsData.id(dbData.id);
|
||||
ddsData.name(dbData.name.toStdString());
|
||||
ddsData.description(dbData.description.toStdString());
|
||||
ddsData.mapDescriptionTypeId(dbData.mapDescriptionTypeId);
|
||||
ddsData.mapTypeId(dbData.mapTypeId);
|
||||
ddsData.maxScale(dbData.minScale);
|
||||
ddsData.minScale(dbData.minScale);
|
||||
ddsData.trainingAreaId(dbData.trainingAreaId);
|
||||
ddsData.url(dbData.url.toStdString());
|
||||
ddsData.id = dbData.id;
|
||||
ddsData.name = dbData.name.toStdString();
|
||||
ddsData.description = dbData.description.toStdString();
|
||||
ddsData.mapDescriptionTypeId = dbData.mapDescriptionTypeId;
|
||||
ddsData.mapTypeId = dbData.mapTypeId;
|
||||
ddsData.maxScale = dbData.minScale;
|
||||
ddsData.minScale = dbData.minScale;
|
||||
ddsData.trainingAreaId = dbData.trainingAreaId;
|
||||
ddsData.url = dbData.url.toStdString();
|
||||
return ddsData;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -70,11 +70,11 @@ void HandlerAsset::onAssetModifyRequest(const rti::core::SampleIdentity &cookie,
|
||||
Core::FunctionReplyObject HandlerAsset::assetModifyRequest(const Asset &request)
|
||||
{
|
||||
// modify
|
||||
if (request.id() > 0)
|
||||
if (request.id > 0)
|
||||
{
|
||||
ObjectAsset *ifs = m_objectAssetMap.value(request.id());
|
||||
ObjectAsset *ifs = m_objectAssetMap.value(request.id);
|
||||
if (!ifs)
|
||||
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Asset with id %1 not found")).arg(request.id());
|
||||
return Core::FunctionReplyObject(request.id, tr_lts("dds", "Asset with id %1 not found")).arg(request.id);
|
||||
return ifs->updateObject(request);
|
||||
}
|
||||
// create
|
||||
@@ -96,18 +96,18 @@ void HandlerAsset::onAssetRemoveRequest(const rti::core::SampleIdentity &cookie,
|
||||
const Core::RemoveElementRequest &request)
|
||||
{
|
||||
Core::FunctionReplyObject ret;
|
||||
ObjectAsset *ifs = m_objectAssetMap.value(request.id());
|
||||
ObjectAsset *ifs = m_objectAssetMap.value(request.id);
|
||||
|
||||
if (ifs == nullptr)
|
||||
{
|
||||
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "Asset with id %1 not found")).arg(request.id());
|
||||
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "Asset with id %1 not found")).arg(request.id);
|
||||
m_mainHandler->dds()->fts()->assetRemoveReply(cookie, ret);
|
||||
return;
|
||||
}
|
||||
|
||||
if (m_mainHandler->dds()->topicLockMaster()->isLocked(ifs->getData(), m_mainHandler->exerciseId()))
|
||||
{
|
||||
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "Asset '%1' is used by another user!")).arg(ifs->getName());
|
||||
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "Asset '%1' is used by another user!")).arg(ifs->getName());
|
||||
m_mainHandler->dds()->fts()->assetRemoveReply(cookie, ret);
|
||||
return;
|
||||
}
|
||||
@@ -120,7 +120,7 @@ void HandlerAsset::onAssetRemoveRequest(const rti::core::SampleIdentity &cookie,
|
||||
{
|
||||
// delete ObjectAsset
|
||||
delete ifs;
|
||||
m_objectAssetMap.remove(request.id());
|
||||
m_objectAssetMap.remove(request.id);
|
||||
}
|
||||
|
||||
m_mainHandler->dds()->fts()->assetRemoveReply(cookie, ret);
|
||||
|
||||
@@ -18,13 +18,13 @@ static inline Location toDdsData(const Database::AsmLocation &dbData)
|
||||
{
|
||||
Location ddsData;
|
||||
|
||||
ddsData.id(dbData.id);
|
||||
ddsData.name(dbData.name.toStdString());
|
||||
ddsData.description(dbData.description.toStdString());
|
||||
ddsData.id = dbData.id;
|
||||
ddsData.name = dbData.name.toStdString();
|
||||
ddsData.description = dbData.description.toStdString();
|
||||
|
||||
// init data not in db
|
||||
ddsData.isDeleted(false);
|
||||
ddsData.isUsed(false);
|
||||
ddsData.isDeleted = false;
|
||||
ddsData.isUsed = false;
|
||||
|
||||
return ddsData;
|
||||
}
|
||||
|
||||
@@ -70,11 +70,11 @@ void HandlerRelayInfo::onRelayInfoModifyRequest(const rti::core::SampleIdentity
|
||||
Core::FunctionReplyObject HandlerRelayInfo::relayInfoModifyRequest(const RelayInfo &request)
|
||||
{
|
||||
// modify
|
||||
if (request.id() > 0)
|
||||
if (request.id > 0)
|
||||
{
|
||||
ObjectRelayInfo *ifs = m_objectRelayInfoMap.value(request.id());
|
||||
ObjectRelayInfo *ifs = m_objectRelayInfoMap.value(request.id);
|
||||
if (!ifs)
|
||||
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "RelayInfo with id %1 not found")).arg(request.id());
|
||||
return Core::FunctionReplyObject(request.id, tr_lts("dds", "RelayInfo with id %1 not found")).arg(request.id);
|
||||
return ifs->updateObject(request);
|
||||
}
|
||||
// create
|
||||
@@ -96,18 +96,18 @@ void HandlerRelayInfo::onRelayInfoRemoveRequest(const rti::core::SampleIdentity
|
||||
const Core::RemoveElementRequest &request)
|
||||
{
|
||||
Core::FunctionReplyObject ret;
|
||||
ObjectRelayInfo *ifs = m_objectRelayInfoMap.value(request.id());
|
||||
ObjectRelayInfo *ifs = m_objectRelayInfoMap.value(request.id);
|
||||
|
||||
if (ifs == nullptr)
|
||||
{
|
||||
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "RelayInfo with id %1 not found")).arg(request.id());
|
||||
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "RelayInfo with id %1 not found")).arg(request.id);
|
||||
m_mainHandler->dds()->fts()->relayInfoRemoveReply(cookie, ret);
|
||||
return;
|
||||
}
|
||||
|
||||
if (m_mainHandler->dds()->topicLockMaster()->isLocked(ifs->getData(), m_mainHandler->exerciseId()))
|
||||
{
|
||||
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "RelayInfo '%1' is used by another user!")).arg(ifs->getName());
|
||||
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "RelayInfo '%1' is used by another user!")).arg(ifs->getName());
|
||||
m_mainHandler->dds()->fts()->relayInfoRemoveReply(cookie, ret);
|
||||
return;
|
||||
}
|
||||
@@ -120,7 +120,7 @@ void HandlerRelayInfo::onRelayInfoRemoveRequest(const rti::core::SampleIdentity
|
||||
{
|
||||
// delete ObjectRelayInfo
|
||||
delete ifs;
|
||||
m_objectRelayInfoMap.remove(request.id());
|
||||
m_objectRelayInfoMap.remove(request.id);
|
||||
}
|
||||
|
||||
m_mainHandler->dds()->fts()->relayInfoRemoveReply(cookie, ret);
|
||||
|
||||
+64
-64
@@ -54,21 +54,21 @@ bool HandlerTrainingArea::init()
|
||||
if (mapDescriptionSeqences.contains(data.trainingAreaId))
|
||||
mapDescriptionSeq = mapDescriptionSeqences.value(data.trainingAreaId);
|
||||
|
||||
switch (data.mapDescriptionTypeId.underlying())
|
||||
switch (data.mapDescriptionTypeId)
|
||||
{
|
||||
case AssetManagement::MapDescriptionType_def::Map2D:
|
||||
case AssetManagement::MapDescriptionType::Map2D:
|
||||
mapDescriptionSeq.map2D.insert(data.objOrder, data);
|
||||
INFO_LOG(m_logger) << "map2D.insert order =" << data.objOrder;
|
||||
break;
|
||||
case AssetManagement::MapDescriptionType_def::Scene3D:
|
||||
case AssetManagement::MapDescriptionType::Scene3D:
|
||||
mapDescriptionSeq.scene3D.insert(data.objOrder, data);
|
||||
INFO_LOG(m_logger) << "Scene3D.insert order =" << data.objOrder;
|
||||
break;
|
||||
case AssetManagement::MapDescriptionType_def::Elevation:
|
||||
case AssetManagement::MapDescriptionType::Elevation:
|
||||
mapDescriptionSeq.elevation.insert(data.objOrder, data);
|
||||
INFO_LOG(m_logger) << "Elevation.insert order =" << data.objOrder;
|
||||
break;
|
||||
case AssetManagement::MapDescriptionType_def::SceneObj:
|
||||
case AssetManagement::MapDescriptionType::SceneObj:
|
||||
mapDescriptionSeq.sceneObj.insert(data.objOrder, data);
|
||||
INFO_LOG(m_logger) << "sceneObj.insert order =" << data.objOrder;
|
||||
break;
|
||||
@@ -100,25 +100,25 @@ bool HandlerTrainingArea::init()
|
||||
ObjectTrainingArea *ifs(new ObjectTrainingArea(m_mainHandler));
|
||||
TrainingArea taData = convert(data);
|
||||
// insert sequences
|
||||
if (mapDescriptionSeqences.contains(taData.id()) )
|
||||
if (mapDescriptionSeqences.contains(taData.id) )
|
||||
{
|
||||
const MapDescriptionSeq mapDescriptionSeq = mapDescriptionSeqences.value(taData.id());
|
||||
const MapDescriptionSeq mapDescriptionSeq = mapDescriptionSeqences.value(taData.id);
|
||||
|
||||
taData.map2D().reserve(mapDescriptionSeq.map2D.size());
|
||||
taData.map2D.reserve(mapDescriptionSeq.map2D.size());
|
||||
for (const auto &dbDesc : mapDescriptionSeq.map2D)
|
||||
taData.map2D().push_back(ObjectMapDescription::toDdsData(dbDesc));
|
||||
taData.map2D.push_back(ObjectMapDescription::toDdsData(dbDesc));
|
||||
|
||||
taData.scene3D().reserve(mapDescriptionSeq.scene3D.size());
|
||||
taData.scene3D.reserve(mapDescriptionSeq.scene3D.size());
|
||||
for (const auto &dbDesc : mapDescriptionSeq.scene3D)
|
||||
taData.scene3D().push_back(ObjectMapDescription::toDdsData(dbDesc));
|
||||
taData.scene3D.push_back(ObjectMapDescription::toDdsData(dbDesc));
|
||||
|
||||
taData.elevation().reserve(mapDescriptionSeq.elevation.size());
|
||||
taData.elevation.reserve(mapDescriptionSeq.elevation.size());
|
||||
for (const auto &dbDesc : mapDescriptionSeq.elevation)
|
||||
taData.elevation().push_back(ObjectMapDescription::toDdsData(dbDesc));
|
||||
taData.elevation.push_back(ObjectMapDescription::toDdsData(dbDesc));
|
||||
|
||||
taData.sceneObjects().reserve(mapDescriptionSeq.sceneObj.size());
|
||||
taData.sceneObjects.reserve(mapDescriptionSeq.sceneObj.size());
|
||||
for (const auto &dbDesc : mapDescriptionSeq.sceneObj)
|
||||
taData.sceneObjects().push_back(ObjectMapDescription::toDdsData(dbDesc));
|
||||
taData.sceneObjects.push_back(ObjectMapDescription::toDdsData(dbDesc));
|
||||
}
|
||||
// end insert sequences
|
||||
Core::FunctionReplyObject ret = ifs->createObject(taData);
|
||||
@@ -146,7 +146,7 @@ void HandlerTrainingArea::removeMapDescriptions(int trainingAreaId)
|
||||
{
|
||||
it.next();
|
||||
INFO_LOG(m_logger) << "remove map description key = " << it.key();
|
||||
if ( it.value()->getData().trainingAreaId() == trainingAreaId)
|
||||
if ( it.value()->getData().trainingAreaId == trainingAreaId)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "remove id= " << it.key();
|
||||
|
||||
@@ -175,12 +175,12 @@ Core::FunctionReplyObject HandlerTrainingArea::trainingAreaModifyRequest(const T
|
||||
ObjectTrainingArea *ifs;
|
||||
|
||||
Core::FunctionReplyObject ret;
|
||||
if (request.id() > 0)
|
||||
if (request.id > 0)
|
||||
{
|
||||
ifs = m_objectTrainingAreaMap.value(request.id());
|
||||
ifs = m_objectTrainingAreaMap.value(request.id);
|
||||
|
||||
if (ifs == nullptr)
|
||||
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "Training area with id %1 not found")).arg(request.id());
|
||||
return Core::FunctionReplyObject(request.id, tr_lts("dds", "Training area with id %1 not found")).arg(request.id);
|
||||
ret = ifs->updateObject(ddsData);
|
||||
if (ret.error())
|
||||
return ret;
|
||||
@@ -198,7 +198,7 @@ Core::FunctionReplyObject HandlerTrainingArea::trainingAreaModifyRequest(const T
|
||||
else
|
||||
m_objectTrainingAreaMap.insert(ifs->getId(), ifs);
|
||||
}
|
||||
if (request.id() > 0) // Modify
|
||||
if (request.id > 0) // Modify
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "modify: delete old entries in map_description";
|
||||
removeMapDescriptions(ifs->getId());
|
||||
@@ -206,19 +206,19 @@ Core::FunctionReplyObject HandlerTrainingArea::trainingAreaModifyRequest(const T
|
||||
|
||||
// insert new entries
|
||||
|
||||
auto &map2D = ddsData.map2D();
|
||||
map2D.resize(request.map2D().size());
|
||||
for (unsigned int i = 0; i < request.map2D().size(); i++)
|
||||
auto &map2D = ddsData.map2D;
|
||||
map2D.resize(request.map2D.size());
|
||||
for (unsigned int i = 0; i < request.map2D.size(); i++)
|
||||
{
|
||||
MapDescription mdData = request.map2D().at(i);
|
||||
MapDescription mdData = request.map2D.at(i);
|
||||
ObjectMapDescription *md (new ObjectMapDescription(m_mainHandler));
|
||||
mdData.id(0);
|
||||
mdData.trainingAreaId(ifs->getId());
|
||||
mdData.id = 0;
|
||||
mdData.trainingAreaId = ifs->getId();
|
||||
ret = md->createObject(mdData, i);
|
||||
DEBUG_LOG(m_logger) << "insert topographic entries in map_description"
|
||||
<< " for training area id " << ifs->getId()
|
||||
<< " mapTypeId=" << mdData.mapTypeId()
|
||||
<< " mapDescriptionTypeId=" << mdData.mapDescriptionTypeId();
|
||||
<< " mapTypeId=" << mdData.mapTypeId
|
||||
<< " mapDescriptionTypeId=" << mdData.mapDescriptionTypeId;
|
||||
if (!ret.error())
|
||||
{
|
||||
map2D[i] = md->getData();
|
||||
@@ -231,19 +231,19 @@ Core::FunctionReplyObject HandlerTrainingArea::trainingAreaModifyRequest(const T
|
||||
}
|
||||
}
|
||||
|
||||
auto &elevation = ddsData.elevation();
|
||||
elevation.resize(request.elevation().size());
|
||||
for (unsigned int i = 0; i < request.elevation().size(); i++)
|
||||
auto &elevation = ddsData.elevation;
|
||||
elevation.resize(request.elevation.size());
|
||||
for (unsigned int i = 0; i < request.elevation.size(); i++)
|
||||
{
|
||||
MapDescription mdData = request.elevation().at(i);
|
||||
MapDescription mdData = request.elevation.at(i);
|
||||
ObjectMapDescription *md (new ObjectMapDescription(m_mainHandler));
|
||||
mdData.id(0);
|
||||
mdData.trainingAreaId(ifs->getId());
|
||||
mdData.id = 0;
|
||||
mdData.trainingAreaId = ifs->getId();
|
||||
ret = md->createObject(mdData, i);
|
||||
DEBUG_LOG(m_logger) << "insert elevation entries in map_description"
|
||||
<< " for training area id " << ifs->getId()
|
||||
<< " mapTypeId=" << mdData.mapTypeId()
|
||||
<< " mapDescriptionTypeId=" << mdData.mapDescriptionTypeId();
|
||||
<< " mapTypeId=" << mdData.mapTypeId
|
||||
<< " mapDescriptionTypeId=" << mdData.mapDescriptionTypeId;
|
||||
if (!ret.error())
|
||||
{
|
||||
elevation[i] = md->getData();
|
||||
@@ -256,19 +256,19 @@ Core::FunctionReplyObject HandlerTrainingArea::trainingAreaModifyRequest(const T
|
||||
}
|
||||
}
|
||||
|
||||
auto &scene3D = ddsData.scene3D();
|
||||
scene3D.resize(request.scene3D().size());
|
||||
for (unsigned int i = 0; i < request.scene3D().size(); i++)
|
||||
auto &scene3D = ddsData.scene3D;
|
||||
scene3D.resize(request.scene3D.size());
|
||||
for (unsigned int i = 0; i < request.scene3D.size(); i++)
|
||||
{
|
||||
MapDescription mdData = request.scene3D().at(i);
|
||||
MapDescription mdData = request.scene3D.at(i);
|
||||
ObjectMapDescription *md (new ObjectMapDescription(m_mainHandler));
|
||||
mdData.id(0);
|
||||
mdData.trainingAreaId(ifs->getId());
|
||||
mdData.id = 0;
|
||||
mdData.trainingAreaId = ifs->getId();
|
||||
ret = md->createObject(mdData, i);
|
||||
DEBUG_LOG(m_logger) << "insert scene3D entries in map_description"
|
||||
<< " for training area id " << ifs->getId()
|
||||
<< " mapTypeId=" << mdData.mapTypeId()
|
||||
<< " mapDescriptionTypeId=" << mdData.mapDescriptionTypeId();
|
||||
<< " mapTypeId=" << mdData.mapTypeId
|
||||
<< " mapDescriptionTypeId=" << mdData.mapDescriptionTypeId;
|
||||
if (!ret.error())
|
||||
{
|
||||
scene3D[i] = md->getData();
|
||||
@@ -281,19 +281,19 @@ Core::FunctionReplyObject HandlerTrainingArea::trainingAreaModifyRequest(const T
|
||||
}
|
||||
}
|
||||
|
||||
auto &sceneObj = ddsData.sceneObjects();
|
||||
sceneObj.resize(request.sceneObjects().size());
|
||||
for (unsigned int i = 0; i < request.sceneObjects().size(); i++)
|
||||
auto &sceneObj = ddsData.sceneObjects;
|
||||
sceneObj.resize(request.sceneObjects.size());
|
||||
for (unsigned int i = 0; i < request.sceneObjects.size(); i++)
|
||||
{
|
||||
MapDescription mdData = request.sceneObjects().at(i);
|
||||
MapDescription mdData = request.sceneObjects.at(i);
|
||||
ObjectMapDescription *md (new ObjectMapDescription(m_mainHandler));
|
||||
mdData.id(0);
|
||||
mdData.trainingAreaId(ifs->getId());
|
||||
mdData.id = 0;
|
||||
mdData.trainingAreaId = ifs->getId();
|
||||
ret = md->createObject(mdData, i);
|
||||
DEBUG_LOG(m_logger) << "insert sceneObjects entries in map_description"
|
||||
<< " for training area id " << ifs->getId()
|
||||
<< " mapTypeId=" << mdData.mapTypeId()
|
||||
<< " mapDescriptionTypeId=" << mdData.mapDescriptionTypeId();
|
||||
<< " mapTypeId=" << mdData.mapTypeId
|
||||
<< " mapDescriptionTypeId=" << mdData.mapDescriptionTypeId;
|
||||
if (!ret.error())
|
||||
{
|
||||
sceneObj[i] = md->getData();
|
||||
@@ -306,7 +306,7 @@ Core::FunctionReplyObject HandlerTrainingArea::trainingAreaModifyRequest(const T
|
||||
}
|
||||
}
|
||||
|
||||
ddsData.id(ifs->getId());
|
||||
ddsData.id = ifs->getId();
|
||||
return ifs->updateObject(ddsData);
|
||||
}
|
||||
|
||||
@@ -315,17 +315,17 @@ void HandlerTrainingArea::onTrainingAreaRemoveRequest(const rti::core::SampleIde
|
||||
const Core::RemoveElementRequest &request)
|
||||
{
|
||||
Core::FunctionReplyObject ret;
|
||||
ObjectTrainingArea *ifs = m_objectTrainingAreaMap.value(request.id());
|
||||
ObjectTrainingArea *ifs = m_objectTrainingAreaMap.value(request.id);
|
||||
if (ifs == nullptr)
|
||||
{
|
||||
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "Training area with id %1 not found")).arg(request.id());
|
||||
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "Training area with id %1 not found")).arg(request.id);
|
||||
m_mainHandler->dds()->fts()->trainingAreaRemoveReply(cookie, ret);
|
||||
return;
|
||||
}
|
||||
|
||||
if (m_mainHandler->dds()->topicLockMaster()->isLocked(ifs->getData(), m_mainHandler->exerciseId()))
|
||||
{
|
||||
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "Training area '%1' is used by another user!")).arg(ifs->getName());
|
||||
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "Training area '%1' is used by another user!")).arg(ifs->getName());
|
||||
m_mainHandler->dds()->fts()->trainingAreaRemoveReply(cookie, ret);
|
||||
return;
|
||||
}
|
||||
@@ -340,8 +340,8 @@ void HandlerTrainingArea::onTrainingAreaRemoveRequest(const rti::core::SampleIde
|
||||
{
|
||||
// delete ObjectTrainingArea
|
||||
delete ifs;
|
||||
m_objectTrainingAreaMap.remove(request.id());
|
||||
removeMapDescriptions(request.id());
|
||||
m_objectTrainingAreaMap.remove(request.id);
|
||||
removeMapDescriptions(request.id);
|
||||
trans.commit();
|
||||
}
|
||||
|
||||
@@ -362,10 +362,10 @@ void HandlerTrainingArea::onMapDescriptionModifyRequest(const rti::core::SampleI
|
||||
|
||||
Core::FunctionReplyObject HandlerTrainingArea::mapDescriptionModifyRequest(const MapDescription &request)
|
||||
{
|
||||
ObjectMapDescription *ifs = m_objectMapDescriptionMap.value(request.id());
|
||||
ObjectMapDescription *ifs = m_objectMapDescriptionMap.value(request.id);
|
||||
|
||||
if (ifs == nullptr)
|
||||
return Core::FunctionReplyObject(request.id(), tr_lts("dds", "MapDescription with id %1 not found")).arg(request.id());
|
||||
return Core::FunctionReplyObject(request.id, tr_lts("dds", "MapDescription with id %1 not found")).arg(request.id);
|
||||
|
||||
return ifs->updateObject(request);
|
||||
}
|
||||
@@ -375,17 +375,17 @@ void HandlerTrainingArea::onMapDescriptionRemoveRequest(const rti::core::SampleI
|
||||
const Core::RemoveElementRequest &request)
|
||||
{
|
||||
Core::FunctionReplyObject ret;
|
||||
ObjectMapDescription *ifs = m_objectMapDescriptionMap.value(request.id());
|
||||
ObjectMapDescription *ifs = m_objectMapDescriptionMap.value(request.id);
|
||||
if (ifs == nullptr)
|
||||
{
|
||||
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "MapDescription with id %1 not found")).arg(request.id());
|
||||
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "MapDescription with id %1 not found")).arg(request.id);
|
||||
m_mainHandler->dds()->fts()->mapDescriptionRemoveReply(cookie, ret);
|
||||
return;
|
||||
}
|
||||
|
||||
if (m_mainHandler->dds()->topicLockMaster()->isLocked(ifs->getData(), m_mainHandler->exerciseId()))
|
||||
{
|
||||
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "MapDescription '%1' is used by another user!")).arg(ifs->getName());
|
||||
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "MapDescription '%1' is used by another user!")).arg(ifs->getName());
|
||||
m_mainHandler->dds()->fts()->mapDescriptionRemoveReply(cookie, ret);
|
||||
return;
|
||||
}
|
||||
@@ -398,7 +398,7 @@ void HandlerTrainingArea::onMapDescriptionRemoveRequest(const rti::core::SampleI
|
||||
{
|
||||
// delete ObjectMapDescription
|
||||
delete ifs;
|
||||
m_objectMapDescriptionMap.remove(request.id());
|
||||
m_objectMapDescriptionMap.remove(request.id);
|
||||
}
|
||||
|
||||
m_mainHandler->dds()->fts()->mapDescriptionRemoveReply(cookie, ret);
|
||||
|
||||
+4
-4
@@ -33,9 +33,9 @@ HandlerWorkstationLogout::~HandlerWorkstationLogout()
|
||||
|
||||
void HandlerWorkstationLogout::onWorkstationLogoutRequest(const rti::core::SampleIdentity &cookie, const WorkstationLogout &request)
|
||||
{
|
||||
if (!m_logoutRequestMap.contains(request.originatorId()))
|
||||
if (!m_logoutRequestMap.contains(request.originatorId))
|
||||
{
|
||||
int originatorId = request.originatorId();
|
||||
int originatorId = request.originatorId;
|
||||
|
||||
QTimer *dtLifetimeTimer = new QTimer(this);
|
||||
dtLifetimeTimer->setSingleShot(true);
|
||||
@@ -53,11 +53,11 @@ void HandlerWorkstationLogout::onWorkstationLogoutRequest(const rti::core::Sampl
|
||||
}
|
||||
else
|
||||
{
|
||||
m_logoutRequestMap.value(request.originatorId())->start(MAX_DATATOPIC_LIFETIME);
|
||||
m_logoutRequestMap.value(request.originatorId)->start(MAX_DATATOPIC_LIFETIME);
|
||||
m_mainHandler->dds()->dts()->publish(request);
|
||||
}
|
||||
|
||||
m_mainHandler->dds()->fts()->workstationLogoutReply(cookie, Core::FunctionReplyObject(request.originatorId()));
|
||||
m_mainHandler->dds()->fts()->workstationLogoutReply(cookie, Core::FunctionReplyObject(request.originatorId));
|
||||
}
|
||||
|
||||
bool HandlerWorkstationLogout::init()
|
||||
|
||||
@@ -149,7 +149,7 @@ bool MainHandler::initAsmHandler()
|
||||
ERROR_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler failed.";
|
||||
return false;
|
||||
}
|
||||
m_ddsHandler->pacemaker()->addPort(m_handlerWebSocket->serverWebSocketPort(), Core::PortType::WebSocketServer);
|
||||
m_ddsHandler->pacemaker()->addPort(m_handlerWebSocket->serverWebSocketPort(), Core::CorePortType::WebSocketServer);
|
||||
DEBUG_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler succesful.";
|
||||
|
||||
return true;
|
||||
|
||||
@@ -25,19 +25,19 @@ ObjectAsset::ObjectAsset(MainHandler *mainHandler)
|
||||
ObjectAsset::~ObjectAsset()
|
||||
{
|
||||
if (isValid())
|
||||
m_mainHandler->dds()->dts()->removeAssetByKey(m_data.id());
|
||||
m_mainHandler->dds()->dts()->removeAssetByKey(m_data.id);
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
bool ObjectAsset::isValid() const
|
||||
{
|
||||
return m_data.id() > 0;
|
||||
return m_data.id > 0;
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
bool ObjectAsset::isUsed() const
|
||||
{
|
||||
return m_data.isUsed();
|
||||
return m_data.isUsed;
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
@@ -45,79 +45,79 @@ Core::FunctionReplyObject ObjectAsset::createObject(const Asset &data)
|
||||
{
|
||||
m_data = data;
|
||||
|
||||
if (m_data.id() <= 0)
|
||||
if (m_data.id <= 0)
|
||||
{
|
||||
m_data.isUsed(false);
|
||||
m_data.isUsed = false;
|
||||
|
||||
Database::AsmAsset dbData(toDbData(data));
|
||||
|
||||
if (!m_mainHandler->db()->insert(dbData))
|
||||
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting AsmAsset-data into database"));
|
||||
|
||||
m_data.id(dbData.id);
|
||||
DEBUG_LOG(m_logger) << "New assetId: " << m_data.id();
|
||||
m_data.id = dbData.id;
|
||||
DEBUG_LOG(m_logger) << "New assetId: " << m_data.id;
|
||||
}
|
||||
|
||||
// Publish Data via DTS
|
||||
onPublishData();
|
||||
|
||||
return Core::FunctionReplyObject(m_data.id());
|
||||
return Core::FunctionReplyObject(m_data.id);
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
Core::FunctionReplyObject ObjectAsset::updateObject(const Asset &data)
|
||||
{
|
||||
if (!isValid())
|
||||
return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Object not valid/blocked"));
|
||||
return Core::FunctionReplyObject(data.id, tr_lts("dds", "Object not valid/blocked"));
|
||||
|
||||
Database::AsmAsset dbData;
|
||||
dbData = toDbData(data);
|
||||
|
||||
if (!m_mainHandler->db()->update(dbData))
|
||||
return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating AsmAsset-data into database"));
|
||||
return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error updating AsmAsset-data into database"));
|
||||
|
||||
m_data = data;
|
||||
DEBUG_LOG(m_logger) << "Data changed for assetId: " << m_data.id();
|
||||
DEBUG_LOG(m_logger) << "Data changed for assetId: " << m_data.id;
|
||||
|
||||
// Publish Data via DTS
|
||||
onPublishData();
|
||||
|
||||
return Core::FunctionReplyObject(m_data.id());
|
||||
return Core::FunctionReplyObject(m_data.id);
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
Core::FunctionReplyObject ObjectAsset::setUsed(bool isUsed)
|
||||
{
|
||||
if (!isValid())
|
||||
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "Trying to update an already removed AsmAsset object"));
|
||||
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Trying to update an already removed AsmAsset object"));
|
||||
|
||||
m_data.isUsed(isUsed);
|
||||
m_data.isUsed = isUsed;
|
||||
|
||||
// Publish Data via DTS
|
||||
onPublishData();
|
||||
|
||||
return Core::FunctionReplyObject(m_data.id());
|
||||
return Core::FunctionReplyObject(m_data.id);
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
Core::FunctionReplyObject ObjectAsset::removeObject()
|
||||
{
|
||||
if (isUsed())
|
||||
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "Asset still in use"));
|
||||
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Asset still in use"));
|
||||
|
||||
if (!m_mainHandler->db()->removeAsmAsset(m_data.id()))
|
||||
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "Asset with id %1 can not be removed from DB")).arg(m_data.id());
|
||||
if (!m_mainHandler->db()->removeAsmAsset(m_data.id))
|
||||
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Asset with id %1 can not be removed from DB")).arg(m_data.id);
|
||||
|
||||
if (!m_mainHandler->dds()->dts()->removeAssetByKey(m_data.id()))
|
||||
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "Asset with id %1 can not be removed from DDS")).arg(m_data.id());
|
||||
if (!m_mainHandler->dds()->dts()->removeAssetByKey(m_data.id))
|
||||
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Asset with id %1 can not be removed from DDS")).arg(m_data.id);
|
||||
|
||||
return Core::FunctionReplyObject(m_data.id());
|
||||
return Core::FunctionReplyObject(m_data.id);
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
void ObjectAsset::onPublishData()
|
||||
{
|
||||
INFO_LOG(m_logger) << "Publish AsmAsset-data to dds (" << m_data.id() << ") ...";
|
||||
INFO_LOG(m_logger) << "Publish AsmAsset-data to dds (" << m_data.id << ") ...";
|
||||
|
||||
if (!m_mainHandler->dds()->dts()->publish(m_data))
|
||||
ERROR_LOG(m_logger) << "Error publishing AsmAsset-data to dds";
|
||||
@@ -132,13 +132,13 @@ Database::AsmAsset ObjectAsset::toDbData(const Asset &ddsData)
|
||||
{
|
||||
Database::AsmAsset dbData;
|
||||
|
||||
dbData.id = ddsData.id();
|
||||
dbData.name = QString::fromStdString(ddsData.name());
|
||||
dbData.assetTypeId = ddsData.assetTypeId();
|
||||
dbData.locationId = ddsData.locationId();
|
||||
dbData.subLocation = ddsData.subLocation();
|
||||
dbData.certificate = LtsUtils::toQByteArray(ddsData.certificate());
|
||||
dbData.properties = QString::fromStdString(ddsData.properties());
|
||||
dbData.id = ddsData.id;
|
||||
dbData.name = QString::fromStdString(ddsData.name);
|
||||
dbData.assetTypeId = ddsData.assetTypeId;
|
||||
dbData.locationId = ddsData.locationId;
|
||||
dbData.subLocation = ddsData.subLocation;
|
||||
dbData.certificate = LtsUtils::toQByteArray(ddsData.certificate);
|
||||
dbData.properties = QString::fromStdString(ddsData.properties);
|
||||
|
||||
return dbData;
|
||||
}
|
||||
@@ -149,17 +149,17 @@ Asset ObjectAsset::toDdsData(const Database::AsmAsset &dbData)
|
||||
{
|
||||
Asset ddsData;
|
||||
|
||||
ddsData.id(dbData.id);
|
||||
ddsData.name(dbData.name.toStdString());
|
||||
ddsData.assetTypeId(dbData.assetTypeId);
|
||||
ddsData.locationId(dbData.locationId);
|
||||
ddsData.subLocation(dbData.subLocation);
|
||||
ddsData.certificate(LtsUtils::convert<std::vector<uint8_t>>(dbData.certificate));
|
||||
ddsData.properties(dbData.properties.toStdString());
|
||||
ddsData.id = dbData.id;
|
||||
ddsData.name = dbData.name.toStdString();
|
||||
ddsData.assetTypeId = dbData.assetTypeId;
|
||||
ddsData.locationId = dbData.locationId;
|
||||
ddsData.subLocation = dbData.subLocation;
|
||||
ddsData.certificate = LtsUtils::convert<std::vector<uint8_t>>(dbData.certificate);
|
||||
ddsData.properties = dbData.properties.toStdString();
|
||||
|
||||
// init data not in db
|
||||
ddsData.isDeleted(false);
|
||||
ddsData.isUsed(false);
|
||||
ddsData.isDeleted = false;
|
||||
ddsData.isUsed = false;
|
||||
|
||||
return ddsData;
|
||||
}
|
||||
|
||||
@@ -34,8 +34,8 @@ public:
|
||||
Core::FunctionReplyObject updateObject(const Asset &data);
|
||||
Core::FunctionReplyObject removeObject();
|
||||
|
||||
qint32 getId() const { return m_data.id(); }
|
||||
QString getName() const { return QString::fromStdString(m_data.name()); }
|
||||
qint32 getId() const { return m_data.id; }
|
||||
QString getName() const { return QString::fromStdString(m_data.name); }
|
||||
const Asset &getData() const { return m_data; }
|
||||
|
||||
bool isValid() const;
|
||||
|
||||
+34
-34
@@ -21,16 +21,16 @@ ObjectMapDescription::ObjectMapDescription(MainHandler *mainHandler)
|
||||
|
||||
bool ObjectMapDescription::isValid() const
|
||||
{
|
||||
return m_data.id() > 0;
|
||||
return m_data.id > 0;
|
||||
}
|
||||
|
||||
Core::FunctionReplyObject ObjectMapDescription::createObject(const MapDescription &data, int order)
|
||||
{
|
||||
m_data = data;
|
||||
|
||||
if (m_data.id() <= 0)
|
||||
if (m_data.id <= 0)
|
||||
{
|
||||
m_data.isUsed(false);
|
||||
m_data.isUsed = false;
|
||||
|
||||
Database::AsmMapDescription dbData(toDbData(data));
|
||||
dbData.objOrder = order;
|
||||
@@ -38,44 +38,44 @@ Core::FunctionReplyObject ObjectMapDescription::createObject(const MapDescriptio
|
||||
if (!m_mainHandler->db()->insert(dbData))
|
||||
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting AsmMapDescription-data into database"));
|
||||
|
||||
m_data.id(dbData.id);
|
||||
DEBUG_LOG(m_logger) << "New MapDescription Id: " << m_data.id();
|
||||
m_data.id = dbData.id;
|
||||
DEBUG_LOG(m_logger) << "New MapDescription Id: " << m_data.id;
|
||||
}
|
||||
else if (order != m_order && m_order >= 0)
|
||||
{
|
||||
Database::AsmMapDescription dbData(toDbData(data));
|
||||
dbData.objOrder = m_order;
|
||||
if (!m_mainHandler->db()->update(dbData))
|
||||
return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating AsmMapDescription-data into database"));
|
||||
return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error updating AsmMapDescription-data into database"));
|
||||
}
|
||||
m_order = order;
|
||||
|
||||
return Core::FunctionReplyObject(m_data.id());
|
||||
return Core::FunctionReplyObject(m_data.id);
|
||||
}
|
||||
|
||||
Core::FunctionReplyObject ObjectMapDescription::updateObject(const MapDescription &data)
|
||||
{
|
||||
if (!isValid())
|
||||
return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Object not valid/blocked"));
|
||||
return Core::FunctionReplyObject(data.id, tr_lts("dds", "Object not valid/blocked"));
|
||||
|
||||
Database::AsmMapDescription dbData(toDbData(data));
|
||||
dbData.objOrder = m_order;
|
||||
|
||||
if (!m_mainHandler->db()->update(dbData))
|
||||
return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating AsmMapDescription-data into database"));
|
||||
return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error updating AsmMapDescription-data into database"));
|
||||
|
||||
m_data = data;
|
||||
DEBUG_LOG(m_logger) << "Data changed for MapDescription Id: " << m_data.id();
|
||||
DEBUG_LOG(m_logger) << "Data changed for MapDescription Id: " << m_data.id;
|
||||
|
||||
return Core::FunctionReplyObject(m_data.id());
|
||||
return Core::FunctionReplyObject(m_data.id);
|
||||
}
|
||||
|
||||
Core::FunctionReplyObject ObjectMapDescription::removeObject()
|
||||
{
|
||||
if (!m_mainHandler->db()->removeAsmMapDescription(m_data.id()))
|
||||
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "MapDescription with id %1 can not be removed")).arg(m_data.id());
|
||||
if (!m_mainHandler->db()->removeAsmMapDescription(m_data.id))
|
||||
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "MapDescription with id %1 can not be removed")).arg(m_data.id);
|
||||
|
||||
return Core::FunctionReplyObject(m_data.id());
|
||||
return Core::FunctionReplyObject(m_data.id);
|
||||
}
|
||||
|
||||
// -------------------------------------------------------------------------------------------------------
|
||||
@@ -87,15 +87,15 @@ Database::AsmMapDescription ObjectMapDescription::toDbData(const MapDescription
|
||||
{
|
||||
Database::AsmMapDescription dbData;
|
||||
|
||||
dbData.id = ddsData.id();
|
||||
dbData.name = QString::fromStdString(ddsData.name());
|
||||
dbData.description = QString::fromStdString(ddsData.description());
|
||||
dbData.trainingAreaId = ddsData.trainingAreaId();
|
||||
dbData.mapTypeId = ddsData.mapTypeId();
|
||||
dbData.mapDescriptionTypeId = ddsData.mapDescriptionTypeId();
|
||||
dbData.url = QString::fromStdString(ddsData.url());
|
||||
dbData.minScale = ddsData.minScale();
|
||||
dbData.maxScale = ddsData.maxScale();
|
||||
dbData.id = ddsData.id;
|
||||
dbData.name = QString::fromStdString(ddsData.name);
|
||||
dbData.description = QString::fromStdString(ddsData.description);
|
||||
dbData.trainingAreaId = ddsData.trainingAreaId;
|
||||
dbData.mapTypeId = ddsData.mapTypeId;
|
||||
dbData.mapDescriptionTypeId = ddsData.mapDescriptionTypeId;
|
||||
dbData.url = QString::fromStdString(ddsData.url);
|
||||
dbData.minScale = ddsData.minScale;
|
||||
dbData.maxScale = ddsData.maxScale;
|
||||
|
||||
return dbData;
|
||||
}
|
||||
@@ -106,19 +106,19 @@ MapDescription ObjectMapDescription::toDdsData(const Database::AsmMapDescription
|
||||
{
|
||||
MapDescription ddsData;
|
||||
|
||||
ddsData.id(dbData.id);
|
||||
ddsData.name(dbData.name.toStdString());
|
||||
ddsData.description(dbData.description.toStdString());
|
||||
ddsData.trainingAreaId(dbData.trainingAreaId);
|
||||
ddsData.mapTypeId(dbData.mapTypeId);
|
||||
ddsData.mapDescriptionTypeId(dbData.mapDescriptionTypeId);
|
||||
ddsData.url(dbData.url.toStdString());
|
||||
ddsData.minScale(dbData.minScale);
|
||||
ddsData.maxScale(dbData.maxScale);
|
||||
ddsData.id = dbData.id;
|
||||
ddsData.name = dbData.name.toStdString();
|
||||
ddsData.description = dbData.description.toStdString();
|
||||
ddsData.trainingAreaId = dbData.trainingAreaId;
|
||||
ddsData.mapTypeId = dbData.mapTypeId;
|
||||
ddsData.mapDescriptionTypeId = dbData.mapDescriptionTypeId;
|
||||
ddsData.url = dbData.url.toStdString();
|
||||
ddsData.minScale = dbData.minScale;
|
||||
ddsData.maxScale = dbData.maxScale;
|
||||
|
||||
// init data not in db
|
||||
ddsData.isDeleted(false);
|
||||
ddsData.isUsed(false);
|
||||
ddsData.isDeleted = false;
|
||||
ddsData.isUsed = false;
|
||||
|
||||
return ddsData;
|
||||
}
|
||||
|
||||
+2
-2
@@ -27,8 +27,8 @@ public:
|
||||
Core::FunctionReplyObject updateObject(const MapDescription &data);
|
||||
Core::FunctionReplyObject removeObject();
|
||||
|
||||
qint32 getId() const { return m_data.id(); }
|
||||
QString getName() const { return QString::fromStdString(m_data.name()); }
|
||||
qint32 getId() const { return m_data.id; }
|
||||
QString getName() const { return QString::fromStdString(m_data.name); }
|
||||
const MapDescription &getData() const { return m_data; }
|
||||
|
||||
bool isValid() const;
|
||||
|
||||
@@ -25,19 +25,19 @@ ObjectRelayInfo::ObjectRelayInfo(MainHandler *mainHandler)
|
||||
ObjectRelayInfo::~ObjectRelayInfo()
|
||||
{
|
||||
if (isValid())
|
||||
m_mainHandler->dds()->dts()->removeRelayInfoByKey(m_data.id());
|
||||
m_mainHandler->dds()->dts()->removeRelayInfoByKey(m_data.id);
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
bool ObjectRelayInfo::isValid() const
|
||||
{
|
||||
return m_data.id() > 0;
|
||||
return m_data.id > 0;
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
bool ObjectRelayInfo::isUsed() const
|
||||
{
|
||||
return m_data.isUsed();
|
||||
return m_data.isUsed;
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
@@ -45,79 +45,79 @@ Core::FunctionReplyObject ObjectRelayInfo::createObject(const RelayInfo &data)
|
||||
{
|
||||
m_data = data;
|
||||
|
||||
if (m_data.id() < 0)
|
||||
if (m_data.id < 0)
|
||||
{
|
||||
m_data.isUsed(false);
|
||||
m_data.isUsed = false;
|
||||
|
||||
Database::AsmEgcuRelayInfo dbData(toDbData(data));
|
||||
|
||||
if (!m_mainHandler->db()->insert(dbData))
|
||||
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting AsmEgcuRelayInfo-data into database"));
|
||||
|
||||
m_data.id(dbData.id);
|
||||
DEBUG_LOG(m_logger) << "New relayInfo Id: " << m_data.id();
|
||||
m_data.id = dbData.id;
|
||||
DEBUG_LOG(m_logger) << "New relayInfo Id: " << m_data.id;
|
||||
}
|
||||
|
||||
// Publish Data via DTS
|
||||
onPublishData();
|
||||
|
||||
return Core::FunctionReplyObject(m_data.id());
|
||||
return Core::FunctionReplyObject(m_data.id);
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
Core::FunctionReplyObject ObjectRelayInfo::updateObject(const RelayInfo &data)
|
||||
{
|
||||
if (!isValid())
|
||||
return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Object not valid/blocked"));
|
||||
return Core::FunctionReplyObject(data.id, tr_lts("dds", "Object not valid/blocked"));
|
||||
|
||||
Database::AsmEgcuRelayInfo dbData;
|
||||
dbData = toDbData(data);
|
||||
|
||||
if (!m_mainHandler->db()->update(dbData))
|
||||
return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating AsmEgcuRelayInfo-data into database"));
|
||||
return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error updating AsmEgcuRelayInfo-data into database"));
|
||||
|
||||
m_data = data;
|
||||
DEBUG_LOG(m_logger) << "Data changed for relayInfo Id: " << m_data.id();
|
||||
DEBUG_LOG(m_logger) << "Data changed for relayInfo Id: " << m_data.id;
|
||||
|
||||
// Publish Data via DTS
|
||||
onPublishData();
|
||||
|
||||
return Core::FunctionReplyObject(m_data.id());
|
||||
return Core::FunctionReplyObject(m_data.id);
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
Core::FunctionReplyObject ObjectRelayInfo::setUsed(bool isUsed)
|
||||
{
|
||||
if (!isValid())
|
||||
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "Trying to update an already removed AsmEgcuRelayInfo object"));
|
||||
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Trying to update an already removed AsmEgcuRelayInfo object"));
|
||||
|
||||
m_data.isUsed(isUsed);
|
||||
m_data.isUsed = isUsed;
|
||||
|
||||
// Publish Data via DTS
|
||||
onPublishData();
|
||||
|
||||
return Core::FunctionReplyObject(m_data.id());
|
||||
return Core::FunctionReplyObject(m_data.id);
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
Core::FunctionReplyObject ObjectRelayInfo::removeObject()
|
||||
{
|
||||
if (isUsed())
|
||||
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "RelayInfo still in use"));
|
||||
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "RelayInfo still in use"));
|
||||
|
||||
if (!m_mainHandler->db()->removeAsmEgcuRelayInfo(m_data.id()))
|
||||
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "RelayInfo with id %1 can not be removed from DB")).arg(m_data.id());
|
||||
if (!m_mainHandler->db()->removeAsmEgcuRelayInfo(m_data.id))
|
||||
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "RelayInfo with id %1 can not be removed from DB")).arg(m_data.id);
|
||||
|
||||
if (!m_mainHandler->dds()->dts()->removeRelayInfoByKey(m_data.id()))
|
||||
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "RelayInfo with id %1 can not be removed from DDS")).arg(m_data.id());
|
||||
if (!m_mainHandler->dds()->dts()->removeRelayInfoByKey(m_data.id))
|
||||
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "RelayInfo with id %1 can not be removed from DDS")).arg(m_data.id);
|
||||
|
||||
return Core::FunctionReplyObject(m_data.id());
|
||||
return Core::FunctionReplyObject(m_data.id);
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
void ObjectRelayInfo::onPublishData()
|
||||
{
|
||||
INFO_LOG(m_logger) << "Publish AsmEgcuRelayInfo-data to dds (" << m_data.id() << ") ...";
|
||||
INFO_LOG(m_logger) << "Publish AsmEgcuRelayInfo-data to dds (" << m_data.id << ") ...";
|
||||
|
||||
if (!m_mainHandler->dds()->dts()->publish(m_data))
|
||||
ERROR_LOG(m_logger) << "Error publishing AsmEgcuRelayInfo-data to dds";
|
||||
@@ -132,11 +132,11 @@ Database::AsmEgcuRelayInfo ObjectRelayInfo::toDbData(const RelayInfo &ddsData)
|
||||
{
|
||||
Database::AsmEgcuRelayInfo dbData;
|
||||
|
||||
dbData.id = ddsData.id();
|
||||
dbData.relayId = ddsData.id();
|
||||
dbData.name = QString::fromStdString(ddsData.name());
|
||||
dbData.description = QString::fromStdString(ddsData.description());
|
||||
dbData.properties = QString::fromStdString(ddsData.property());
|
||||
dbData.id = ddsData.id;
|
||||
dbData.relayId = ddsData.id;
|
||||
dbData.name = QString::fromStdString(ddsData.name);
|
||||
dbData.description = QString::fromStdString(ddsData.description);
|
||||
dbData.properties = QString::fromStdString(ddsData.property);
|
||||
|
||||
return dbData;
|
||||
}
|
||||
@@ -147,14 +147,14 @@ RelayInfo ObjectRelayInfo::toDdsData(const Database::AsmEgcuRelayInfo &dbData)
|
||||
{
|
||||
RelayInfo ddsData;
|
||||
|
||||
ddsData.id(dbData.relayId);
|
||||
ddsData.name(dbData.name.toStdString());
|
||||
ddsData.description(dbData.description.toStdString());
|
||||
ddsData.property(dbData.properties.toStdString());
|
||||
ddsData.id = dbData.relayId;
|
||||
ddsData.name = dbData.name.toStdString();
|
||||
ddsData.description = dbData.description.toStdString();
|
||||
ddsData.property = dbData.properties.toStdString();
|
||||
|
||||
// init data not in db
|
||||
ddsData.isDeleted(false);
|
||||
ddsData.isUsed(false);
|
||||
ddsData.isDeleted = false;
|
||||
ddsData.isUsed = false;
|
||||
|
||||
return ddsData;
|
||||
}
|
||||
|
||||
@@ -34,8 +34,8 @@ public:
|
||||
Core::FunctionReplyObject updateObject(const RelayInfo &data);
|
||||
Core::FunctionReplyObject removeObject();
|
||||
|
||||
qint32 getId() const { return m_data.id(); }
|
||||
QString getName() const { return QString::fromStdString(m_data.name()); }
|
||||
qint32 getId() const { return m_data.id; }
|
||||
QString getName() const { return QString::fromStdString(m_data.name); }
|
||||
const RelayInfo &getData() const { return m_data; }
|
||||
|
||||
bool isValid() const;
|
||||
|
||||
+28
-28
@@ -24,19 +24,19 @@ ObjectTrainingArea::ObjectTrainingArea(MainHandler *mainHandler)
|
||||
ObjectTrainingArea::~ObjectTrainingArea()
|
||||
{
|
||||
if (isValid())
|
||||
m_mainHandler->dds()->dts()->removeTrainingAreaByKey(m_data.id());
|
||||
m_mainHandler->dds()->dts()->removeTrainingAreaByKey(m_data.id);
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
bool ObjectTrainingArea::isValid() const
|
||||
{
|
||||
return m_data.id() > 0;
|
||||
return m_data.id > 0;
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
bool ObjectTrainingArea::isUsed() const
|
||||
{
|
||||
return m_data.isUsed();
|
||||
return m_data.isUsed;
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
@@ -44,79 +44,79 @@ Core::FunctionReplyObject ObjectTrainingArea::createObject(const TrainingArea &d
|
||||
{
|
||||
m_data = data;
|
||||
|
||||
if (m_data.id() <= 0)
|
||||
if (m_data.id <= 0)
|
||||
{
|
||||
m_data.isUsed(false);
|
||||
m_data.isUsed = false;
|
||||
|
||||
Database::AsmTrainingArea dbData(toDbData(data));
|
||||
|
||||
if (!m_mainHandler->db()->insert(dbData))
|
||||
return Core::FunctionReplyObject(0, tr_lts("dds", "Error inserting AsmTrainingArea-data into database"));
|
||||
|
||||
m_data.id(dbData.id);
|
||||
DEBUG_LOG(m_logger) << "New mapId: " << m_data.id();
|
||||
m_data.id = dbData.id;
|
||||
DEBUG_LOG(m_logger) << "New mapId: " << m_data.id;
|
||||
}
|
||||
|
||||
// Publish Data via DTS
|
||||
onPublishData();
|
||||
|
||||
return Core::FunctionReplyObject(m_data.id());
|
||||
return Core::FunctionReplyObject(m_data.id);
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
Core::FunctionReplyObject ObjectTrainingArea::updateObject(const TrainingArea &data)
|
||||
{
|
||||
if (!isValid())
|
||||
return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Object not valid/blocked"));
|
||||
return Core::FunctionReplyObject(data.id, tr_lts("dds", "Object not valid/blocked"));
|
||||
|
||||
Database::AsmTrainingArea dbData;
|
||||
dbData = toDbData(data);
|
||||
|
||||
if (!m_mainHandler->db()->update(dbData))
|
||||
return Core::FunctionReplyObject(data.id(), tr_lts("dds", "Error updating AsmTrainingArea-data into database"));
|
||||
return Core::FunctionReplyObject(data.id, tr_lts("dds", "Error updating AsmTrainingArea-data into database"));
|
||||
|
||||
m_data = data;
|
||||
DEBUG_LOG(m_logger) << "Data changed for mapId: " << m_data.id();
|
||||
DEBUG_LOG(m_logger) << "Data changed for mapId: " << m_data.id;
|
||||
|
||||
// Publish Data via DTS
|
||||
onPublishData();
|
||||
|
||||
return Core::FunctionReplyObject(m_data.id());
|
||||
return Core::FunctionReplyObject(m_data.id);
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
Core::FunctionReplyObject ObjectTrainingArea::setUsed(bool isUsed)
|
||||
{
|
||||
if (!isValid())
|
||||
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "Trying to update an already removed AsmTrainingArea object"));
|
||||
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "Trying to update an already removed AsmTrainingArea object"));
|
||||
|
||||
m_data.isUsed(isUsed);
|
||||
m_data.isUsed = isUsed;
|
||||
|
||||
// Publish Data via DTS
|
||||
onPublishData();
|
||||
|
||||
return Core::FunctionReplyObject(m_data.id());
|
||||
return Core::FunctionReplyObject(m_data.id);
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
Core::FunctionReplyObject ObjectTrainingArea::removeObject()
|
||||
{
|
||||
if (isUsed())
|
||||
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "TrainingArea still in use"));
|
||||
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "TrainingArea still in use"));
|
||||
|
||||
if (!m_mainHandler->db()->removeAsmTrainingArea(m_data.id()))
|
||||
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "TrainingArea with id %1 can not be removed from DB")).arg(m_data.id());
|
||||
if (!m_mainHandler->db()->removeAsmTrainingArea(m_data.id))
|
||||
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "TrainingArea with id %1 can not be removed from DB")).arg(m_data.id);
|
||||
|
||||
if (!m_mainHandler->dds()->dts()->removeTrainingAreaByKey(m_data.id()))
|
||||
return Core::FunctionReplyObject(m_data.id(), tr_lts("dds", "TrainingArea with id %1 can not be removed from DDS")).arg(m_data.id());
|
||||
if (!m_mainHandler->dds()->dts()->removeTrainingAreaByKey(m_data.id))
|
||||
return Core::FunctionReplyObject(m_data.id, tr_lts("dds", "TrainingArea with id %1 can not be removed from DDS")).arg(m_data.id);
|
||||
|
||||
return Core::FunctionReplyObject(m_data.id());
|
||||
return Core::FunctionReplyObject(m_data.id);
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
void ObjectTrainingArea::onPublishData()
|
||||
{
|
||||
INFO_LOG(m_logger) << "Publish AsmTrainingArea-data to dds (" << m_data.id() << ") ...";
|
||||
INFO_LOG(m_logger) << "Publish AsmTrainingArea-data to dds (" << m_data.id << ") ...";
|
||||
|
||||
if (!m_mainHandler->dds()->dts()->publish(m_data))
|
||||
ERROR_LOG(m_logger) << "Error publishing AsmTrainingArea-data to dds";
|
||||
@@ -131,13 +131,13 @@ Database::AsmTrainingArea ObjectTrainingArea::toDbData(const TrainingArea &ddsDa
|
||||
{
|
||||
Database::AsmTrainingArea dbData;
|
||||
|
||||
dbData.id = ddsData.id();
|
||||
dbData.name = QString::fromStdString(ddsData.name());
|
||||
dbData.bottomLeft = QPointF(ddsData.bottomLeft().lon(), ddsData.bottomLeft().lat());
|
||||
dbData.height = ddsData.height();
|
||||
dbData.width = ddsData.width();
|
||||
dbData.id = ddsData.id;
|
||||
dbData.name = QString::fromStdString(ddsData.name);
|
||||
dbData.bottomLeft = QPointF(ddsData.bottomLeft.lon, ddsData.bottomLeft.lat);
|
||||
dbData.height = ddsData.height;
|
||||
dbData.width = ddsData.width;
|
||||
|
||||
dbData.image = QByteArray::fromRawData(reinterpret_cast<const char *>(&ddsData.image()[0]), ddsData.image().size());
|
||||
dbData.image = QByteArray::fromRawData(reinterpret_cast<const char *>(&ddsData.image[0]), ddsData.image.size());
|
||||
|
||||
return dbData;
|
||||
}
|
||||
|
||||
@@ -34,8 +34,8 @@ public:
|
||||
Core::FunctionReplyObject updateObject(const TrainingArea &data);
|
||||
Core::FunctionReplyObject removeObject();
|
||||
|
||||
qint32 getId() const { return m_data.id(); }
|
||||
QString getName() const { return QString::fromStdString(m_data.name()); }
|
||||
qint32 getId() const { return m_data.id; }
|
||||
QString getName() const { return QString::fromStdString(m_data.name); }
|
||||
const TrainingArea &getData() const { return m_data; }
|
||||
|
||||
bool isValid() const;
|
||||
|
||||
Reference in new issue
Block a user