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:
1718 files changed
+126739
-18495
No files matched your search
+30
-30
@@ -50,14 +50,14 @@ void ParticipantManagement::EquipmentEventHandling::EquipmentEventHandler::onEqu
|
||||
|
||||
QString stmt = QStringLiteral(" SELECT rec_id, equipment_number, sample_time, position_lon, position_lat, position_z, equipment_function_id, sub_device_id,"
|
||||
" unique_device_id, device_specific_event_code, event_data"
|
||||
" FROM rec_equipment_system_event WHERE sample_time > ") + QString::number(request.startTime()) + QStringLiteral(" AND "
|
||||
" sample_time <= ") + QString::number(request.endTime());
|
||||
if (request.equipmentFunctionId() > -1)
|
||||
stmt += QStringLiteral(" AND equipment_function_id=") + QString::number(request.equipmentFunctionId());
|
||||
if (request.subDeviceId() > -1)
|
||||
stmt += QStringLiteral(" AND sub_device_id=") + QString::number(request.subDeviceId());
|
||||
if (request.deviceSpecificEventCode() > -1)
|
||||
stmt += QStringLiteral(" AND device_specific_event_code=") + QString::number(request.deviceSpecificEventCode());
|
||||
" FROM rec_equipment_system_event WHERE sample_time > ") + QString::number(request.startTime) + QStringLiteral(" AND "
|
||||
" sample_time <= ") + QString::number(request.endTime);
|
||||
if (request.equipmentFunctionId > -1)
|
||||
stmt += QStringLiteral(" AND equipment_function_id=") + QString::number(request.equipmentFunctionId);
|
||||
if (request.subDeviceId > -1)
|
||||
stmt += QStringLiteral(" AND sub_device_id=") + QString::number(request.subDeviceId);
|
||||
if (request.deviceSpecificEventCode > -1)
|
||||
stmt += QStringLiteral(" AND device_specific_event_code=") + QString::number(request.deviceSpecificEventCode);
|
||||
|
||||
INFO_LOG(m_logger) << "stmt: " << stmt;
|
||||
|
||||
@@ -87,22 +87,22 @@ void ParticipantManagement::EquipmentEventHandling::EquipmentEventHandler::onEqu
|
||||
id |= q.value(i++).toInt();
|
||||
keys += id;
|
||||
|
||||
data.id(id);
|
||||
data.id = id;
|
||||
|
||||
data.equipmentNumber(q.value(i++).toInt());
|
||||
data.timeStamp(q.value(i++).toLongLong());
|
||||
data.equipmentNumber = q.value(i++).toInt();
|
||||
data.timeStamp = q.value(i++).toLongLong();
|
||||
double pos_lon = q.value(i++).toDouble();
|
||||
double pos_lat = q.value(i++).toDouble();
|
||||
double pos_z = q.value(i++).toDouble();
|
||||
data.position(Core::GeoPosition(pos_lon, pos_lat, pos_z));
|
||||
data.equipmentFunctionId(q.value(i++).toInt());
|
||||
data.subDeviceId(q.value(i++).toInt());
|
||||
data.uniqueDeviceId(q.value(i++).toInt());
|
||||
data.deviceSpecificEventCode(q.value(i++).toInt());
|
||||
data.position = Core::GeoPosition(pos_lon, pos_lat, pos_z);
|
||||
data.equipmentFunctionId = q.value(i++).toInt();
|
||||
data.subDeviceId = q.value(i++).toInt();
|
||||
data.uniqueDeviceId = q.value(i++).toInt();
|
||||
data.deviceSpecificEventCode = q.value(i++).toInt();
|
||||
QByteArray evtData(q.value(i++).toByteArray());
|
||||
if (evtData.size() != 0)
|
||||
data.eventData(LtsUtils::convert<std::vector<uint8_t>>(evtData));
|
||||
data.filterId(m_filterId);
|
||||
data.eventData = LtsUtils::convert<std::vector<uint8_t>>(evtData);
|
||||
data.filterId = m_filterId;
|
||||
|
||||
m_mainHandler->dts()->publish(data);
|
||||
}
|
||||
@@ -118,22 +118,22 @@ void ParticipantManagement::EquipmentEventHandling::EquipmentEventHandler::onEqu
|
||||
|
||||
ParticipantManagement::EquipmentSystemEvent event;
|
||||
|
||||
event.id(data.equipmentNumber());
|
||||
event.equipmentNumber(data.equipmentNumber());
|
||||
event.sampleTime(data.sampleTime());
|
||||
if (!std::isnan(event.position().lon()) && !std::isnan(event.position().lat()))
|
||||
event.position(Core::GeoPosition(data.position().lon(), data.position().lat(), 0.0));
|
||||
event.id = data.equipmentNumber;
|
||||
event.equipmentNumber = data.equipmentNumber;
|
||||
event.sampleTime = data.sampleTime;
|
||||
if (!std::isnan(event.position.lon) && !std::isnan(event.position.lat))
|
||||
event.position = Core::GeoPosition(data.position.lon, data.position.lat, 0.0);
|
||||
else
|
||||
event.position(m_mainHandler->participantHandler()->participantByEquipmentNumber(data.equipmentNumber())->position().pos());
|
||||
event.equipmentFunctionId(data.source().equipmentFunctionId());
|
||||
event.subDeviceId(data.source().subDeviceId());
|
||||
event.uniqueDeviceId(data.source().unqiueId());
|
||||
event.deviceSpecificEventCode(data.code());
|
||||
event.eventData(data.data());
|
||||
event.position = m_mainHandler->participantHandler()->participantByEquipmentNumber(data.equipmentNumber)->position().pos;
|
||||
event.equipmentFunctionId = data.source.equipmentFunctionId;
|
||||
event.subDeviceId = data.source.subDeviceId;
|
||||
event.uniqueDeviceId = data.source.unqiueId;
|
||||
event.deviceSpecificEventCode = data.code;
|
||||
event.eventData = data.data;
|
||||
|
||||
if (!m_mainHandler->dts()->publish(event))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error publishing equipment event to dds from eqnr: " << event.equipmentNumber() ;
|
||||
ERROR_LOG(m_logger) << "Error publishing equipment event to dds from eqnr: " << event.equipmentNumber ;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user