Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
1 parent
eb1d949edc
commit
815e16368e
1718 files changed
+126739
-18495
No files matched your search
+3
-3
@@ -87,7 +87,7 @@ Core::FunctionReplyObject HandlerSituationReplay::startReplayRequest(const Situa
|
||||
newData.replayPartitionId = m_partitionId;
|
||||
newData.beginTime = request.beginTime;
|
||||
newData.endTime = request.endTime;
|
||||
newData.pace = request.pace.is_set() ? request.pace.get() : 1;
|
||||
newData.pace = request.pace.has_value() ? request.pace.get() : 1;
|
||||
|
||||
// round to sec
|
||||
newData.beginTime = (newData.beginTime / 1000) * 1000;
|
||||
@@ -132,13 +132,13 @@ Core::FunctionReplyObject HandlerSituationReplay::changeReplayStateRequest(const
|
||||
return Core::FunctionReplyObject(request.id,tr_lts("dds", "Given request id %1 not equal object id %2")).arg(request.id).arg(m_objSrp->getId());
|
||||
}
|
||||
|
||||
if (request.pace.is_set())
|
||||
if (request.pace.has_value())
|
||||
m_objSrp->setPace(request.pace.get());
|
||||
|
||||
switch (request.state)
|
||||
{
|
||||
case SrpState::Unknown:
|
||||
if (request.pace.is_set())
|
||||
if (request.pace.has_value())
|
||||
return Core::FunctionReplyObject(request.id);
|
||||
return Core::FunctionReplyObject(request.id, tr_lts("dds", "Can not handle command 'Unknown' in changeReplayStateRequest"));
|
||||
case SrpState::Started:
|
||||
|
||||
@@ -170,11 +170,11 @@ void StaticPublisher::publishMainStructureElement(const std::shared_ptr<Infrastr
|
||||
// DEDÖÖM we need rooms and floors and every thing else!
|
||||
//if (se.structureElementTypeId != InfrastructureManagement::StructureElementType::Building)
|
||||
// continue;
|
||||
mseDds.elements().push_back(InfrastructureManagement::Database::convert(se));
|
||||
seId2mseId[se.id] = mseDds.id();
|
||||
mseDds.elements.push_back(InfrastructureManagement::Database::convert(se));
|
||||
seId2mseId[se.id] = mseDds.id;
|
||||
// break;
|
||||
}
|
||||
if (mseDds.elements().size() > 0)
|
||||
if (mseDds.elements.size() > 0)
|
||||
m_ismMainStructureElement->write(mseDds);
|
||||
}
|
||||
|
||||
@@ -198,18 +198,18 @@ void StaticPublisher::publishMainStructureElement(const std::shared_ptr<Infrastr
|
||||
if (!mainStructureElementId)
|
||||
continue;
|
||||
|
||||
mf.id(mainStructureElementId);
|
||||
mf.structureElementId(structureElementId);
|
||||
mf.name(mainStructureElements.value(mainStructureElementId).name.toStdString());
|
||||
mf.elements().clear();
|
||||
mf.elements().reserve(cont.size());
|
||||
mf.id = mainStructureElementId;
|
||||
mf.structureElementId = structureElementId;
|
||||
mf.name = mainStructureElements.value(mainStructureElementId).name.toStdString();
|
||||
mf.elements.clear();
|
||||
mf.elements.reserve(cont.size());
|
||||
for (const auto &pos : cont)
|
||||
{
|
||||
elem.id(pos.id);
|
||||
elem.relPosition(Core::RelativePosition(pos.relPosition.x(),
|
||||
elem.id = pos.id;
|
||||
elem.relPosition = Core::RelativePosition(pos.relPosition.x(),
|
||||
pos.relPosition.y(),
|
||||
pos.relPosition.z()));
|
||||
mf.elements().push_back(elem);
|
||||
pos.relPosition.z());
|
||||
mf.elements.push_back(elem);
|
||||
}
|
||||
m_ismMainFootprint->write(mf);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user