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
+1
@@ -14,6 +14,7 @@ CloseAesList::CloseAesList(LtsSession::LtsSession *session, QWidget *parent)
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
|
||||
, m_model(new AesListModel(session, this))
|
||||
, m_ui(new Ui::CloseAesList)
|
||||
, m_logger(getLogger("CloseAesList"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_ui->aesList->setModel(m_model);
|
||||
|
||||
+8
-7
@@ -19,6 +19,7 @@ AesListModel::AesListModel(LtsSession::LtsSession *session, QObject *parent)
|
||||
}
|
||||
, parent)
|
||||
, m_session(session)
|
||||
, m_logger(getLogger("AesListModel"))
|
||||
{
|
||||
|
||||
m_session->getDtc<AreaEffectSimulation::DataInterface>(m_aesDtc);
|
||||
@@ -51,24 +52,24 @@ QVariant AesListModel::data(const QModelIndex &index, int role) const
|
||||
|
||||
|
||||
const AreaEffectSimulation::AesItemView &view = m_aesDtc.get()->aesItemView(m_vecData.at(index.row()));
|
||||
if (view.id() == 0)
|
||||
if (view.id == 0)
|
||||
return QVariant();
|
||||
|
||||
AreaEffectSimulation::AesItem aesItem;
|
||||
m_aesDtc->aesItemFromId(view.aesItemId(), aesItem);
|
||||
if (aesItem.id() < 0)
|
||||
m_aesDtc->aesItemFromId(view.aesItemId, aesItem);
|
||||
if (aesItem.id < 0)
|
||||
return QVariant();
|
||||
|
||||
switch (index.column())
|
||||
{
|
||||
case Columns::Id:
|
||||
return aesItem.id();
|
||||
return aesItem.id;
|
||||
case Columns::Name:
|
||||
return QString::fromStdString(aesItem.name());
|
||||
return QString::fromStdString(aesItem.name);
|
||||
case Columns::AesType:
|
||||
return m_pdmDtc->trChargeTypeShortName(aesItem.chargeStruct().chargeTypeId(), true);
|
||||
return m_pdmDtc->trChargeTypeShortName(aesItem.chargeStruct.chargeTypeId, true);
|
||||
case Columns::Party:
|
||||
return aesItem.partyId().is_set() ? ParticipantManagement::trPartyName(m_ppmDtc->party(aesItem.partyId().get()).name()) : QObject::tr("---");
|
||||
return aesItem.partyId.has_value() ? ParticipantManagement::trPartyName(m_ppmDtc->party(aesItem.partyId.get()).name) : QObject::tr("---");
|
||||
default:
|
||||
return QVariant();
|
||||
break;
|
||||
|
||||
+12
-11
@@ -20,6 +20,7 @@ SelfTest::SelfTest(LtsSession::LtsSession *session, QWidget *parent)
|
||||
, m_tabocDtc(nullptr)
|
||||
, m_escDtc(nullptr)
|
||||
, m_ui(new Ui::SelfTest)
|
||||
, m_logger(getLogger("SelfTestDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -140,12 +141,12 @@ void SelfTest::onSfmStatusChanged(const TrainingAreaBaseOC::TechnicalStateSfm &d
|
||||
{
|
||||
|
||||
Q_UNUSED(modType)
|
||||
m_ui->leRadio->setText(data.radioAvailable() ? tr("Available") : tr("Not Available"));
|
||||
m_ui->leLicense->setText(data.licensed() ? tr("Yes") : tr("No"));
|
||||
m_ui->leSfm->setText(data.sfmConnected() ? tr("Connected") : tr("Not Connected"));
|
||||
m_ui->leSfmMani->setText(data.manipulationSfm() ? tr("Yes") : tr("No"));
|
||||
m_ui->leEquipmentMani->setText(data.manipulationEquipment() ? tr("Yes") : tr("No"));
|
||||
m_ui->lblErrorCodes->setText(data.errorCode() > 0 ? getTechStatError(data.errorCode()) : QLatin1String(""));
|
||||
m_ui->leRadio->setText(data.radioAvailable ? tr("Available") : tr("Not Available"));
|
||||
m_ui->leLicense->setText(data.licensed ? tr("Yes") : tr("No"));
|
||||
m_ui->leSfm->setText(data.sfmConnected ? tr("Connected") : tr("Not Connected"));
|
||||
m_ui->leSfmMani->setText(data.manipulationSfm ? tr("Yes") : tr("No"));
|
||||
m_ui->leEquipmentMani->setText(data.manipulationEquipment ? tr("Yes") : tr("No"));
|
||||
m_ui->lblErrorCodes->setText(data.errorCode > 0 ? getTechStatError(data.errorCode) : QLatin1String(""));
|
||||
onStatusHDD();
|
||||
|
||||
}
|
||||
@@ -155,18 +156,18 @@ void SelfTest::onEscOperationConditionChanged(const EffectShowClient::OperatingC
|
||||
Q_UNUSED(modType)
|
||||
|
||||
QString feature = tr("Effect Show Connected: ");
|
||||
switch (data.vehicleFeature().underlying())
|
||||
switch (static_cast<int>(data.vehicleFeature))
|
||||
{
|
||||
case EffectShowManagement::Feature_e::Smoke:
|
||||
case static_cast<int>(EffectShowManagement::Feature_e::Smoke):
|
||||
feature += tr("Smoke");
|
||||
break;
|
||||
case EffectShowManagement::Feature_e::Explosion24:
|
||||
case static_cast<int>(EffectShowManagement::Feature_e::Explosion24):
|
||||
feature += tr("Explosion (24)");
|
||||
break;
|
||||
case EffectShowManagement::Feature_e::Explosion48:
|
||||
case static_cast<int>(EffectShowManagement::Feature_e::Explosion48):
|
||||
feature += tr("Explosion (48)");
|
||||
break;
|
||||
case EffectShowManagement::Feature_e::NotSpecified:
|
||||
case static_cast<int>(EffectShowManagement::Feature_e::NotSpecified):
|
||||
feature.clear();
|
||||
break;
|
||||
}
|
||||
|
||||
+3
-2
@@ -9,6 +9,7 @@
|
||||
#include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QAudioOutput>
|
||||
|
||||
namespace OcSituationClient
|
||||
{
|
||||
@@ -68,8 +69,8 @@ Settings::Settings(LtsSession::LtsSession *session, QWidget *parent)
|
||||
loadOperatorSettings();
|
||||
|
||||
|
||||
m_mediaplayer->setMedia(QUrl(QLatin1String("qrc:/beep.wav")));
|
||||
m_mediaplayer->setVolume(100);
|
||||
m_mediaplayer->setSource(QUrl(QLatin1String("qrc:/beep.wav")));
|
||||
m_mediaplayer->audioOutput()->setVolume(1.0f);
|
||||
|
||||
setOnlineHelpFilename(QStringLiteral("OC-Settings"));
|
||||
}
|
||||
|
||||
+1
-1
@@ -51,7 +51,7 @@ private Q_SLOTS:
|
||||
void onResetRange();
|
||||
void onSoundCheck();
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
//NGL::INGLLogger &m_logger;
|
||||
void loadOperatorSettings();
|
||||
void retranslate() override;
|
||||
bool apply() override;
|
||||
|
||||
+26
-29
@@ -15,9 +15,6 @@
|
||||
|
||||
#include <LtsUtilsSettings/settings.h>
|
||||
|
||||
#include <QNetworkSession>
|
||||
#include <QNetworkConfigurationManager>
|
||||
#include <QNetworkConfiguration>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtGui/QPolygonF>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
@@ -153,9 +150,9 @@ void InterfaceImpl::onEnterLeaveAesChanged(const TrainingAreaBaseOC::EnterLeaveA
|
||||
if (playSound)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Got new ENterLeave event and play sound";
|
||||
if (data.cAreaType())
|
||||
if (data.cAreaType)
|
||||
{
|
||||
if(data.aesEntered())
|
||||
if(data.aesEntered)
|
||||
{
|
||||
m_enterSound.play();
|
||||
}
|
||||
@@ -163,11 +160,11 @@ void InterfaceImpl::onEnterLeaveAesChanged(const TrainingAreaBaseOC::EnterLeaveA
|
||||
{
|
||||
m_leaveSound.play();
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "enter leave direvly " << data.aesEntered();
|
||||
DEBUG_LOG(m_logger) << "enter leave direvly " << data.aesEntered;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (data.aesEntered())
|
||||
if (data.aesEntered)
|
||||
{
|
||||
m_nearInSound.play();
|
||||
}
|
||||
@@ -175,11 +172,11 @@ void InterfaceImpl::onEnterLeaveAesChanged(const TrainingAreaBaseOC::EnterLeaveA
|
||||
{
|
||||
m_nearOutSound.play();
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "enter leave near " << data.aesEntered();
|
||||
DEBUG_LOG(m_logger) << "enter leave near " << data.aesEntered;
|
||||
}
|
||||
}
|
||||
|
||||
if (data.aesEntered() && LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("ObserverController"), QStringLiteral("VisualWarning"), false).toBool() )
|
||||
if (data.aesEntered && LtsUtils::OperatorSettings::getInstance()->value(QStringLiteral("ObserverController"), QStringLiteral("VisualWarning"), false).toBool() )
|
||||
{
|
||||
bool bWidgetExists = m_session->widgetExists(menuGroup(), m_closeAreaIdentifier, LtsWidgets::LayoutArea::eDialogTab);
|
||||
if (!bWidgetExists)
|
||||
@@ -205,7 +202,7 @@ void InterfaceImpl::onCheckAllEffectAreas()
|
||||
circle << QPointF(cos(angle) * radius, sin(angle) * radius);
|
||||
}
|
||||
|
||||
LtsCoordTrans::UtmCoordinate posUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(pos.position().lon(), pos.position().lat());
|
||||
LtsCoordTrans::UtmCoordinate posUtm = LtsCoordTrans::UtmCoordinate::fromGeographic(pos.position.lon, pos.position.lat);
|
||||
int zone = posUtm.zone;
|
||||
circle << circle.value(0);
|
||||
circle.translate(posUtm.x, posUtm.y);
|
||||
@@ -222,34 +219,34 @@ void InterfaceImpl::onCheckAllEffectAreas()
|
||||
|
||||
for(const AreaEffectSimulation::AesItemView &view: std::as_const(views))
|
||||
{
|
||||
if (view.aesTypeId() == AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions
|
||||
|| view.aesTypeId() == AreaEffectSimulation::AesType::AtMineAreaSingleMines
|
||||
|| view.aesTypeId() == AreaEffectSimulation::AesType::AtTechnicalArea )
|
||||
if (view.aesTypeId == AreaEffectSimulation::AesType::AtExplosionAreaSingleExplosions
|
||||
|| view.aesTypeId == AreaEffectSimulation::AesType::AtMineAreaSingleMines
|
||||
|| view.aesTypeId == AreaEffectSimulation::AesType::AtTechnicalArea )
|
||||
continue;
|
||||
bool contains = m_closeAes.contains(view.id());
|
||||
bool contains = m_closeAes.contains(view.id);
|
||||
|
||||
if (m_closeAes.contains(view.id()) && view.effectStateId() != AreaEffectSimulation::AesEffectState::EsActivated)
|
||||
if (m_closeAes.contains(view.id) && view.effectStateId != AreaEffectSimulation::AesEffectState::EsActivated)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "outdatet " ;
|
||||
|
||||
m_closeAes.remove(view.id());
|
||||
elAes.aesEntered(false);
|
||||
m_closeAes.remove(view.id);
|
||||
elAes.aesEntered = false;
|
||||
}
|
||||
else if (view.effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated)
|
||||
else if (view.effectStateId == AreaEffectSimulation::AesEffectState::EsActivated)
|
||||
{
|
||||
|
||||
QPolygonF poly(view.form().size());
|
||||
QPolygonF poly(view.form.size());
|
||||
int i=0;
|
||||
for(const auto &point : view.form())
|
||||
for(const auto &point : view.form)
|
||||
{
|
||||
poly[i++] = QPointF(point.lon(), point.lat());
|
||||
poly[i++] = QPointF(point.lon, point.lat);
|
||||
}
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5,10,0)
|
||||
bool inters = poly.intersected(circleLonLat).size() > 0;
|
||||
#else
|
||||
bool inters = poly.intersects(circleLonLat);
|
||||
#endif
|
||||
DEBUG_LOG(m_logger) << "active " << view.id() << " intersect=" << inters << " inside map=" << contains ;
|
||||
DEBUG_LOG(m_logger) << "active " << view.id << " intersect=" << inters << " inside map=" << contains ;
|
||||
|
||||
if (inters && contains)
|
||||
{
|
||||
@@ -261,16 +258,16 @@ void InterfaceImpl::onCheckAllEffectAreas()
|
||||
|
||||
DEBUG_LOG(m_logger) << "is new inside" ;
|
||||
|
||||
m_closeAes.insert(view.id());
|
||||
elAes.aesEntered(true);
|
||||
m_closeAes.insert(view.id);
|
||||
elAes.aesEntered = true;
|
||||
}
|
||||
else if (!inters && contains)
|
||||
{
|
||||
|
||||
DEBUG_LOG(m_logger) << "now outside" ;
|
||||
|
||||
m_closeAes.remove(view.id());
|
||||
elAes.aesEntered(false);
|
||||
m_closeAes.remove(view.id);
|
||||
elAes.aesEntered = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -280,12 +277,12 @@ void InterfaceImpl::onCheckAllEffectAreas()
|
||||
}
|
||||
else
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "missed " << view.id() << " ";
|
||||
DEBUG_LOG(m_logger) << "missed " << view.id << " ";
|
||||
continue;
|
||||
}
|
||||
|
||||
elAes.aesId(view.aesItemId());
|
||||
elAes.chargeTypeId(view.chargeStruct().chargeTypeId());
|
||||
elAes.aesId = view.aesItemId;
|
||||
elAes.chargeTypeId = view.chargeStruct.chargeTypeId;
|
||||
|
||||
|
||||
onEnterLeaveAesChanged(elAes,DataModification::eModified);
|
||||
|
||||
Reference in new issue
Block a user