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
+2
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "smo_equipment_error_registration_dialog.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include "ui_smo_equipment_error_registration_dialog.h"
|
||||
|
||||
#include "smo_equipment_error_registration_model.h"
|
||||
@@ -20,6 +21,7 @@ EquipmentErrorRegistrationDialog::EquipmentErrorRegistrationDialog(QWidget *pare
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
|
||||
, m_session(nullptr)
|
||||
, m_ui(new Ui::EquipmentErrorRegistrationDialog)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_buttonBox->connectButton(LtsWidgets::DialogButton::Print, this, &EquipmentErrorRegistrationDialog::onPrint);
|
||||
|
||||
+11
-9
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "smo_equipment_error_registration_model.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
|
||||
@@ -28,6 +29,7 @@ EquipmentErrorRegistrationModel::EquipmentErrorRegistrationModel(QObject *parent
|
||||
, m_chunksRequested(0)
|
||||
, m_chunksReceived(0)
|
||||
, m_session(nullptr)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
}
|
||||
|
||||
@@ -86,14 +88,14 @@ QVariant EquipmentErrorRegistrationModel::data(const QModelIndex &index, int rol
|
||||
void EquipmentErrorRegistrationModel::doEventRequests()
|
||||
{
|
||||
ExerciseManagement::Exercise ex = m_exmDtc->exercise(m_session->partitionId());
|
||||
int64_t startTime = ex.beginTime();
|
||||
const int64_t endTime = ex.stopTime() > 0 ? ex.stopTime() : m_session->partitionTime();
|
||||
int64_t startTime = ex.beginTime;
|
||||
const int64_t endTime = ex.stopTime > 0 ? ex.stopTime : m_session->partitionTime();
|
||||
|
||||
while (startTime < endTime)
|
||||
{
|
||||
int64_t reqEnd = ((startTime + 24 * 60 * 60 * 1000) > endTime ? endTime : startTime + 24 * 60 * 60 * 1000);
|
||||
|
||||
m_requests += m_eemForeign->requestData(startTime, reqEnd, {ProjectDataManagement::PdmEventType::EventType_EquipmentErrorReport});
|
||||
m_requests += m_eemForeign->requestData(startTime, reqEnd, {static_cast<int>(ProjectDataManagement::PdmEventType::EventType_EquipmentErrorReport)});
|
||||
|
||||
|
||||
startTime += (24 * 60 * 60 * 1000) + 1;
|
||||
@@ -104,10 +106,10 @@ void EquipmentErrorRegistrationModel::doEventRequests()
|
||||
static inline EquipmentErrorRegistrationEntry event2Entry(const ExerciseEventManagement::Event &event)
|
||||
{
|
||||
EquipmentErrorRegistrationEntry entry;
|
||||
const QJsonObject obj = QJsonDocument::fromJson(QByteArray::fromRawData(event.properties().c_str(),
|
||||
event.properties().size())).object();
|
||||
entry.equipmentNumber = event.equipmentNumber();
|
||||
entry.sampleTime = event.sampleTime();
|
||||
const QJsonObject obj = QJsonDocument::fromJson(QByteArray::fromRawData(event.properties.c_str(),
|
||||
event.properties.size())).object();
|
||||
entry.equipmentNumber = event.equipmentNumber;
|
||||
entry.sampleTime = event.sampleTime;
|
||||
entry.participant = obj[QStringLiteral("participant")].toString();
|
||||
entry.device = obj[QStringLiteral("device")].toString();
|
||||
entry.text = obj[QStringLiteral("text")].toString();
|
||||
@@ -133,9 +135,9 @@ void EquipmentErrorRegistrationModel::onRequestedDataAvailable(TimeLineManagemen
|
||||
|
||||
void EquipmentErrorRegistrationModel::onLiveEvent(const ExerciseEventManagement::Event &ev)
|
||||
{
|
||||
if (ev.eventTypeId() != ProjectDataManagement::PdmEventType::EventType_EquipmentErrorReport)
|
||||
if (ev.eventTypeId != ProjectDataManagement::PdmEventType::EventType_EquipmentErrorReport)
|
||||
return;
|
||||
INFO_LOG(m_logger) << "Event EquipmentNumber=" << ev.equipmentNumber();
|
||||
INFO_LOG(m_logger) << "Event EquipmentNumber=" << ev.equipmentNumber;
|
||||
insertRow(event2Entry(ev));
|
||||
|
||||
emit chunksUpdated(m_chunksReceived, m_chunksRequested);
|
||||
|
||||
+2
-2
@@ -3,9 +3,9 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <ExerciseManagement/exm_data_plugin.h>
|
||||
#include <Plugins/ExerciseManagement/Data/exm_data_plugin.h>
|
||||
#include <ParticipantManagement/Data/ppm_data_plugin.h>
|
||||
#include <ProjectDataManagement/pdm_data_plugin.h>
|
||||
#include <Plugins/ProjectDataManagement/Data/pdm_data_plugin.h>
|
||||
#include <Timeline/tln_data_plugin_interface.h>
|
||||
|
||||
#include <LtsSession/lts_session.h>
|
||||
|
||||
Reference in new issue
Block a user