Migrates remaining services and plugins to generated rtiddsgen API
Converts accessor calls to plain member access across the residual service set.
This commit is contained in:
104 files changed
+2424
-2430
No files matched your search
+69
-69
@@ -169,10 +169,10 @@ void WhgTests::tryModify()
|
||||
EquipmentTypeWh data;
|
||||
getEqtTypeWhModifyRequestData(data);
|
||||
|
||||
INFO_LOG(m_logger) << "trying to send ModifyEquipementTypeWhRequest for eqtTypeWhId:" << data.id();
|
||||
INFO_LOG(m_logger) << "trying to send ModifyEquipementTypeWhRequest for eqtTypeWhId:" << data.id;
|
||||
if (!m_ftc->modifyEquipmentTypeWhRequest(data, this))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting modify data for eqtTypeWhId:" << data.id();
|
||||
ERROR_LOG(m_logger) << "Error requesting modify data for eqtTypeWhId:" << data.id;
|
||||
failExit();
|
||||
}
|
||||
} // end of tryModify()
|
||||
@@ -183,12 +183,12 @@ void WhgTests::tryRemove()
|
||||
m_eTestStep = eRemove;
|
||||
RemoveEquipmentTypeWhRequest data;
|
||||
|
||||
data.id(m_equipmentTypeWhId);
|
||||
data.id = m_equipmentTypeWhId;
|
||||
|
||||
INFO_LOG(m_logger) << "trying to send remove request for eqtTypeWhId:" << data.id();
|
||||
INFO_LOG(m_logger) << "trying to send remove request for eqtTypeWhId:" << data.id;
|
||||
if (!m_ftc->removeEquipmentTypeWhRequest(data, this))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting remove data for eqtTypeWhId:" << data.id();
|
||||
ERROR_LOG(m_logger) << "Error requesting remove data for eqtTypeWhId:" << data.id;
|
||||
failExit();
|
||||
}
|
||||
} // end of tryRemove()
|
||||
@@ -213,10 +213,10 @@ void WhgTests::tryGetAllEquipmentTypesWh()
|
||||
for (auto it = map.begin(); it != map.end(); ++it)
|
||||
{
|
||||
INFO_LOG(m_logger) << "whg(" << it.key() << ") :"
|
||||
<< " name:" << it.value().name()
|
||||
<< " minEquipNo:" << it.value().minEquipNo()
|
||||
<< " maxEquipNo:" << it.value().maxEquipNo()
|
||||
<< " vbAgdus:" << it.value().vbAgdusId();
|
||||
<< " name:" << it.value().name
|
||||
<< " minEquipNo:" << it.value().minEquipNo
|
||||
<< " maxEquipNo:" << it.value().maxEquipNo
|
||||
<< " vbAgdus:" << it.value().vbAgdusId;
|
||||
}
|
||||
|
||||
QTimer::singleShot(0, qApp, &QCoreApplication::quit);
|
||||
@@ -240,18 +240,18 @@ void WhgTests::tryGetEquipmentTypeWh()
|
||||
m_dtc->waitForHistoricalDataEquipmentTypeWh();
|
||||
WarehouseGuez::EquipmentTypeWh data = m_dtc->equipmentTypeWh(m_equipmentTypeWhId);
|
||||
|
||||
if (data.id() < 0)
|
||||
if (data.id < 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error receiving data for equipmentTypeId " << m_equipmentTypeWhId << " returnVal:" << data.id();
|
||||
ERROR_LOG(m_logger) << "Error receiving data for equipmentTypeId " << m_equipmentTypeWhId << " returnVal:" << data.id;
|
||||
failExit();
|
||||
}
|
||||
else
|
||||
{
|
||||
INFO_LOG(m_logger) << "whg(" << data.id() << ") :"
|
||||
<< " name:" << data.name()
|
||||
<< " minEquipNo:" << data.minEquipNo()
|
||||
<< " maxEquipNo:" << data.maxEquipNo()
|
||||
<< " vbAgdus:" << data.vbAgdusId();
|
||||
INFO_LOG(m_logger) << "whg(" << data.id << ") :"
|
||||
<< " name:" << data.name
|
||||
<< " minEquipNo:" << data.minEquipNo
|
||||
<< " maxEquipNo:" << data.maxEquipNo
|
||||
<< " vbAgdus:" << data.vbAgdusId;
|
||||
}
|
||||
|
||||
if (m_testId == 0)
|
||||
@@ -379,21 +379,21 @@ void WhgTests::onRemoveInjuryModelAgdusWhReply(const Core::FunctionReplyObject &
|
||||
//-----------------------------------------------------------------------------
|
||||
void WhgTests::onReceiveEqtTypeChanged(const EquipmentTypeWh &data, DataModification modType)
|
||||
{
|
||||
INFO_LOG(m_logger) << "onReceiveEqtTypeChanged() eqtTypeWhId:" << data.id()
|
||||
INFO_LOG(m_logger) << "onReceiveEqtTypeChanged() eqtTypeWhId:" << data.id
|
||||
<< " modificationType: = " << (int)modType<< " received";
|
||||
|
||||
switch (modType)
|
||||
{
|
||||
case DataModification::eAdded:
|
||||
INFO_LOG(m_logger) << "*** EquipmentTypeWh added received. eqtTypeWhId:" << data.id();
|
||||
INFO_LOG(m_logger) << "*** EquipmentTypeWh added received. eqtTypeWhId:" << data.id;
|
||||
break;
|
||||
|
||||
case DataModification::eModified:
|
||||
INFO_LOG(m_logger) << "*** EquipmentTypeWh modified received. eqtTypeWhId:" << data.id();
|
||||
INFO_LOG(m_logger) << "*** EquipmentTypeWh modified received. eqtTypeWhId:" << data.id;
|
||||
break;
|
||||
|
||||
case DataModification::eRemoved:
|
||||
INFO_LOG(m_logger) << "*** EquipmentTypeWh removed received. eqtTypeWhId:" << data.id();
|
||||
INFO_LOG(m_logger) << "*** EquipmentTypeWh removed received. eqtTypeWhId:" << data.id;
|
||||
break;
|
||||
|
||||
default:
|
||||
@@ -405,51 +405,51 @@ void WhgTests::onReceiveEqtTypeChanged(const EquipmentTypeWh &data, DataModifica
|
||||
//-----------------------------------------------------------------------------
|
||||
void WhgTests::getEqtTypeWhCreateRequestData(EquipmentTypeWh &data)
|
||||
{
|
||||
data.id(); // -1 for add, 0 is a valid id // 0 should be valid though?!?
|
||||
data.name("TestEqtTypeCreate");
|
||||
data.minEquipNo(1000);
|
||||
data.maxEquipNo(3000);
|
||||
data.vbAgdusId(1);
|
||||
data.configurationAgdusHV(ConfigurationAgdusHV_def::AgdusHWNoHelmetNoWest);
|
||||
data.id; // -1 for add, 0 is a valid id // 0 should be valid though?!?
|
||||
data.name = "TestEqtTypeCreate";
|
||||
data.minEquipNo = 1000;
|
||||
data.maxEquipNo = 3000;
|
||||
data.vbAgdusId = 1;
|
||||
data.configurationAgdusHV = ConfigurationAgdusHV::AgdusHWNoHelmetNoWest;
|
||||
|
||||
} // end of getEqtTypeWhCreateRequestData()
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
void WhgTests::getEqtTypeWhModifyRequestData(EquipmentTypeWh &data)
|
||||
{
|
||||
data.id(m_equipmentTypeWhId);
|
||||
data.name("TestEqtTypeModify");
|
||||
data.maxEquipNo(3100);
|
||||
data.minEquipNo(1100);
|
||||
data.vbAgdusId(2);
|
||||
data.configurationAgdusHV(ConfigurationAgdusHV_def::AgdusHWWithHelmetWithVest);
|
||||
data.id = m_equipmentTypeWhId;
|
||||
data.name = "TestEqtTypeModify";
|
||||
data.maxEquipNo = 3100;
|
||||
data.minEquipNo = 1100;
|
||||
data.vbAgdusId = 2;
|
||||
data.configurationAgdusHV = ConfigurationAgdusHV::AgdusHWWithHelmetWithVest;
|
||||
|
||||
} // end of getEqtTypeWhModifyRequestData()
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
void WhgTests::getInjuryModelWhCreateRequestData(InjuryModelAgdusWh &data)
|
||||
{
|
||||
data.name("TestInjuryModelCreate");
|
||||
data.version("1.0");
|
||||
data.description("This is the description");
|
||||
data.id(0);
|
||||
data.name = "TestInjuryModelCreate";
|
||||
data.version = "1.0";
|
||||
data.description = "This is the description";
|
||||
data.id = 0;
|
||||
|
||||
} // end of getInjuryModelWhCreateRequestData()
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
void WhgTests::getInjuryModelWhModifyRequestData(InjuryModelAgdusWh &data)
|
||||
{
|
||||
data.id(m_injuryModelWhId);
|
||||
data.name("TestInjuryModelWhModify");
|
||||
data.version("2.0");
|
||||
data.description("Description Modify");
|
||||
data.id = m_injuryModelWhId;
|
||||
data.name = "TestInjuryModelWhModify";
|
||||
data.version = "2.0";
|
||||
data.description = "Description Modify";
|
||||
|
||||
} // end of getInjuryModelWhModifyRequestData()
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
bool WhgTests::onCompareCreatedData(EquipmentTypeWh &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "start onCompareCreatedData() for id :" << data.id();
|
||||
DEBUG_LOG(m_logger) << "start onCompareCreatedData() for id :" << data.id;
|
||||
|
||||
// Vergleicht die zurueckgelesen Datan mit den statischen create Daten
|
||||
|
||||
@@ -457,27 +457,27 @@ bool WhgTests::onCompareCreatedData(EquipmentTypeWh &data)
|
||||
|
||||
getEqtTypeWhCreateRequestData(createData);
|
||||
|
||||
if (createData.name() != data.name())
|
||||
if (createData.name != data.name)
|
||||
return false;
|
||||
|
||||
if (createData.minEquipNo() != data.minEquipNo())
|
||||
if (createData.minEquipNo != data.minEquipNo)
|
||||
return false;
|
||||
|
||||
if (createData.maxEquipNo() != data.maxEquipNo())
|
||||
if (createData.maxEquipNo != data.maxEquipNo)
|
||||
return false;
|
||||
|
||||
if (createData.vbAgdusId() != data.vbAgdusId())
|
||||
if (createData.vbAgdusId != data.vbAgdusId)
|
||||
return false;
|
||||
|
||||
|
||||
DEBUG_LOG(m_logger) << "successfull finished onCompareCreatedData() for id :" << data.id();
|
||||
DEBUG_LOG(m_logger) << "successfull finished onCompareCreatedData() for id :" << data.id;
|
||||
|
||||
return true;
|
||||
} // end of onCompareCreatedData()
|
||||
|
||||
bool WhgTests::onCompareCreatedData(InjuryModelAgdusWh &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "start onCompareCreatedData() for id :" << data.id();
|
||||
DEBUG_LOG(m_logger) << "start onCompareCreatedData() for id :" << data.id;
|
||||
|
||||
// Vergleicht die zurueckgelesen Datan mit den statischen create Daten
|
||||
|
||||
@@ -485,16 +485,16 @@ bool WhgTests::onCompareCreatedData(InjuryModelAgdusWh &data)
|
||||
|
||||
getInjuryModelWhCreateRequestData(createData);
|
||||
|
||||
if (createData.name() != data.name())
|
||||
if (createData.name != data.name)
|
||||
return false;
|
||||
|
||||
if (createData.version() != data.version())
|
||||
if (createData.version != data.version)
|
||||
return false;
|
||||
|
||||
if (createData.description() != data.description())
|
||||
if (createData.description != data.description)
|
||||
return false;
|
||||
|
||||
DEBUG_LOG(m_logger) << "successfull finished onCompareCreatedData() for id :" << data.id();
|
||||
DEBUG_LOG(m_logger) << "successfull finished onCompareCreatedData() for id :" << data.id;
|
||||
|
||||
return true;
|
||||
} // end of onCompareCreatedData()
|
||||
@@ -502,28 +502,28 @@ bool WhgTests::onCompareCreatedData(InjuryModelAgdusWh &data)
|
||||
//-----------------------------------------------------------------------------
|
||||
bool WhgTests::onCompareModifiedData(EquipmentTypeWh &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "start onCompareModifiedData() for id :" << data.id();
|
||||
DEBUG_LOG(m_logger) << "start onCompareModifiedData() for id :" << data.id;
|
||||
|
||||
EquipmentTypeWh modifyData;
|
||||
|
||||
getEqtTypeWhModifyRequestData(modifyData);
|
||||
|
||||
if (modifyData.id() != data.id())
|
||||
if (modifyData.id != data.id)
|
||||
return false;
|
||||
|
||||
if (modifyData.name() != data.name())
|
||||
if (modifyData.name != data.name)
|
||||
return false;
|
||||
|
||||
if (modifyData.minEquipNo() != data.minEquipNo())
|
||||
if (modifyData.minEquipNo != data.minEquipNo)
|
||||
return false;
|
||||
|
||||
if (modifyData.maxEquipNo() != data.maxEquipNo())
|
||||
if (modifyData.maxEquipNo != data.maxEquipNo)
|
||||
return false;
|
||||
|
||||
if (modifyData.vbAgdusId() != data.vbAgdusId())
|
||||
if (modifyData.vbAgdusId != data.vbAgdusId)
|
||||
return false;
|
||||
|
||||
DEBUG_LOG(m_logger) << "successfully finished onCompareModifiedData() for id :" << data.id();
|
||||
DEBUG_LOG(m_logger) << "successfully finished onCompareModifiedData() for id :" << data.id;
|
||||
|
||||
return true;
|
||||
} // end of onCompareModifiedData()
|
||||
@@ -531,25 +531,25 @@ bool WhgTests::onCompareModifiedData(EquipmentTypeWh &data)
|
||||
//-----------------------------------------------------------------------------
|
||||
bool WhgTests::onCompareModifiedData(InjuryModelAgdusWh &data)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "start onCompareModifiedData() for id :" << data.id();
|
||||
DEBUG_LOG(m_logger) << "start onCompareModifiedData() for id :" << data.id;
|
||||
|
||||
InjuryModelAgdusWh modifyData;
|
||||
|
||||
getInjuryModelWhModifyRequestData(modifyData);
|
||||
|
||||
if (modifyData.id() != data.id())
|
||||
if (modifyData.id != data.id)
|
||||
return false;
|
||||
|
||||
if (modifyData.name() != data.name())
|
||||
if (modifyData.name != data.name)
|
||||
return false;
|
||||
|
||||
if (modifyData.version() != data.version())
|
||||
if (modifyData.version != data.version)
|
||||
return false;
|
||||
|
||||
if (modifyData.description() != data.description())
|
||||
if (modifyData.description != data.description)
|
||||
return false;
|
||||
|
||||
DEBUG_LOG(m_logger) << "successfull finished onCompareModifiedData() for id :" << data.id();
|
||||
DEBUG_LOG(m_logger) << "successfull finished onCompareModifiedData() for id :" << data.id;
|
||||
|
||||
return true;
|
||||
} // end of onCompareModifiedData()
|
||||
@@ -577,10 +577,10 @@ void WhgTests::tryModifyInjuryModel()
|
||||
InjuryModelAgdusWh data;
|
||||
getInjuryModelWhModifyRequestData(data);
|
||||
|
||||
ERROR_LOG(m_logger) << "trying to send modifyInjuryModelAgdusWhRequest for injuryModelWhId:" << data.id();
|
||||
ERROR_LOG(m_logger) << "trying to send modifyInjuryModelAgdusWhRequest for injuryModelWhId:" << data.id;
|
||||
if (!m_ftc->modifyInjuryModelAgdusWhRequest(data, this))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting modify data for injuryModelWhId:" << data.id();
|
||||
ERROR_LOG(m_logger) << "Error requesting modify data for injuryModelWhId:" << data.id;
|
||||
failExit();
|
||||
}
|
||||
} // end of tryModifyInjuryModel()
|
||||
@@ -591,12 +591,12 @@ void WhgTests::tryRemoveInjuryModel()
|
||||
m_eTestStep = eRemoveInjuryModel;
|
||||
Core::RemoveElementRequest data;
|
||||
|
||||
data.id(m_injuryModelWhId);
|
||||
data.id = m_injuryModelWhId;
|
||||
|
||||
INFO_LOG(m_logger) << "trying to send remove request for injuryModelWhId:" << data.id();
|
||||
INFO_LOG(m_logger) << "trying to send remove request for injuryModelWhId:" << data.id;
|
||||
if (!m_ftc->removeInjuryModelAgdusWhRequest(data, this))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error requesting remove data for injuryModelWhId:" << data.id();
|
||||
ERROR_LOG(m_logger) << "Error requesting remove data for injuryModelWhId:" << data.id;
|
||||
failExit();
|
||||
}
|
||||
} // end of tryRemoveInjuryModel()
|
||||
|
||||
+1
-1
@@ -107,7 +107,7 @@ void DataManager::onTextMessageFromScm(const QString &message)
|
||||
{
|
||||
const QJsonObject &port = valPort.toObject();
|
||||
int typeId = port.value(TYPE_ID()).toInt();
|
||||
if (typeId == Core::CorePortType::WebSocketServer)
|
||||
if (typeId == static_cast<int>(Core::CorePortType::WebSocketServer))
|
||||
{
|
||||
int tabPort = port.value(NUMBER()).toInt();
|
||||
DEBUG_LOG(m_logger) << "connect to TAB - port: " << tabPort;
|
||||
|
||||
+35
-35
@@ -55,46 +55,46 @@ bool HandlerEquipmentTypeWh::init()
|
||||
|
||||
void convert(Database::EquipmentTypeWh &data, const EquipmentTypeWh &request)
|
||||
{
|
||||
data.id = request.id();
|
||||
data.name = QString::fromStdString(request.name());
|
||||
data.canAbeSprache = request.configurationAbeLanguage().underlying();
|
||||
data.agdusHelmWeste = request.configurationAgdusHV().underlying();
|
||||
data.canAbeSprAusg = request.configurationAudioResponse();
|
||||
data.canWirkdarstPyro = request.configurationCedPyrotechnic();
|
||||
data.anzeigeAdag = request.configurationDisplayAdag().underlying();
|
||||
data.adagUntergruppe = request.configurationDisplayAdagSubUnit().underlying();
|
||||
data.canMhgrEnergie = request.configurationMhgrEnergieSave();
|
||||
data.canMhgrBetrArt = request.configurationMhgrOperatingMode().underlying();
|
||||
data.canSsFirSan = request.configurationSsFirSan();
|
||||
data.canSsFirFunkt = request.configurationSsFirFunction().underlying();
|
||||
data.canSsMvFunkt = request.configurationSsMineFitFunction().underlying();
|
||||
data.canSsStdFunkt = request.configurationSsStandardFunction().underlying();
|
||||
data.canStartupZeit = request.configurationStartupTime();
|
||||
data.ausstgGrp = request.equipGroup();
|
||||
data.ausstgNrMax = request.maxEquipNo();
|
||||
data.ausstgNrMin = request.minEquipNo();
|
||||
data.vbAgdus = request.vbAgdusId();
|
||||
data.vbEinsatzmittel = request.vbAirSupport();
|
||||
data.vbSteilfeuer = request.vbFireArea();
|
||||
data.vbMinenIed = request.vbMineIed();
|
||||
data.vbAcWaffen = request.vbNc();
|
||||
data.canDevices = request.canDevices();
|
||||
data.posUpdate = request.posUpdate().underlying();
|
||||
data.id = request.id;
|
||||
data.name = QString::fromStdString(request.name);
|
||||
data.canAbeSprache = request.configurationAbeLanguage;
|
||||
data.agdusHelmWeste = request.configurationAgdusHV;
|
||||
data.canAbeSprAusg = request.configurationAudioResponse;
|
||||
data.canWirkdarstPyro = request.configurationCedPyrotechnic;
|
||||
data.anzeigeAdag = request.configurationDisplayAdag;
|
||||
data.adagUntergruppe = request.configurationDisplayAdagSubUnit;
|
||||
data.canMhgrEnergie = request.configurationMhgrEnergieSave;
|
||||
data.canMhgrBetrArt = request.configurationMhgrOperatingMode;
|
||||
data.canSsFirSan = request.configurationSsFirSan;
|
||||
data.canSsFirFunkt = request.configurationSsFirFunction;
|
||||
data.canSsMvFunkt = request.configurationSsMineFitFunction;
|
||||
data.canSsStdFunkt = request.configurationSsStandardFunction;
|
||||
data.canStartupZeit = request.configurationStartupTime;
|
||||
data.ausstgGrp = request.equipGroup;
|
||||
data.ausstgNrMax = request.maxEquipNo;
|
||||
data.ausstgNrMin = request.minEquipNo;
|
||||
data.vbAgdus = request.vbAgdusId;
|
||||
data.vbEinsatzmittel = request.vbAirSupport;
|
||||
data.vbSteilfeuer = request.vbFireArea;
|
||||
data.vbMinenIed = request.vbMineIed;
|
||||
data.vbAcWaffen = request.vbNc;
|
||||
data.canDevices = request.canDevices;
|
||||
data.posUpdate = request.posUpdate;
|
||||
}
|
||||
|
||||
void HandlerEquipmentTypeWh::onModifyEquipmentTypeWhRequest(const rti::core::SampleIdentity &cookie, const EquipmentTypeWh &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onModifyEquipmentTypeWhRequest() id:" << request.id();
|
||||
DEBUG_LOG(m_logger) << "onModifyEquipmentTypeWhRequest() id:" << request.id;
|
||||
|
||||
ObjectEquipmentTypeWh *ifs = nullptr;
|
||||
Core::FunctionReplyObject ret;
|
||||
if (request.id() <= 0) // add with -1
|
||||
if (request.id <= 0) // add with -1
|
||||
{
|
||||
Database::EquipmentTypeWh data;
|
||||
convert(data, request);
|
||||
data.id = 0 - request.id();
|
||||
data.id = 0 - request.id;
|
||||
|
||||
DEBUG_LOG(m_logger) << "Request.id = " << request.id() << ", data.id = " << data.id;
|
||||
DEBUG_LOG(m_logger) << "Request.id = " << request.id << ", data.id = " << data.id;
|
||||
|
||||
ifs = new ObjectEquipmentTypeWh(m_mainHandler);
|
||||
ret = ifs->createObject(data, true);
|
||||
@@ -111,10 +111,10 @@ void HandlerEquipmentTypeWh::onModifyEquipmentTypeWhRequest(const rti::core::Sam
|
||||
else // modify
|
||||
{
|
||||
|
||||
ifs = m_equipmenttypewhObjMap.value(request.id());
|
||||
ifs = m_equipmenttypewhObjMap.value(request.id);
|
||||
if (ifs == nullptr)
|
||||
{
|
||||
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "EquipmentTypeWh with id %1 not found")).arg(request.id());
|
||||
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "EquipmentTypeWh with id %1 not found")).arg(request.id);
|
||||
m_mainHandler->dds()->fts()->modifyEquipmentTypeWhReply(cookie, ret);
|
||||
return;
|
||||
}
|
||||
@@ -138,13 +138,13 @@ void HandlerEquipmentTypeWh::onModifyEquipmentTypeWhRequest(const rti::core::Sam
|
||||
//-----------------------------------------------------------------------------
|
||||
void HandlerEquipmentTypeWh::onRemoveEquipmentTypeWhRequest(const rti::core::SampleIdentity &cookie, const Core::RemoveElementRequest &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onRemoveEquipmentTypeWhRequest() id:" << request.id();
|
||||
DEBUG_LOG(m_logger) << "onRemoveEquipmentTypeWhRequest() id:" << request.id;
|
||||
|
||||
Core::FunctionReplyObject ret;
|
||||
ObjectEquipmentTypeWh *ifs = m_equipmenttypewhObjMap.value(request.id());
|
||||
ObjectEquipmentTypeWh *ifs = m_equipmenttypewhObjMap.value(request.id);
|
||||
if (ifs == nullptr)
|
||||
{
|
||||
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "EquipmentTypeWh with id %1 not found")).arg(request.id());
|
||||
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "EquipmentTypeWh with id %1 not found")).arg(request.id);
|
||||
m_mainHandler->dds()->fts()->removeEquipmentTypeWhReply(cookie, ret);
|
||||
return;
|
||||
}
|
||||
@@ -157,7 +157,7 @@ void HandlerEquipmentTypeWh::onRemoveEquipmentTypeWhRequest(const rti::core::Sam
|
||||
{
|
||||
// delete ObjectEquipmentTypeWH
|
||||
delete ifs;
|
||||
m_equipmenttypewhObjMap.remove(request.id());
|
||||
m_equipmenttypewhObjMap.remove(request.id);
|
||||
}
|
||||
|
||||
sendToEXCON();
|
||||
|
||||
+15
-15
@@ -56,16 +56,16 @@ bool HandlerInjuryModel::init()
|
||||
|
||||
void HandlerInjuryModel::onModifyInjuryModelAgdusWhRequest(const rti::core::SampleIdentity &cookie, const InjuryModelAgdusWh &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onModifyInjuryModelAgdusWhRequest() id:" << request.id();
|
||||
DEBUG_LOG(m_logger) << "onModifyInjuryModelAgdusWhRequest() id:" << request.id;
|
||||
|
||||
Core::FunctionReplyObject ret;
|
||||
if (request.id() <= 0)
|
||||
if (request.id <= 0)
|
||||
{
|
||||
Database::InjuryModelAgdusWh data;
|
||||
data.id = request.id();
|
||||
data.name = QString::fromStdString(request.name());
|
||||
data.version = QString::fromStdString(request.version());
|
||||
data.beschreibung = QString::fromStdString(request.description());
|
||||
data.id = request.id;
|
||||
data.name = QString::fromStdString(request.name);
|
||||
data.version = QString::fromStdString(request.version);
|
||||
data.beschreibung = QString::fromStdString(request.description);
|
||||
|
||||
ObjectInjuryModel *ifs(new ObjectInjuryModel(m_mainHandler));
|
||||
ret = ifs->createObject(data);
|
||||
@@ -82,18 +82,18 @@ void HandlerInjuryModel::onModifyInjuryModelAgdusWhRequest(const rti::core::Samp
|
||||
else
|
||||
{
|
||||
|
||||
ObjectInjuryModel *ifs = m_injurymodelObjMap.value(request.id());
|
||||
ObjectInjuryModel *ifs = m_injurymodelObjMap.value(request.id);
|
||||
if (ifs == nullptr)
|
||||
{
|
||||
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "InjuryModel with id %1 not found")).arg(request.id());
|
||||
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "InjuryModel with id %1 not found")).arg(request.id);
|
||||
m_mainHandler->dds()->fts()->modifyInjuryModelAgdusWhReply(cookie, ret);
|
||||
return;
|
||||
}
|
||||
|
||||
Database::InjuryModelAgdusWh data = ifs->getData();
|
||||
data.name = QString::fromStdString(request.name());
|
||||
data.version = QString::fromStdString(request.version());
|
||||
data.beschreibung = QString::fromStdString(request.description());
|
||||
data.name = QString::fromStdString(request.name);
|
||||
data.version = QString::fromStdString(request.version);
|
||||
data.beschreibung = QString::fromStdString(request.description);
|
||||
|
||||
ret = ifs->updateObject(data);
|
||||
}
|
||||
@@ -106,13 +106,13 @@ void HandlerInjuryModel::onModifyInjuryModelAgdusWhRequest(const rti::core::Samp
|
||||
|
||||
void HandlerInjuryModel::onRemoveInjuryModelAgdusWhRequest(const rti::core::SampleIdentity &cookie, const Core::RemoveElementRequest &request)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "onRemoveInjuryModelAgdusWhRequest() id:" << request.id();
|
||||
DEBUG_LOG(m_logger) << "onRemoveInjuryModelAgdusWhRequest() id:" << request.id;
|
||||
|
||||
Core::FunctionReplyObject ret;
|
||||
ObjectInjuryModel *ifs = m_injurymodelObjMap.value(request.id());
|
||||
ObjectInjuryModel *ifs = m_injurymodelObjMap.value(request.id);
|
||||
if (ifs == nullptr)
|
||||
{
|
||||
ret = Core::FunctionReplyObject(request.id(), tr_lts("dds", "InjuryModel with id %1 not found")).arg(request.id());
|
||||
ret = Core::FunctionReplyObject(request.id, tr_lts("dds", "InjuryModel with id %1 not found")).arg(request.id);
|
||||
m_mainHandler->dds()->fts()->removeInjuryModelAgdusWhReply(cookie, ret);
|
||||
return;
|
||||
}
|
||||
@@ -125,7 +125,7 @@ void HandlerInjuryModel::onRemoveInjuryModelAgdusWhRequest(const rti::core::Samp
|
||||
{
|
||||
// delete ObjectInjuryModel
|
||||
delete ifs;
|
||||
m_injurymodelObjMap.remove(request.id());
|
||||
m_injurymodelObjMap.remove(request.id);
|
||||
}
|
||||
|
||||
m_mainHandler->dds()->fts()->removeInjuryModelAgdusWhReply(cookie, ret);
|
||||
|
||||
@@ -43,9 +43,9 @@ bool HandlerTypes::init()
|
||||
static inline Database::Type convert(const ParticipantManagement::Type &data)
|
||||
{
|
||||
Database::Type dbType;
|
||||
dbType.id = data.id();
|
||||
dbType.name = QString::fromStdString(data.name());
|
||||
dbType.ausstgTypId = data.equipmentTypeId() == 0 ? QVariant() : data.equipmentTypeId();
|
||||
dbType.id = data.id;
|
||||
dbType.name = QString::fromStdString(data.name);
|
||||
dbType.ausstgTypId = data.equipmentTypeId == 0 ? QVariant() : data.equipmentTypeId;
|
||||
return dbType;
|
||||
}
|
||||
|
||||
@@ -58,13 +58,13 @@ void HandlerTypes::onTypeChanged(const ParticipantManagement::Type &data, DataMo
|
||||
case DataModification::eAdded:
|
||||
case DataModification::eModified:
|
||||
{
|
||||
m_mainHandler->db()->removeType(data.id());
|
||||
m_mainHandler->db()->removeType(data.id);
|
||||
auto dbData = convert(data);
|
||||
m_mainHandler->db()->insert(dbData);
|
||||
break;
|
||||
}
|
||||
case DataModification::eRemoved:
|
||||
m_mainHandler->db()->removeType(data.id());
|
||||
m_mainHandler->db()->removeType(data.id);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
+25
-25
@@ -65,31 +65,31 @@ void ObjectEquipmentTypeWh::onPublishData()
|
||||
{
|
||||
WarehouseGuez::EquipmentTypeWh ddsData;
|
||||
|
||||
ddsData.id(m_data.id);
|
||||
ddsData.configurationAbeLanguage(static_cast<WarehouseGuez::ConfigurationAbeLanguage_def::type>(m_data.canAbeSprache));
|
||||
ddsData.configurationAgdusHV(static_cast<WarehouseGuez::ConfigurationAgdusHV_def::type>(m_data.agdusHelmWeste));
|
||||
ddsData.configurationAudioResponse(m_data.canAbeSprAusg);
|
||||
ddsData.configurationCedPyrotechnic(m_data.canWirkdarstPyro);
|
||||
ddsData.configurationDisplayAdag(static_cast<WarehouseGuez::ConfigurationDisplayAdag_def::type>(m_data.anzeigeAdag));
|
||||
ddsData.configurationDisplayAdagSubUnit(static_cast<WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::type>(m_data.adagUntergruppe));
|
||||
ddsData.configurationMhgrEnergieSave(m_data.canMhgrEnergie);
|
||||
ddsData.configurationMhgrOperatingMode(static_cast<WarehouseGuez::ConfigurationMhgrSensor_def::type>(m_data.canMhgrBetrArt));
|
||||
ddsData.configurationSsFirSan(m_data.canSsFirSan);
|
||||
ddsData.configurationSsFirFunction(static_cast<WarehouseGuez::ConfigurationSpecialSensorFir_def::type>(m_data.canSsFirFunkt));
|
||||
ddsData.configurationSsMineFitFunction(static_cast<WarehouseGuez::ConfigurationSpecialSensorMineFit_def::type>(m_data.canSsMvFunkt));
|
||||
ddsData.configurationSsStandardFunction(static_cast<WarehouseGuez::ConfigurationSpecialSensorStd_def::type>(m_data.canSsStdFunkt));
|
||||
ddsData.configurationStartupTime(m_data.canStartupZeit);
|
||||
ddsData.equipGroup(m_data.ausstgGrp);
|
||||
ddsData.maxEquipNo(m_data.ausstgNrMax);
|
||||
ddsData.minEquipNo(m_data.ausstgNrMin);
|
||||
ddsData.name(m_data.name.toStdString());
|
||||
ddsData.posUpdate(static_cast<WarehouseGuez::ConfigurationPositionUpdate_def::type>(m_data.posUpdate));
|
||||
ddsData.vbAgdusId(m_data.vbAgdus);
|
||||
ddsData.vbAirSupport(m_data.vbEinsatzmittel);
|
||||
ddsData.vbFireArea(m_data.vbSteilfeuer);
|
||||
ddsData.vbMineIed(m_data.vbMinenIed);
|
||||
ddsData.vbNc(m_data.vbAcWaffen);
|
||||
ddsData.canDevices(m_data.canDevices);
|
||||
ddsData.id = m_data.id;
|
||||
ddsData.configurationAbeLanguage = static_cast<WarehouseGuez::ConfigurationAbeLanguage_def::type>(m_data.canAbeSprache);
|
||||
ddsData.configurationAgdusHV = static_cast<WarehouseGuez::ConfigurationAgdusHV_def::type>(m_data.agdusHelmWeste);
|
||||
ddsData.configurationAudioResponse = m_data.canAbeSprAusg;
|
||||
ddsData.configurationCedPyrotechnic = m_data.canWirkdarstPyro;
|
||||
ddsData.configurationDisplayAdag = static_cast<WarehouseGuez::ConfigurationDisplayAdag_def::type>(m_data.anzeigeAdag);
|
||||
ddsData.configurationDisplayAdagSubUnit = static_cast<WarehouseGuez::ConfigurationDisplayAdagSubUnit_def::type>(m_data.adagUntergruppe);
|
||||
ddsData.configurationMhgrEnergieSave = m_data.canMhgrEnergie;
|
||||
ddsData.configurationMhgrOperatingMode = static_cast<WarehouseGuez::ConfigurationMhgrSensor_def::type>(m_data.canMhgrBetrArt);
|
||||
ddsData.configurationSsFirSan = m_data.canSsFirSan;
|
||||
ddsData.configurationSsFirFunction = static_cast<WarehouseGuez::ConfigurationSpecialSensorFir_def::type>(m_data.canSsFirFunkt);
|
||||
ddsData.configurationSsMineFitFunction = static_cast<WarehouseGuez::ConfigurationSpecialSensorMineFit_def::type>(m_data.canSsMvFunkt);
|
||||
ddsData.configurationSsStandardFunction = static_cast<WarehouseGuez::ConfigurationSpecialSensorStd_def::type>(m_data.canSsStdFunkt);
|
||||
ddsData.configurationStartupTime = m_data.canStartupZeit;
|
||||
ddsData.equipGroup = m_data.ausstgGrp;
|
||||
ddsData.maxEquipNo = m_data.ausstgNrMax;
|
||||
ddsData.minEquipNo = m_data.ausstgNrMin;
|
||||
ddsData.name = m_data.name.toStdString();
|
||||
ddsData.posUpdate = static_cast<WarehouseGuez::ConfigurationPositionUpdate_def::type>(m_data.posUpdate);
|
||||
ddsData.vbAgdusId = m_data.vbAgdus;
|
||||
ddsData.vbAirSupport = m_data.vbEinsatzmittel;
|
||||
ddsData.vbFireArea = m_data.vbSteilfeuer;
|
||||
ddsData.vbMineIed = m_data.vbMinenIed;
|
||||
ddsData.vbNc = m_data.vbAcWaffen;
|
||||
ddsData.canDevices = m_data.canDevices;
|
||||
|
||||
INFO_LOG(m_logger) << "Publish WhgEquipmentTypeWh-data to dds (" << m_data.id << ") ...";
|
||||
|
||||
|
||||
@@ -62,10 +62,10 @@ void ObjectInjuryModel::onPublishData()
|
||||
{
|
||||
WarehouseGuez::InjuryModelAgdusWh ddsData;
|
||||
|
||||
ddsData.id(m_data.id);
|
||||
ddsData.name(m_data.name.toStdString());
|
||||
ddsData.description(m_data.beschreibung.toStdString());
|
||||
ddsData.version(m_data.version.toStdString());
|
||||
ddsData.id = m_data.id;
|
||||
ddsData.name = m_data.name.toStdString();
|
||||
ddsData.description = m_data.beschreibung.toStdString();
|
||||
ddsData.version = m_data.version.toStdString();
|
||||
|
||||
INFO_LOG(m_logger) << "Publish InjuryModelAgdusWh-data to dds (" << m_data.id << ") ...";
|
||||
|
||||
|
||||
Reference in new issue
Block a user