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
+7
-7
@@ -57,24 +57,24 @@ void InterfaceImpl::clearInterfaces()
|
||||
|
||||
void InterfaceImpl::showEmergencyMessage(const AlarmManagement::Notification &data)
|
||||
{
|
||||
if (data.eventType() != ProjectDataManagement::PdmEventType::EventType_EmergencyCall)
|
||||
if (data.eventType != ProjectDataManagement::PdmEventType::EventType_EmergencyCall)
|
||||
return;
|
||||
|
||||
const int issi = data.equipmentNumber();
|
||||
const QString &positionStr = LtsCoordTrans::mgrsFromGeographic(data.position().lon(), data.position().lat());
|
||||
const int issi = data.equipmentNumber;
|
||||
const QString &positionStr = LtsCoordTrans::mgrsFromGeographic(data.position.lon, data.position.lat);
|
||||
|
||||
|
||||
new LtsWidgets::LtsMessageDialogNew(m_session->baseLayout(),
|
||||
tr("ISSI: %1 --- Position: %2\n").arg(issi).arg(positionStr),
|
||||
tr("!!!!!! Emergency Call --- %1 !!!!!").arg(DTG::toStringMSec(data.time())));
|
||||
tr("!!!!!! Emergency Call --- %1 !!!!!").arg(DTG::toStringMSec(data.time)));
|
||||
}
|
||||
|
||||
void InterfaceImpl::showAlarm(const AlarmManagement::Notification &data)
|
||||
{
|
||||
showEmergencyMessage(data);
|
||||
|
||||
if (data.operatorId() == LtsSessionData::LtsSessionData::getInstance()->getOperatorId() ||
|
||||
data.operatorId() == 0)
|
||||
if (data.operatorId == LtsSessionData::LtsSessionData::getInstance()->getOperatorId() ||
|
||||
data.operatorId == 0)
|
||||
{
|
||||
bool bWidgetExists = m_session->widgetExists(menuGroup(), m_alarmHistoryDialogIdentifier, m_alarmHistoryDialogLayoutArea);
|
||||
if (!bWidgetExists)
|
||||
@@ -87,7 +87,7 @@ void InterfaceImpl::onNotificationChanged(const AlarmManagement::Notification &d
|
||||
if (mod != DataModification::eAdded)
|
||||
return;
|
||||
|
||||
INFO_LOG(m_logger) << "ALARM! data.operatorId(): " << data.operatorId()
|
||||
INFO_LOG(m_logger) << "ALARM! data.operatorId(): " << data.operatorId
|
||||
<< "currentOperatorId: " << LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
|
||||
|
||||
|
||||
|
||||
+3
-2
@@ -7,11 +7,12 @@
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <AlarmManagement/alm_gui_plugin_interface.h>
|
||||
#include <AlarmManagement/alm_data_plugin_interface.h>
|
||||
#include <AlarmManagement/Common/alm_config_alarm_model.h>
|
||||
#include <AlarmManagement/Common/alm_history_alarm_model.h>
|
||||
#include <AlarmManagement/Gui/Common/alm_config_alarm_model.h>
|
||||
#include <AlarmManagement/Gui/Common/alm_history_alarm_model.h>
|
||||
|
||||
#include <AreaEffectSimulation/aes_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
|
||||
namespace AlarmManagement
|
||||
{
|
||||
|
||||
+18
-17
@@ -2,14 +2,15 @@
|
||||
|
||||
#include "alm_dialog.h"
|
||||
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include "alm_history.h"
|
||||
#include "ui_alm_dialog.h"
|
||||
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <LtsUtilsSettings/settings.h>
|
||||
#include <LtsWidgets/lts_dialog.h>
|
||||
#include <AlarmManagement/Common/alm_config_alarm_model.h>
|
||||
#include <AlarmManagement/Common/alm_history_alarm_model.h>
|
||||
#include <AlarmManagement/Gui/Common/alm_config_alarm_model.h>
|
||||
#include <AlarmManagement/Gui/Common/alm_history_alarm_model.h>
|
||||
#include <ProjectDataManagement/pdm_enums.hpp>
|
||||
#include <utility>
|
||||
|
||||
@@ -19,7 +20,7 @@ namespace AlarmManagement
|
||||
AlarmDialog::AlarmDialog(QWidget* parent)
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel), m_configAlarmModel(nullptr),
|
||||
m_dtc(nullptr), m_ftc(nullptr), m_ui(new Ui::AlarmDialog), m_requestHelper(new LtsUtils::RequestHelper(this)),
|
||||
m_operatorId(-1)
|
||||
m_operatorId(-1), m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
AlarmCheckBox alarmCheckBox;
|
||||
LtsUtils::ProjectSettings* ps = LtsUtils::ProjectSettings::getInstance();
|
||||
@@ -158,23 +159,23 @@ void AlarmDialog::retranslate()
|
||||
|
||||
void AlarmDialog::onAlarmConfigChanged(const AlarmManagement::AlarmConfig& data, DataModification modType)
|
||||
{
|
||||
bool setMarker = data.setMarker();
|
||||
bool messageWindow = data.messageWindow();
|
||||
bool setMarker = data.setMarker;
|
||||
bool messageWindow = data.messageWindow;
|
||||
if (modType == DataModification::eRemoved)
|
||||
return;
|
||||
|
||||
DEBUG_LOG(m_logger) << "************** onAlarmConfigChanged "
|
||||
<< " id=" << data.id() << " operatorId=" << data.operatorId()
|
||||
<< " m_operatorId=" << m_operatorId << " participantId=" << data.participantId()
|
||||
<< " eventTypeId=" << data.eventTypeId() << " messageWindow=" << messageWindow
|
||||
<< " id=" << data.id << " operatorId=" << data.operatorId
|
||||
<< " m_operatorId=" << m_operatorId << " participantId=" << data.participantId
|
||||
<< " eventTypeId=" << data.eventTypeId << " messageWindow=" << messageWindow
|
||||
<< " setMarker=" << setMarker;
|
||||
if (data.global() == false)
|
||||
if (data.global == false)
|
||||
return;
|
||||
|
||||
if (data.operatorId() == m_operatorId)
|
||||
if (data.operatorId == m_operatorId)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "************** onAlarmConfig zuweisen ";
|
||||
switch (data.eventTypeId().underlying())
|
||||
switch (data.eventTypeId)
|
||||
{
|
||||
case ProjectDataManagement::PdmEventType::EventType_EnterNuclear: {
|
||||
DEBUG_LOG(m_logger) << "EnterNuclear zuweisen ";
|
||||
@@ -247,28 +248,28 @@ std::vector<AlarmManagement::AlarmAction> AlarmDialog::getCheckedValues() const
|
||||
ret.reserve(m_checkBoxes.size());
|
||||
for (const AlarmCheckBox& item : std::as_const(m_checkBoxes))
|
||||
{
|
||||
alarmActionDds.eventTypeId(item.eventTypeId);
|
||||
alarmActionDds.eventTypeId = item.eventTypeId;
|
||||
if (item.checkboxMarker->isChecked())
|
||||
{
|
||||
alarmActionDds.setMarker(true);
|
||||
alarmActionDds.setMarker = true;
|
||||
DEBUG_LOG(m_logger) << item.name << " setMarker = true";
|
||||
}
|
||||
else
|
||||
{
|
||||
alarmActionDds.setMarker(false);
|
||||
alarmActionDds.setMarker = false;
|
||||
DEBUG_LOG(m_logger) << item.name << " setMarker = false";
|
||||
}
|
||||
if (item.checkboxWindow->isChecked())
|
||||
{
|
||||
alarmActionDds.messageWindow(true);
|
||||
alarmActionDds.messageWindow = true;
|
||||
DEBUG_LOG(m_logger) << item.name << " messageWindow = true";
|
||||
}
|
||||
else
|
||||
{
|
||||
alarmActionDds.messageWindow(false);
|
||||
alarmActionDds.messageWindow = false;
|
||||
DEBUG_LOG(m_logger) << item.name << " messageWindow = false";
|
||||
}
|
||||
if (alarmActionDds.setMarker() || alarmActionDds.messageWindow())
|
||||
if (alarmActionDds.setMarker || alarmActionDds.messageWindow)
|
||||
ret.push_back(alarmActionDds);
|
||||
}
|
||||
return ret;
|
||||
|
||||
+1
@@ -7,6 +7,7 @@
|
||||
#include <AlarmManagement/alm_ftc.h>
|
||||
#include <AlarmManagement/alm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
#include <AlarmManagement/logger.h>
|
||||
|
||||
|
||||
+4
-2
@@ -2,11 +2,12 @@
|
||||
|
||||
#include "alm_history.h"
|
||||
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include "ui_alm_history.h"
|
||||
|
||||
#include <LtsPrinting/printing.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <AlarmManagement/Common/alm_history_alarm_model.h>
|
||||
#include <AlarmManagement/Gui/Common/alm_history_alarm_model.h>
|
||||
#include <QtWidgets/QTreeView>
|
||||
|
||||
namespace AlarmManagement
|
||||
@@ -14,7 +15,8 @@ namespace AlarmManagement
|
||||
|
||||
AlarmView::AlarmView(LtsSession::LtsSession* session, QWidget* parent)
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_alarmHistoryModel(nullptr),
|
||||
m_dtc(nullptr), m_sitMapGuiIfc(nullptr), m_session(session), m_ui(new Ui::AlarmView)
|
||||
m_dtc(nullptr), m_sitMapGuiIfc(nullptr), m_session(session), m_ui(new Ui::AlarmView),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
DEBUG_LOG(m_logger) << Q_FUNC_INFO << " --- AlarmView Konstruktor() ";
|
||||
m_ui->setupUi(this);
|
||||
|
||||
Reference in new issue
Block a user