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
+18
-16
@@ -2,6 +2,7 @@
|
||||
|
||||
#include "alm_emergency_call_dialog.h"
|
||||
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include "AlarmManagement/Gui/EmergencyCalls/alm_emergency_call_model.h"
|
||||
#include "ui_alm_emergency_call_dialog.h"
|
||||
|
||||
@@ -18,7 +19,8 @@ namespace AlarmManagement
|
||||
|
||||
EmergencyCallDialog::EmergencyCallDialog(QWidget* parent)
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_dtc(nullptr), m_ftc(nullptr),
|
||||
m_session(nullptr), m_ui(new Ui::EmergencyCallDialog), m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
m_session(nullptr), m_ui(new Ui::EmergencyCallDialog), m_requestHelper(new LtsUtils::RequestHelper(this)),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
}
|
||||
@@ -104,10 +106,10 @@ void EmergencyCallDialog::enaDisa()
|
||||
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Show, false);
|
||||
|
||||
const AlmEmergencyCall& sos = getSelectedSOS();
|
||||
if (sos.id() <= 0)
|
||||
if (sos.id <= 0)
|
||||
return;
|
||||
|
||||
if (!sos.expired())
|
||||
if (!sos.expired)
|
||||
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Edit, true);
|
||||
|
||||
m_buttonBox->setButtonEnabled(LtsWidgets::DialogButton::Show, true);
|
||||
@@ -158,7 +160,7 @@ void EmergencyCallDialog::onEditBtCliked()
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
|
||||
|
||||
const AlmEmergencyCall& sos = getSelectedSOS();
|
||||
if (sos.id() <= 0)
|
||||
if (sos.id <= 0)
|
||||
return;
|
||||
setAcknowledgeUi();
|
||||
|
||||
@@ -181,16 +183,16 @@ void EmergencyCallDialog::onFindEmergencyOnMap()
|
||||
return;
|
||||
|
||||
const AlmEmergencyCall& sos = getSelectedSOS();
|
||||
if (sos.id() <= 0)
|
||||
if (sos.id <= 0)
|
||||
return;
|
||||
|
||||
m_sitMapGuiIfc->setCenterPoint(QPointF(sos.position().lon(), sos.position().lat()));
|
||||
m_sitMapGuiIfc->setCenterPoint(QPointF(sos.position.lon, sos.position.lat));
|
||||
}
|
||||
|
||||
void EmergencyCallDialog::onEmergencyIndexDoubleClicked(const QModelIndex& index)
|
||||
{
|
||||
Q_UNUSED(index)
|
||||
emit openInfoDlg(getSelectedSOS().id());
|
||||
emit openInfoDlg(getSelectedSOS().id);
|
||||
}
|
||||
|
||||
void EmergencyCallDialog::sendAcknowledgeEmergency(const QString& comment)
|
||||
@@ -198,18 +200,18 @@ void EmergencyCallDialog::sendAcknowledgeEmergency(const QString& comment)
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
|
||||
|
||||
const AlmEmergencyCall& sos = getSelectedSOS();
|
||||
if (sos.id() <= 0 || sos.expired())
|
||||
if (sos.id <= 0 || sos.expired)
|
||||
return;
|
||||
|
||||
EmergencyCallAcknowledgeRequest request;
|
||||
request.id(sos.id());
|
||||
request.issi(sos.issi());
|
||||
request.name(sos.name());
|
||||
request.timestamp(QDateTime::currentMSecsSinceEpoch());
|
||||
request.incomingTime(sos.incomingTime());
|
||||
request.expired(true);
|
||||
request.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
|
||||
request.comment(comment.toStdString());
|
||||
request.id = sos.id;
|
||||
request.issi = sos.issi;
|
||||
request.name = sos.name;
|
||||
request.timestamp = QDateTime::currentMSecsSinceEpoch();
|
||||
request.incomingTime = sos.incomingTime;
|
||||
request.expired = true;
|
||||
request.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
|
||||
request.comment = comment.toStdString();
|
||||
m_requestHelper->startSingleRequest(
|
||||
[this, request]() { return m_ftc->emergencyCallAcknowledgeRequest(request, this); });
|
||||
|
||||
|
||||
+4
-4
@@ -82,9 +82,9 @@ QVector<LtsWidgets::PluginData> InterfaceImpl::getActions()
|
||||
|
||||
auto cb = [this](const AlmEmergencyCall &data)
|
||||
{
|
||||
if (data.id() <= 0 || data.expired())
|
||||
if (data.id <= 0 || data.expired)
|
||||
return;
|
||||
this->showEmergencyCallInfoWindow(data.id());
|
||||
this->showEmergencyCallInfoWindow(data.id);
|
||||
};
|
||||
m_dtc->almEmergencyCalls(cb);
|
||||
|
||||
@@ -111,10 +111,10 @@ void InterfaceImpl::onEmergencyCallChanged(const AlmEmergencyCall &data, DataMod
|
||||
{
|
||||
if (modType != DataModification::eAdded)
|
||||
return;
|
||||
if (data.id() <= 0 || data.expired())
|
||||
if (data.id <= 0 || data.expired)
|
||||
return;
|
||||
|
||||
this->showEmergencyCallInfoWindow(data.id());
|
||||
this->showEmergencyCallInfoWindow(data.id);
|
||||
}
|
||||
|
||||
void InterfaceImpl::onOpenInfoDlg(const int &id)
|
||||
|
||||
+29
-27
@@ -2,6 +2,7 @@
|
||||
|
||||
#include "alm_emergency_call_info_dialog.h"
|
||||
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include "ui_alm_emergency_call_info_dialog.h"
|
||||
|
||||
#include <AlarmManagement/alm_operator_rights.h>
|
||||
@@ -46,10 +47,11 @@ QImage renderEmergencySymbol(bool expired = false)
|
||||
|
||||
EmergencyCallInfoDialog::EmergencyCallInfoDialog(int entryId, QWidget* parent)
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly), m_dtc(nullptr), m_ftc(nullptr),
|
||||
m_requestHelper(new LtsUtils::RequestHelper(this)), m_ui(new Ui::EmergencyCallInfoDialog)
|
||||
m_requestHelper(new LtsUtils::RequestHelper(this)), m_ui(new Ui::EmergencyCallInfoDialog),
|
||||
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_emergency.id(entryId);
|
||||
m_emergency.id = entryId;
|
||||
}
|
||||
|
||||
EmergencyCallInfoDialog::~EmergencyCallInfoDialog()
|
||||
@@ -77,7 +79,7 @@ bool EmergencyCallInfoDialog::init(const std::shared_ptr<Interface::Ftc>& ftc,
|
||||
m_dtc->enableAlmEmergencyCall();
|
||||
m_ftc->enableEmergencyCallAcknowledge();
|
||||
|
||||
m_emergency = m_dtc->almEmergencyCall(m_emergency.id());
|
||||
m_emergency = m_dtc->almEmergencyCall(m_emergency.id);
|
||||
setUiValues();
|
||||
|
||||
connect(m_dtc.get(), &AlarmManagement::Interface::Dtc::almEmergencyCallChanged, this,
|
||||
@@ -92,34 +94,34 @@ bool EmergencyCallInfoDialog::init(const std::shared_ptr<Interface::Ftc>& ftc,
|
||||
|
||||
QString EmergencyCallInfoDialog::emergencyIdentifier() const
|
||||
{
|
||||
return QStringLiteral("emergency_") + QString::number(m_emergency.id());
|
||||
return QStringLiteral("emergency_") + QString::number(m_emergency.id);
|
||||
}
|
||||
|
||||
bool EmergencyCallInfoDialog::setUiValues()
|
||||
{
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
|
||||
if (!m_dtc || !m_ftc || m_emergency.id() < 0)
|
||||
if (!m_dtc || !m_ftc || m_emergency.id < 0)
|
||||
{
|
||||
ERROR_LOG(m_logger) << " >> unabled to init EmergencyCallInfoDialog";
|
||||
return false;
|
||||
}
|
||||
|
||||
m_ui->lblEquipNr->setText(QString::number(m_emergency.issi()));
|
||||
m_ui->lblIncomingTime->setText(DTG::toString(QDateTime::fromMSecsSinceEpoch(m_emergency.incomingTime())));
|
||||
m_ui->lblStatus->setText(m_emergency.expired()
|
||||
? DTG::toString(QDateTime::fromMSecsSinceEpoch(m_emergency.deleted()))
|
||||
m_ui->lblEquipNr->setText(QString::number(m_emergency.issi));
|
||||
m_ui->lblIncomingTime->setText(DTG::toString(QDateTime::fromMSecsSinceEpoch(m_emergency.incomingTime)));
|
||||
m_ui->lblStatus->setText(m_emergency.expired
|
||||
? DTG::toString(QDateTime::fromMSecsSinceEpoch(m_emergency.deleted))
|
||||
: QStringLiteral("--"));
|
||||
m_ui->lblComment->setText(QString::fromStdString(m_emergency.comment()));
|
||||
QString mgrs = LtsCoordTrans::mgrsFromGeographic(m_emergency.position().lon(), m_emergency.position().lat());
|
||||
m_ui->lblComment->setText(QString::fromStdString(m_emergency.comment));
|
||||
QString mgrs = LtsCoordTrans::mgrsFromGeographic(m_emergency.position.lon, m_emergency.position.lat);
|
||||
m_ui->lblPosition->setText(mgrs);
|
||||
|
||||
const bool& hasOperatorRightEmergencyCall =
|
||||
LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::EmergencyCall);
|
||||
m_ui->pbAckEmergency->setIcon(QIcon(QStringLiteral("icon:edit.svg")));
|
||||
m_ui->pbAckEmergency->setEnabled(m_emergency.expired() ? false : true);
|
||||
m_ui->pbAckEmergency->setEnabled(m_emergency.expired ? false : true);
|
||||
m_ui->pbAckEmergency->setVisible(hasOperatorRightEmergencyCall);
|
||||
|
||||
QPixmap iconPixmap = QPixmap::fromImage(renderEmergencySymbol(m_emergency.expired()));
|
||||
QPixmap iconPixmap = QPixmap::fromImage(renderEmergencySymbol(m_emergency.expired));
|
||||
m_ui->lblIcon->setPixmap(iconPixmap);
|
||||
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
|
||||
@@ -129,7 +131,7 @@ bool EmergencyCallInfoDialog::setUiValues()
|
||||
void EmergencyCallInfoDialog::onEmergencyCallChanged(AlarmManagement::AlmEmergencyCall data, DataModification modType)
|
||||
{
|
||||
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
|
||||
if (data.id() != m_emergency.id() || data.id() == 0)
|
||||
if (data.id != m_emergency.id || data.id == 0)
|
||||
return;
|
||||
|
||||
if (modType == DataModification::eRemoved)
|
||||
@@ -149,9 +151,9 @@ void EmergencyCallInfoDialog::onEmergencyCallChanged(AlarmManagement::AlmEmergen
|
||||
|
||||
void EmergencyCallInfoDialog::onFindEmergencyOnMap()
|
||||
{
|
||||
if (!m_sitMapGuiIfc || m_emergency.id() <= 0)
|
||||
if (!m_sitMapGuiIfc || m_emergency.id <= 0)
|
||||
return;
|
||||
m_sitMapGuiIfc->setCenterPoint(QPointF(m_emergency.position().lon(), m_emergency.position().lat()));
|
||||
m_sitMapGuiIfc->setCenterPoint(QPointF(m_emergency.position.lon, m_emergency.position.lat));
|
||||
}
|
||||
|
||||
void EmergencyCallInfoDialog::onPbAckEmergencyClicked()
|
||||
@@ -191,18 +193,18 @@ void EmergencyCallInfoDialog::onPbAckEmergencyClicked()
|
||||
|
||||
void EmergencyCallInfoDialog::sendAcknowledgeEmergencyCallRequest(const QString& comment)
|
||||
{
|
||||
if (m_emergency.id() <= 0)
|
||||
if (m_emergency.id <= 0)
|
||||
return;
|
||||
|
||||
EmergencyCallAcknowledgeRequest request;
|
||||
request.id(m_emergency.id());
|
||||
request.name(m_emergency.name());
|
||||
request.issi(m_emergency.issi());
|
||||
request.timestamp(QDateTime::currentMSecsSinceEpoch());
|
||||
request.incomingTime(m_emergency.incomingTime());
|
||||
request.expired(true);
|
||||
request.operatorId(LtsSessionData::LtsSessionData::getInstance()->getOperatorId());
|
||||
request.comment(comment.toStdString());
|
||||
request.id = m_emergency.id;
|
||||
request.name = m_emergency.name;
|
||||
request.issi = m_emergency.issi;
|
||||
request.timestamp = QDateTime::currentMSecsSinceEpoch();
|
||||
request.incomingTime = m_emergency.incomingTime;
|
||||
request.expired = true;
|
||||
request.operatorId = LtsSessionData::LtsSessionData::getInstance()->getOperatorId();
|
||||
request.comment = comment.toStdString();
|
||||
bool ret = m_requestHelper->startSingleRequest(
|
||||
[this, request]() { return m_ftc->emergencyCallAcknowledgeRequest(request, this); });
|
||||
|
||||
@@ -212,8 +214,8 @@ void EmergencyCallInfoDialog::sendAcknowledgeEmergencyCallRequest(const QString&
|
||||
|
||||
void EmergencyCallInfoDialog::retranslate()
|
||||
{
|
||||
m_emergency = m_dtc->almEmergencyCall(m_emergency.id());
|
||||
const QString lbName = tr("SOS_%1").arg(m_emergency.issi());
|
||||
m_emergency = m_dtc->almEmergencyCall(m_emergency.id);
|
||||
const QString lbName = tr("SOS_%1").arg(m_emergency.issi);
|
||||
translate(m_ui, lbName);
|
||||
}
|
||||
|
||||
|
||||
+16
-14
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "alm_emergency_call_model.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
|
||||
#include <QtCore/QDateTime>
|
||||
@@ -24,6 +25,7 @@ EmergencyCallModel::EmergencyCallModel(QObject *parent)
|
||||
tr("Comment"),
|
||||
}, parent)
|
||||
, m_dtc(nullptr)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
{}
|
||||
|
||||
QVariant EmergencyCallModel::data(const QModelIndex &index, int role) const
|
||||
@@ -35,35 +37,35 @@ QVariant EmergencyCallModel::data(const QModelIndex &index, int role) const
|
||||
switch (index.column())
|
||||
{
|
||||
case Columns::ID:
|
||||
return almEmergency.id();
|
||||
return almEmergency.id;
|
||||
case SAMPLE_TIME:
|
||||
return QDateTime::fromMSecsSinceEpoch(almEmergency.sampleTime());
|
||||
return QDateTime::fromMSecsSinceEpoch(almEmergency.sampleTime);
|
||||
case INCOMING_TIME:
|
||||
return QDateTime::fromMSecsSinceEpoch(almEmergency.incomingTime());
|
||||
return QDateTime::fromMSecsSinceEpoch(almEmergency.incomingTime);
|
||||
case NAME:
|
||||
return QString::fromStdString(almEmergency.name());
|
||||
return QString::fromStdString(almEmergency.name);
|
||||
case ISSI:
|
||||
return almEmergency.issi();
|
||||
return almEmergency.issi;
|
||||
case POSITION:
|
||||
{
|
||||
if (std::isnan(almEmergency.position().lat()))
|
||||
if (std::isnan(almEmergency.position.lat))
|
||||
return tr("---");
|
||||
const QString mgrs = LtsCoordTrans::mgrsFromGeographic(almEmergency.position().lon(), almEmergency.position().lat());
|
||||
const QString mgrs = LtsCoordTrans::mgrsFromGeographic(almEmergency.position.lon, almEmergency.position.lat);
|
||||
return mgrs;
|
||||
}
|
||||
case EXPIRED:
|
||||
return almEmergency.expired();
|
||||
return almEmergency.expired;
|
||||
case OPERATION_ID:
|
||||
{
|
||||
if (almEmergency.operatorId() == 0)
|
||||
if (almEmergency.operatorId == 0)
|
||||
return QStringLiteral("-");
|
||||
|
||||
return QString::fromStdString(m_opmDtc.get()->user(almEmergency.operatorId()).name());
|
||||
return QString::fromStdString(m_opmDtc.get()->user(almEmergency.operatorId).name);
|
||||
}
|
||||
case DELETED_TIMESTAMP:
|
||||
return QDateTime::fromMSecsSinceEpoch(almEmergency.deleted());
|
||||
return QDateTime::fromMSecsSinceEpoch(almEmergency.deleted);
|
||||
case COMMENT:
|
||||
return QString::fromStdString(almEmergency.comment());
|
||||
return QString::fromStdString(almEmergency.comment);
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@@ -89,7 +91,7 @@ bool EmergencyCallModel::initModel(const std::shared_ptr<Interface::Dtc> &dtc,
|
||||
|
||||
void EmergencyCallModel::onAlarmEmergencyCallChanged(const AlarmManagement::AlmEmergencyCall &data, const DataModification modType)
|
||||
{
|
||||
const int id = data.id();
|
||||
const int id = data.id;
|
||||
int row = findRowForId(id);
|
||||
switch (modType)
|
||||
{
|
||||
@@ -148,7 +150,7 @@ bool EmergencyCallProxyModel::filterAcceptsRow(int source_row, const QModelIndex
|
||||
bool EmergencyCallProxyModel::checkFilter(int source_row) const
|
||||
{
|
||||
const auto sos = m_sourceModel->getRowData(source_row);
|
||||
if ((sos.expired() && !showExpired()) || (exerciseStopped() && !sos.expired()))
|
||||
if ((sos.expired && !showExpired()) || (exerciseStopped() && !sos.expired))
|
||||
return false;
|
||||
|
||||
return true;
|
||||
|
||||
Reference in new issue
Block a user