Adds immediate migration results
This commit is contained in:
2395 files changed
+357322
-2524
No files matched your search
@@ -26,7 +26,7 @@ ADD_INTERFACE_LIBRARY(AsbGuiPluginInterface
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/asb_gui_plugin_interface.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/..
|
||||
GuiPluginInterface
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
)
|
||||
|
||||
#
|
||||
@@ -36,5 +36,5 @@ ADD_INTERFACE_LIBRARY(AsbSymbolProxyGuiPluginInterface
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/asb_symbol_proxy_gui_plugin_interface.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/..
|
||||
GuiPluginInterface
|
||||
Qt5::Gui
|
||||
Qt6::Gui
|
||||
)
|
||||
@@ -33,7 +33,7 @@ NGL_ADD_LIBRARY(WS AsbDataPlugin MODULE
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(AsbDataPlugin
|
||||
AsbData
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
AsbDataPluginInterface
|
||||
GimDataPluginInterface
|
||||
svcAesCommon
|
||||
@@ -51,7 +51,7 @@ NGL_ADD_LIBRARY(WS AsbForeignDataPluginThp STATIC
|
||||
)
|
||||
NGL_TARGET_LINK_LIBRARIES(AsbForeignDataPluginThp
|
||||
AsbData
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
AsbDataPluginInterface
|
||||
GimDataPluginInterface
|
||||
svcAesCommon
|
||||
|
||||
+3
-3
@@ -47,8 +47,8 @@ NGL_TARGET_LINK_LIBRARIES(AsbSymEditGuiPlugin
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
LtsUtilsGuiDds
|
||||
Qt5::Core
|
||||
Qt5::Gui
|
||||
Qt5::Widgets
|
||||
Qt6::Core
|
||||
Qt6::Gui
|
||||
Qt6::Widgets
|
||||
)
|
||||
NGL_INSTALL_TARGET(AsbSymEditGuiPlugin)
|
||||
+4
-3
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "asb_symbol_editor.h"
|
||||
#include <utility>
|
||||
|
||||
#include <QButtonGroup>
|
||||
#include <QScrollBar>
|
||||
@@ -603,7 +604,7 @@ void SymbolEditor::resetGUI()
|
||||
|
||||
|
||||
m_ui->ComboBoxColor->clear();
|
||||
for (const auto &scp : qAsConst(m_internal->m_symbolColorsPreview))
|
||||
for (const auto &scp : std::as_const(m_internal->m_symbolColorsPreview))
|
||||
{
|
||||
QPixmap pixmap(20, 20);
|
||||
pixmap.fill(scp.second);
|
||||
@@ -1381,7 +1382,7 @@ void SymbolEditor::updateGraphicViews(bool editview, bool preview)
|
||||
previewFrameFillCol,
|
||||
-0.29, false, false);
|
||||
}
|
||||
for (const SymbologyXML::Symbol *miscSymbol : qAsConst(miscSymbols))
|
||||
for (const SymbologyXML::Symbol *miscSymbol : std::as_const(miscSymbols))
|
||||
{
|
||||
if (miscSymbol != nullptr)
|
||||
{
|
||||
@@ -1405,7 +1406,7 @@ void SymbolEditor::updateGraphicViews(bool editview, bool preview)
|
||||
previewAttFillCol,
|
||||
-0.29, false, false);
|
||||
}
|
||||
for (const SymbologyXML::Symbol *tgSymbol : qAsConst(tgSymbols))
|
||||
for (const SymbologyXML::Symbol *tgSymbol : std::as_const(tgSymbols))
|
||||
{
|
||||
if (tgSymbol != nullptr)
|
||||
{
|
||||
|
||||
+2
-2
@@ -22,8 +22,8 @@ NGL_ADD_LIBRARY(WS AsbSymbolProxyGuiPlugin MODULE ${AsbSymbolProxyGuiPlugin_SRCS
|
||||
NGL_TARGET_LINK_LIBRARIES(AsbSymbolProxyGuiPlugin
|
||||
AsbSymbolProxyGuiPluginInterface
|
||||
NGLLogger
|
||||
Qt5::Svg
|
||||
Qt5::Xml
|
||||
Qt6::Svg
|
||||
Qt6::Xml
|
||||
SituationMapGuiPluginInterface
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
|
||||
+5
-4
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "asb_flm_subscriber.h"
|
||||
#include <utility>
|
||||
|
||||
#include <LtsUtilsCore/dds_vector.h>
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
@@ -558,7 +559,7 @@ void FlmSubscriber::onLocalSymbolProxyEtsSymbolAdded(qint32 fileConte
|
||||
const QStringList &usrTags)
|
||||
{
|
||||
Q_UNUSED(fileContentId);
|
||||
for (const SymbologyType symbologyType : qAsConst(d->m_symbolDictionaryToUpdate))
|
||||
for (const SymbologyType symbologyType : std::as_const(d->m_symbolDictionaryToUpdate))
|
||||
{
|
||||
AdvancedSymbology::SymbolDictionary &dict =
|
||||
AdvancedSymbology::SymbolDictionary::dictionary(symbologyType);
|
||||
@@ -568,7 +569,7 @@ void FlmSubscriber::onLocalSymbolProxyEtsSymbolAdded(qint32 fileConte
|
||||
|
||||
void FlmSubscriber::onLocalSymbolProxyEtsSymbolRemoved(qint32 fileContentId, const QString &name)
|
||||
{
|
||||
for (const SymbologyType &symbologyType : qAsConst(d->m_symbolDictionaryToUpdate))
|
||||
for (const SymbologyType &symbologyType : std::as_const(d->m_symbolDictionaryToUpdate))
|
||||
{
|
||||
AdvancedSymbology::SymbolDictionary &dict =
|
||||
AdvancedSymbology::SymbolDictionary::dictionary(symbologyType);
|
||||
@@ -594,7 +595,7 @@ void FlmSubscriber::onLocalSymbolProxyXmlSymbolAdded(qint32 fileContentId,
|
||||
|
||||
if (!xmlContent.isEmpty())
|
||||
{
|
||||
for (const SymbologyType &symbologyType : qAsConst(d->m_symbolDictionaryToUpdate))
|
||||
for (const SymbologyType &symbologyType : std::as_const(d->m_symbolDictionaryToUpdate))
|
||||
{
|
||||
AdvancedSymbology::SymbolDictionary &dict =
|
||||
AdvancedSymbology::SymbolDictionary::dictionary(symbologyType);
|
||||
@@ -613,7 +614,7 @@ void FlmSubscriber::onLocalSymbolProxyXmlSymbolRemoved(qint32 fileContentId)
|
||||
{
|
||||
TRACE_LOG(m_logger) << LOGFUNCTION << " START" << " fileContentId=" << fileContentId;
|
||||
|
||||
for (const SymbologyType &symbologyType : qAsConst(d->m_symbolDictionaryToUpdate))
|
||||
for (const SymbologyType &symbologyType : std::as_const(d->m_symbolDictionaryToUpdate))
|
||||
{
|
||||
AdvancedSymbology::SymbolDictionary &dict =
|
||||
AdvancedSymbology::SymbolDictionary::dictionary(symbologyType);
|
||||
|
||||
@@ -13,9 +13,9 @@ SET(tmsr_SRCS
|
||||
NGL_ADD_LIBRARY2(WS AsbHelper STATIC ${tmsr_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(AsbHelper
|
||||
PUBLIC
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
PRIVATE
|
||||
Qt5::Gui
|
||||
Qt6::Gui
|
||||
AsbDataPluginInterface
|
||||
NGLLogger
|
||||
)
|
||||
@@ -50,7 +50,7 @@ ADD_SUBDIRECTORY(Gui)
|
||||
#
|
||||
#NGL_ADD_LIBRARY(WS AlmGuiPluginInterface SHARED alm_gui_plugin_interface.h)
|
||||
#NGL_TARGET_LINK_LIBRARIES(AlmGuiPluginInterface
|
||||
# Qt5::Core
|
||||
# Qt6::Core
|
||||
# GuiPluginInterface
|
||||
#)
|
||||
#NGL_INSTALL_TARGET(AlarmGuiPluginInterface)
|
||||
@@ -10,7 +10,7 @@
|
||||
#
|
||||
NGL_ADD_LIBRARY2(WS AlmDataPlugin MODULE alm_data_plugin.cpp alm_data_plugin.h)
|
||||
NGL_TARGET_LINK_LIBRARIES(AlmDataPlugin
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
AlmDataPluginInterface
|
||||
svcAlmClient
|
||||
NGLLogger
|
||||
|
||||
+2
-2
@@ -18,13 +18,13 @@ SET(alarm_common_gui_SRCS
|
||||
NGL_ADD_LIBRARY2(WS AlmCommon SHARED ${alarm_common_gui_SRCS} )
|
||||
NGL_TARGET_LINK_LIBRARIES(AlmCommon
|
||||
PRIVATE
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
LtsCoordTrans
|
||||
NGLLogger
|
||||
PUBLIC
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
nglwidgets
|
||||
svcPpmCommon
|
||||
svcAlmCommon
|
||||
|
||||
+1
-1
@@ -32,7 +32,7 @@ NGL_TARGET_LINK_LIBRARIES(AlmConfigAlarmGuiPlugin
|
||||
svcPdmCommon # pdm_enums.h in alm_dialog.cpp
|
||||
svcPpmCommon
|
||||
GuiPluginInterface
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
LtsCoordTrans
|
||||
LtsWidgets
|
||||
LtsDataView
|
||||
|
||||
+2
-1
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "alm_dialog.h"
|
||||
#include <utility>
|
||||
#include "ui_alm_dialog.h"
|
||||
#include "alm_history.h"
|
||||
#include <Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.h>
|
||||
@@ -266,7 +267,7 @@ std::vector<AlarmManagement::AlarmAction> AlarmDialog::getCheckedValues() const
|
||||
std::vector<AlarmManagement::AlarmAction> ret;
|
||||
ret.clear();
|
||||
ret.reserve(m_checkBoxes.size());
|
||||
for (const AlarmCheckBox &item : qAsConst(m_checkBoxes))
|
||||
for (const AlarmCheckBox &item : std::as_const(m_checkBoxes))
|
||||
{
|
||||
alarmActionDds.eventTypeId(item.eventTypeId);
|
||||
if (item.checkboxMarker->isChecked())
|
||||
|
||||
+1
-1
@@ -35,7 +35,7 @@ NGL_TARGET_LINK_LIBRARIES(AlmOnlineReportsGuiPlugin
|
||||
svcPdmCommon # pdm_translation.h in alm_dialog.cpp
|
||||
svcAesCommon
|
||||
GuiPluginInterface
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
PpmCommon
|
||||
AlmCommon
|
||||
LtsUtilsGuiDds
|
||||
|
||||
+1
-1
@@ -38,7 +38,7 @@ NGL_TARGET_LINK_LIBRARIES(AlmEmergencyCallGuiPlugin
|
||||
#svcPdmCommon # pdm_enums.h in alm_dialog.cpp
|
||||
#svcPpmCommon
|
||||
GuiPluginInterface
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
LtsCoordTrans
|
||||
LtsWidgets
|
||||
LtsDataView
|
||||
|
||||
@@ -17,7 +17,7 @@ NGL_TARGET_LINK_LIBRARIES(AppStarterGuiPlugin
|
||||
AppGuiPluginInterface
|
||||
LtsAppManager
|
||||
LtsAppDescriptor
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
LtsWidgets
|
||||
LtsSessionData
|
||||
LtsUtilsSettings
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#
|
||||
NGL_ADD_LIBRARY(WS AesDataPlugin MODULE aes_data_plugin.cpp aes_data_plugin.h)
|
||||
NGL_TARGET_LINK_LIBRARIES(AesDataPlugin
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
AesDataPluginInterface
|
||||
svcAesClient
|
||||
NGLLogger
|
||||
|
||||
+1
-1
@@ -35,7 +35,7 @@ NGL_TARGET_LINK_LIBRARIES(AesInfoGuiPlugin
|
||||
AesMineAreaGuiPluginInterface
|
||||
AesDangerAreaGuiPluginInterface
|
||||
SituationMapGuiPluginInterface
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
LtsWidgets
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
|
||||
+4
-3
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "aes_danger_area_aes_item_info.h"
|
||||
#include <utility>
|
||||
#include "ui_aes_danger_area_aes_item_info.h"
|
||||
#include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
|
||||
#include <BCContamination/aes_bccontamination_gui_plugin_interface.h>
|
||||
@@ -31,7 +32,7 @@ DangerAreaAesItemInfo::DangerAreaAesItemInfo(QWidget *parent)
|
||||
|
||||
DangerAreaAesItemInfo::~DangerAreaAesItemInfo()
|
||||
{
|
||||
for (const auto &item : qAsConst(m_aesItems))
|
||||
for (const auto &item : std::as_const(m_aesItems))
|
||||
delete item.item;
|
||||
delete m_ui;
|
||||
}
|
||||
@@ -134,11 +135,11 @@ void DangerAreaAesItemInfo::insertAesItem(int aesItemId)
|
||||
|
||||
void DangerAreaAesItemInfo::setText()
|
||||
{
|
||||
for (const DangerArea &dangerArea : qAsConst(m_dangerAreas))
|
||||
for (const DangerArea &dangerArea : std::as_const(m_dangerAreas))
|
||||
aesItemInfo(&dangerArea);
|
||||
|
||||
|
||||
for(const AesStruct &aesStruct : qAsConst(m_aesItems))
|
||||
for(const AesStruct &aesStruct : std::as_const(m_aesItems))
|
||||
{
|
||||
if(aesStruct.item->effectStateId() == AreaEffectSimulation::AesEffectState::EsActivated)
|
||||
aesItemInfo(aesStruct.item);
|
||||
|
||||
+1
-1
@@ -50,7 +50,7 @@ NGL_TARGET_LINK_LIBRARIES(AesAirSupportGuiPlugin
|
||||
ngltools
|
||||
PpmDataPluginInterface
|
||||
SituationMapGuiPluginInterface
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
)
|
||||
|
||||
NGL_INSTALL_TARGET(AesAirSupportGuiPlugin)
|
||||
+1
-1
@@ -42,7 +42,7 @@ NGL_TARGET_LINK_LIBRARIES(AesBcContaminationGuiPlugin
|
||||
LtsSession
|
||||
AesDataPluginInterface
|
||||
AesInfoGuiPluginInterface
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
LtsWidgets
|
||||
LtsUtilsSettings
|
||||
)
|
||||
|
||||
+2
-1
@@ -3,6 +3,7 @@
|
||||
|
||||
|
||||
#include "aes_bccontamination_edit.h"
|
||||
#include <utility>
|
||||
#include "ui_aes_bccontamination_edit.h"
|
||||
#include "../AesInfo/aes_danger_area_aes_item_info.h"
|
||||
|
||||
@@ -226,7 +227,7 @@ void BCContaminationEdit::setPbDangerAreaText()
|
||||
{
|
||||
QStringList sl;
|
||||
sl.reserve(m_dangerAreaIds.size());
|
||||
for (int idx : qAsConst(m_dangerAreaIds))
|
||||
for (int idx : std::as_const(m_dangerAreaIds))
|
||||
{
|
||||
sl << QString::fromStdString(m_dtc->dangerArea(idx).name());
|
||||
}
|
||||
|
||||
+1
-1
@@ -46,7 +46,7 @@ NGL_TARGET_LINK_LIBRARIES(AesBaseGui
|
||||
LtsSessionData
|
||||
LtsUtilsGuiDds
|
||||
LtsWidgets
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
)
|
||||
|
||||
NGL_INSTALL_TARGET(AesBaseGui)
|
||||
+5
-4
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "aes_base_model.h"
|
||||
#include <utility>
|
||||
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <LtsSession/lts_session.h>
|
||||
@@ -138,7 +139,7 @@ void AesGuiBasHelpers::updateComboboxFilterData(const QSet<int> &availablePartyI
|
||||
{
|
||||
LtsWidgets::ComboboxFilterContent cfc;
|
||||
LtsWidgets::ComboboxFilterData cfd;
|
||||
for (const int i : qAsConst(availabelChargeIds))
|
||||
for (const int i : std::as_const(availabelChargeIds))
|
||||
{
|
||||
cfd.data = i;
|
||||
cfd.text = chargeTypeName(i).toString();
|
||||
@@ -148,7 +149,7 @@ void AesGuiBasHelpers::updateComboboxFilterData(const QSet<int> &availablePartyI
|
||||
m_cbxFilterChargeType = cfc.toVariant();
|
||||
|
||||
cfc.data.clear();
|
||||
for (const int i : qAsConst(availablePartyIds))
|
||||
for (const int i : std::as_const(availablePartyIds))
|
||||
{
|
||||
cfd.data = i;
|
||||
cfd.text = ParticipantManagement::trPartyName(m_ppmDtc->party(i).name());
|
||||
@@ -191,10 +192,10 @@ void AesGuiBasHelpers::fillAvailableChargeIds(const QVector<ProjectDataManagemen
|
||||
{
|
||||
m_availableChargeIds.clear();
|
||||
|
||||
for (auto gc : qAsConst(gcs))
|
||||
for (auto gc : std::as_const(gcs))
|
||||
{
|
||||
const QVector<ProjectDataManagement::ChargeType> &availableCharges = m_pdmDtc->chargesForGearClass(gc);
|
||||
for (const auto &charge : qAsConst(availableCharges))
|
||||
for (const auto &charge : std::as_const(availableCharges))
|
||||
m_availableChargeIds += charge.id();
|
||||
}
|
||||
|
||||
|
||||
+2
-1
@@ -4,6 +4,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "aes_base_exports.h"
|
||||
#include <utility>
|
||||
|
||||
|
||||
#include <AreaEffectSimulation/aes.hpp>
|
||||
@@ -138,7 +139,7 @@ protected:
|
||||
{
|
||||
QSet<int> availabelChargeIds;
|
||||
QSet<int> availablePartyIds;
|
||||
for (const T &data : qAsConst(AesGuiBaseModel::m_vecData))
|
||||
for (const T &data : std::as_const(AesGuiBaseModel::m_vecData))
|
||||
{
|
||||
availabelChargeIds.insert(data.chargeStruct().chargeTypeId());
|
||||
if (data.partyId().is_set())
|
||||
|
||||
+1
-1
@@ -40,7 +40,7 @@ NGL_TARGET_LINK_LIBRARIES(AesBorderlineGuiPlugin
|
||||
AesInfoGuiPluginInterface
|
||||
FlmDataPluginInterface
|
||||
NGLLogger
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
LtsWidgets
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
|
||||
+1
-1
@@ -40,7 +40,7 @@ NGL_TARGET_LINK_LIBRARIES(AesChargeAdministrationGuiPlugin
|
||||
AesDataPluginInterface
|
||||
PpmGuiComboboxPluginInterface
|
||||
svcPdmCommon
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
LtsWidgets
|
||||
LtsUtilsSettings
|
||||
)
|
||||
|
||||
+3
-2
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "aes_charge_administration_adler_model.h"
|
||||
#include <utility>
|
||||
#include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
|
||||
#include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
|
||||
#include <LtsSession/lts_session.h>
|
||||
@@ -84,7 +85,7 @@ bool ChargeAdministrationAdlerModel::initModel(LtsSession::LtsSession *session)
|
||||
}
|
||||
|
||||
|
||||
for (const ParticipantManagement::Party &p : qAsConst(parties))
|
||||
for (const ParticipantManagement::Party &p : std::as_const(parties))
|
||||
{
|
||||
updateItem(p.id());
|
||||
}
|
||||
@@ -184,7 +185,7 @@ void ChargeAdministrationAdlerModel::updateItem(int partyId)
|
||||
qint64 sampleTime=0;
|
||||
ChargeAdministrationAdler item;
|
||||
|
||||
for (const ChargeStruct &participantCharges : qAsConst(m_participantChargeTypeMap))
|
||||
for (const ChargeStruct &participantCharges : std::as_const(m_participantChargeTypeMap))
|
||||
{
|
||||
if (participantCharges.partyId != partyId)
|
||||
continue;
|
||||
|
||||
+2
-1
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "aes_charge_administration_list.h"
|
||||
#include <utility>
|
||||
#include "CustomView/aes_charge_administration.h"
|
||||
#include "aes_charge_administration_model.h"
|
||||
#include "aes_charge_edit.h"
|
||||
@@ -101,7 +102,7 @@ bool ChargeAdministrationList::init(LtsSession::LtsSession *session)
|
||||
|
||||
if (!reqs.isEmpty())
|
||||
{
|
||||
for (const ChargeAdministrationModifyRequest &req : qAsConst(reqs))
|
||||
for (const ChargeAdministrationModifyRequest &req : std::as_const(reqs))
|
||||
{
|
||||
m_requestHelper->addRequest([this, req]() { return m_ftc->chargeAdministrationModifyRequest(req, this); });
|
||||
}
|
||||
|
||||
+3
-2
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "aes_charge_administration_model.h"
|
||||
#include <utility>
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <LtsUtilsCore/json_object.h>
|
||||
@@ -112,9 +113,9 @@ bool ChargeAdministrationModel::initModel(LtsSession::LtsSession *session, QVect
|
||||
const bool enableRocket = ps->value(QStringLiteral("aes"), QStringLiteral("enableRocket"), false).toBool();
|
||||
if (enableRocket)
|
||||
chargesForGearClass += m_pdmDtc->chargesForGearClass(ProjectDataManagement::GearClass_def::Rocket);
|
||||
for (const ParticipantManagement::Party &p : qAsConst(parties))
|
||||
for (const ParticipantManagement::Party &p : std::as_const(parties))
|
||||
{
|
||||
for (const ProjectDataManagement::ChargeType &ct : qAsConst(chargesForGearClass))
|
||||
for (const ProjectDataManagement::ChargeType &ct : std::as_const(chargesForGearClass))
|
||||
{
|
||||
if (chargesInserted.contains(qMakePair(ct.id(), p.id())) || isDummy(ct) || m_pdmDtc->isAdlerChargeType(ct.id()))
|
||||
continue;
|
||||
|
||||
+1
-1
@@ -33,7 +33,7 @@ NGL_TARGET_LINK_LIBRARIES(AesChargeEffectGuiPlugin
|
||||
PpmGuiComboboxPluginInterface
|
||||
PpmDataPluginInterface
|
||||
PpmParticipantSelectionGui
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
LtsWidgets
|
||||
AsbDataPluginInterface
|
||||
advancedSymbologyGui
|
||||
|
||||
+1
-1
@@ -40,7 +40,7 @@ NGL_TARGET_LINK_LIBRARIES(AesDangerAreaGuiPlugin
|
||||
PdmGuiPluginInterface
|
||||
AesInfoGuiPluginInterface
|
||||
SituationMapGuiPluginInterface
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
LtsWidgets
|
||||
LtsDataView
|
||||
LtsUtilsGuiDds
|
||||
|
||||
+2
-1
@@ -3,6 +3,7 @@
|
||||
|
||||
|
||||
#include "aes_danger_area_edit.h"
|
||||
#include <utility>
|
||||
#include "ui_aes_danger_area_edit.h"
|
||||
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
@@ -131,7 +132,7 @@ bool DangerAreaEdit::init(int aesItemId, bool copy,
|
||||
void DangerAreaEdit::setPbAesItemsText()
|
||||
{
|
||||
QStringList sl;
|
||||
for (int idx : qAsConst(m_otherAesItemIds))
|
||||
for (int idx : std::as_const(m_otherAesItemIds))
|
||||
{
|
||||
AesItem item;
|
||||
m_dtc->aesItemFromId(idx, item);
|
||||
|
||||
+2
-2
@@ -25,7 +25,7 @@ NGL_TARGET_LINK_LIBRARIES(AesEffectClusterModel
|
||||
ngltools
|
||||
PUBLIC
|
||||
NGLLogger
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
)
|
||||
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(AesEffectClusterModel
|
||||
@@ -96,7 +96,7 @@ NGL_TARGET_LINK_LIBRARIES(AesExplosionGuiPlugin
|
||||
PpmParticipantSelectionGui
|
||||
SituationMapGuiPluginInterface
|
||||
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
LtsWidgets
|
||||
LtsDataView
|
||||
LtsUtilsGuiDds
|
||||
|
||||
+2
-1
@@ -3,6 +3,7 @@
|
||||
|
||||
|
||||
#include "aes_explosion_edit.h"
|
||||
#include <utility>
|
||||
#include "ui_aes_explosion_edit.h"
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
|
||||
@@ -719,7 +720,7 @@ void ExplosionEdit::onPartyChanged()
|
||||
|
||||
QSignalBlocker sb(m_ui->cbChargeType);
|
||||
m_ui->cbChargeType->clear();
|
||||
for (const Charges &charge : qAsConst(m_chargeTypeMap))
|
||||
for (const Charges &charge : std::as_const(m_chargeTypeMap))
|
||||
{
|
||||
if (charge.available.contains(partyId) && charge.available[partyId] > 0)
|
||||
m_ui->cbChargeType->addItem(m_pdmDtc->trChargeTypeShortName(charge.chargeType.id(), true), charge.chargeType.id());
|
||||
|
||||
+4
-3
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "aes_explosions_edit.h"
|
||||
#include <utility>
|
||||
|
||||
#include "ui_aes_explosions_edit.h"
|
||||
|
||||
@@ -1850,7 +1851,7 @@ void ExplosionsEdit::enableUiElements(bool enable)
|
||||
|
||||
|
||||
const QList<QAbstractButton *> &geoButtons = m_geometrieButtonGroup->buttons();
|
||||
for (QAbstractButton *btn : qAsConst(geoButtons))
|
||||
for (QAbstractButton *btn : std::as_const(geoButtons))
|
||||
btn->setEnabled(enable);
|
||||
|
||||
|
||||
@@ -2597,7 +2598,7 @@ void ExplosionsEdit::fillCharges()
|
||||
QSignalBlocker locked(m_ui->cbChargeType);
|
||||
|
||||
m_ui->cbChargeType->clear();
|
||||
for (const ProjectDataManagement::ChargeType &chargeType : qAsConst(chargesForGearClass))
|
||||
for (const ProjectDataManagement::ChargeType &chargeType : std::as_const(chargesForGearClass))
|
||||
{
|
||||
|
||||
const bool bIsVulcano = chargeTypeIdIsVulcano(chargeType.id());
|
||||
@@ -2627,7 +2628,7 @@ void ExplosionsEdit::fillCharges()
|
||||
void ExplosionsEdit::fillGearClasses()
|
||||
{
|
||||
const auto &gearClasses = m_pdmDtc->gearTypes();
|
||||
for (auto type : qAsConst(gearClasses))
|
||||
for (auto type : std::as_const(gearClasses))
|
||||
{
|
||||
if (m_gearClassFilter.contains(type.gearClassId()) && m_pdmDtc->getAdlerWeaponSystemId(type.id()) <= 3)
|
||||
m_ui->cbGearClass->addItem(m_pdmDtc->trGearTypeName(type.id()), type.gearClassId().underlying());
|
||||
|
||||
+4
-3
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "aes_explosions_edit_adler_standalone.h"
|
||||
#include <utility>
|
||||
#include "aes_rocket_utility.h"
|
||||
#include "aes_effector.h"
|
||||
#include "ui_aes_explosions_edit_adler_standalone.h"
|
||||
@@ -1759,7 +1760,7 @@ void ExplosionsEditAdlerStandAlone::enableUiElements(bool enable)
|
||||
|
||||
|
||||
const QList<QAbstractButton *> &geoButtons = m_geometrieButtonGroup->buttons();
|
||||
for (QAbstractButton *btn : qAsConst(geoButtons))
|
||||
for (QAbstractButton *btn : std::as_const(geoButtons))
|
||||
btn->setEnabled(enable);
|
||||
|
||||
|
||||
@@ -2747,7 +2748,7 @@ void ExplosionsEditAdlerStandAlone::fillCharges()
|
||||
m_ui->cbChargeType->clear();
|
||||
m_ui->cbChargeType->addItem(emptyEntryComboBox, -1);
|
||||
|
||||
for (const ProjectDataManagement::ChargeType &chargeType : qAsConst(chargesForGearClass))
|
||||
for (const ProjectDataManagement::ChargeType &chargeType : std::as_const(chargesForGearClass))
|
||||
{
|
||||
|
||||
const bool bIsVulcano = chargeTypeIdIsVulcano(chargeType.id());
|
||||
@@ -2793,7 +2794,7 @@ void ExplosionsEditAdlerStandAlone::fillGearClasses()
|
||||
int index = 0;
|
||||
m_ui->cbGearClass->insertItem(index, emptyEntryComboBox, -1);
|
||||
|
||||
for (auto type : qAsConst(gearClasses))
|
||||
for (auto type : std::as_const(gearClasses))
|
||||
{
|
||||
if (m_gearClassFilter.contains(type.gearClassId()))
|
||||
{
|
||||
|
||||
+1
-1
@@ -40,7 +40,7 @@ NGL_TARGET_LINK_LIBRARIES(AesFunctionalAreaGuiPlugin
|
||||
PpmGuiComboboxPluginInterface
|
||||
PpmDataPluginInterface
|
||||
PpmParticipantSelectionGui
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
LtsWidgets
|
||||
AsbDataPluginInterface
|
||||
advancedSymbologyGui
|
||||
|
||||
+4
-3
@@ -3,6 +3,7 @@
|
||||
|
||||
|
||||
#include "aes_functional_area_edit.h"
|
||||
#include <utility>
|
||||
#include "ui_aes_functional_area_edit.h"
|
||||
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
@@ -277,7 +278,7 @@ bool FunctionalAreaEdit::init(int areaId, bool copy,
|
||||
|
||||
m_ui->cbFunctionalAreaType->clear();
|
||||
m_functionalAreaTypes = m_dtc->functionalAreaTypes();
|
||||
for (const auto &type : qAsConst(m_functionalAreaTypes))
|
||||
for (const auto &type : std::as_const(m_functionalAreaTypes))
|
||||
m_ui->cbFunctionalAreaType->addItem(AreaEffectSimulation::trFunctionalAreaTypeName(type.name()), type.id());
|
||||
|
||||
bool editable = LtsSessionData::LtsSessionData::getInstance()->hasOperatorRight(OperatorRights::FunctionalAreasEdit) ||
|
||||
@@ -733,7 +734,7 @@ void FunctionalAreaEdit::setVisableFaButtons()
|
||||
|
||||
DEBUG_LOG(m_logger) << "setVisableFaButtons!!!!!!!!!!!!!!!!!!!!!!!! Type=" << functionalAreaType;
|
||||
const QList<QWidget *> children = findChildren<QWidget *>();
|
||||
for (QWidget *w : qAsConst(children))
|
||||
for (QWidget *w : std::as_const(children))
|
||||
{
|
||||
|
||||
|
||||
@@ -763,7 +764,7 @@ QStringList FunctionalAreaEdit::toStringList(const QList<QByteArray> &list)
|
||||
QStringList stringList;
|
||||
stringList.reserve(list.size());
|
||||
|
||||
for (const QByteArray &ba : qAsConst(list))
|
||||
for (const QByteArray &ba : std::as_const(list))
|
||||
stringList.append(QString::fromLocal8Bit(ba));
|
||||
|
||||
return stringList;
|
||||
|
||||
+1
-1
@@ -39,7 +39,7 @@ NGL_TARGET_LINK_LIBRARIES(AesGasPipeGuiPlugin
|
||||
PdmGuiPluginInterface
|
||||
AesInfoGuiPluginInterface
|
||||
NGLLogger
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
LtsWidgets
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
|
||||
+1
-1
@@ -40,7 +40,7 @@ NGL_TARGET_LINK_LIBRARIES(AesMineAreaGuiPlugin
|
||||
AesMineAreaGuiPluginInterface
|
||||
PdmGuiPluginInterface
|
||||
SituationMapGuiPluginInterface
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
LtsWidgets
|
||||
LtsUtilsGuiDds
|
||||
LtsDataView
|
||||
|
||||
+1
-1
@@ -40,7 +40,7 @@ NGL_TARGET_LINK_LIBRARIES(AesMineCorridorGuiPlugin
|
||||
AesInfoGuiPluginInterface
|
||||
PpmGuiComboboxPluginInterface
|
||||
SituationMapGuiPluginInterface
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
LtsWidgets
|
||||
LtsDataView
|
||||
LtsUtilsGuiDds
|
||||
|
||||
+1
-1
@@ -55,7 +55,7 @@ NGL_TARGET_LINK_LIBRARIES(AesMineSingleVirtualGuiPlugin
|
||||
LtsSession
|
||||
AesDataPluginInterface
|
||||
AesInfoGuiPluginInterface
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
LtsWidgets
|
||||
LtsUtilsSettings
|
||||
)
|
||||
|
||||
+2
-1
@@ -3,6 +3,7 @@
|
||||
|
||||
|
||||
#include "aes_off_route_mine_edit.h"
|
||||
#include <utility>
|
||||
#include "ui_aes_off_route_mine_edit.h"
|
||||
|
||||
#include <LtsWidgets/lts_message_dialog.h>
|
||||
@@ -386,7 +387,7 @@ void OffRouteMineEdit::onPolylineData(const QPolygonF &polyline)
|
||||
|
||||
m_previewPolygon.clear();
|
||||
m_previewPolygon.reserve(relativeRect.size());
|
||||
for (const QPointF &item : qAsConst(relativeRect))
|
||||
for (const QPointF &item : std::as_const(relativeRect))
|
||||
m_previewPolygon.append(utm1.geographic(item));
|
||||
|
||||
showPreviewObject();
|
||||
|
||||
+1
-1
@@ -39,7 +39,7 @@ NGL_TARGET_LINK_LIBRARIES(AesNContaminationGuiPlugin
|
||||
AesNContaminationGuiPluginInterface
|
||||
PpmGuiComboboxPluginInterface
|
||||
SituationMapGuiPluginInterface
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
LtsWidgets
|
||||
LtsDataView
|
||||
LtsUtilsGuiDds
|
||||
|
||||
+2
-1
@@ -3,6 +3,7 @@
|
||||
|
||||
|
||||
#include "aes_ncontamination_edit.h"
|
||||
#include <utility>
|
||||
#include "ui_aes_ncontamination_edit.h"
|
||||
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
@@ -281,7 +282,7 @@ bool NContaminationEdit::init(int aesItemId, bool copy,
|
||||
if (m_session->getDtc<ProjectDataManagement::DataInterface>(pdmDtc))
|
||||
{
|
||||
m_presets = pdmDtc->nuclearPresets();
|
||||
for (const ProjectDataManagement::NuclearPreset &preset : qAsConst(m_presets))
|
||||
for (const ProjectDataManagement::NuclearPreset &preset : std::as_const(m_presets))
|
||||
m_ui->cbStandardValues->addItem(pdmDtc->trNuclearPresetName(preset.id()), preset.id());
|
||||
connect(m_ui->cbStandardValues, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &NContaminationEdit::onPresetChanged);
|
||||
}
|
||||
|
||||
+1
-1
@@ -37,7 +37,7 @@ NGL_TARGET_LINK_LIBRARIES(AesTechnicalAreaGuiPlugin
|
||||
NGLLogger
|
||||
LtsSessionData
|
||||
AesDataPluginInterface
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
LtsWidgets
|
||||
LtsUtilsSettings
|
||||
)
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#
|
||||
NGL_ADD_LIBRARY(WS AsmDataPlugin MODULE asm_data_plugin.cpp asm_data_plugin.h)
|
||||
NGL_TARGET_LINK_LIBRARIES(AsmDataPlugin
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
AsmDataPluginInterface
|
||||
svcAsmClient
|
||||
NGLLogger
|
||||
|
||||
+1
-1
@@ -31,7 +31,7 @@ NGL_TARGET_LINK_LIBRARIES(AsmGuiPlugin
|
||||
OpmDataPluginInterface
|
||||
AsmGuiPluginInterface
|
||||
FlmDataPluginInterface
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
LtsCoordTrans
|
||||
ltsCoordWidget
|
||||
LtsWidgets
|
||||
|
||||
@@ -22,7 +22,7 @@ ADD_SUBDIRECTORY(Shared)
|
||||
ADD_INTERFACE_LIBRARY(AvmMenuEditGuiPluginInterface
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/avm_menu_edit_gui_plugin_interface.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/..
|
||||
GuiPluginInterface TopicReplayInterface TopicEditorInterface Qt5::Core AvmShared Boost::boost
|
||||
GuiPluginInterface TopicReplayInterface TopicEditorInterface Qt6::Core AvmShared Boost::boost
|
||||
)
|
||||
|
||||
#
|
||||
@@ -31,7 +31,7 @@ ADD_INTERFACE_LIBRARY(AvmMenuEditGuiPluginInterface
|
||||
ADD_INTERFACE_LIBRARY(AvmCombatNetRadioGuiPluginInterface
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/avm_combat_net_radio_gui_plugin_interface.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/..
|
||||
GuiPluginInterface Qt5::Core
|
||||
GuiPluginInterface Qt6::Core
|
||||
)
|
||||
|
||||
#
|
||||
@@ -59,5 +59,5 @@ ADD_INTERFACE_LIBRARY(AvmMvsVideoTeamGuiPluginInterface
|
||||
ADD_INTERFACE_LIBRARY(AvmDataPluginInterface
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/avm_data_plugin_interface.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/..
|
||||
DataPluginInterface svcAvmCommon Qt5::Core IsmDataPluginInterface
|
||||
DataPluginInterface svcAvmCommon Qt6::Core IsmDataPluginInterface
|
||||
)
|
||||
@@ -36,7 +36,7 @@ NGL_TARGET_LINK_LIBRARIES(AvmDataPlugin
|
||||
svcExmClient
|
||||
svcIsmClient
|
||||
IsmDataPluginInterface
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
LtsUtilsGuiStyleManager
|
||||
LtsUtilsGuiConnectDialog
|
||||
LtsUtilsSettings
|
||||
|
||||
+4
-3
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "audio_settings_dialog.h"
|
||||
#include <utility>
|
||||
#include "ui_audio_settings_dialog.h"
|
||||
#include "audio_settings_avail_streams_model.h"
|
||||
#include "audio_settings_used_streams_model.h"
|
||||
@@ -187,7 +188,7 @@ void AudioSettingsDialog::fillOperatorList()
|
||||
{
|
||||
QVector<StreamData> newStreamData;
|
||||
|
||||
for (const auto &rc : qAsConst(m_cnrTvcProfileMap))
|
||||
for (const auto &rc : std::as_const(m_cnrTvcProfileMap))
|
||||
{
|
||||
if ((rc.exerciseId() != m_session->exerciseId())
|
||||
|| (rc.operatorId() != m_ui->operatorComboBox->currentData().toInt()))
|
||||
@@ -283,7 +284,7 @@ bool AudioSettingsDialog::applyRemove()
|
||||
RemoveCnrTvcProfileRequest removeRequest;
|
||||
DEBUG_LOG(m_logger) << "AudioSettingsDialog::applyRemove";
|
||||
|
||||
for (const auto &profile : qAsConst(m_cnrTvcProfileMap))
|
||||
for (const auto &profile : std::as_const(m_cnrTvcProfileMap))
|
||||
{
|
||||
if (profile.operatorId() != m_operatorId)
|
||||
continue;
|
||||
@@ -306,7 +307,7 @@ bool AudioSettingsDialog::applyModify()
|
||||
ModifyCnrTvcProfileRequest modifyRequest;
|
||||
DEBUG_LOG(m_logger) << "AudioSettingsDialog::applyModify";
|
||||
|
||||
for (const auto &profile : qAsConst(m_cnrTvcProfileMap))
|
||||
for (const auto &profile : std::as_const(m_cnrTvcProfileMap))
|
||||
{
|
||||
if (profile.operatorId() != m_operatorId)
|
||||
continue;
|
||||
|
||||
+1
-1
@@ -78,7 +78,7 @@ NGL_TARGET_LINK_LIBRARIES(avmMenuEditGuiPlugin
|
||||
ngltools
|
||||
nglwidgets
|
||||
OpmDataPluginInterface
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
TopicEditorBase
|
||||
Boost::boost
|
||||
)
|
||||
|
||||
+4
-3
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "avm_sequence_model.h"
|
||||
#include <utility>
|
||||
|
||||
#include <QJsonObject>
|
||||
#include <QColor>
|
||||
@@ -209,13 +210,13 @@ void AvmSequenceModel::setHighlightedRow(int highlighted, bool reset)
|
||||
changedRows.reserve(oldSelected.size() + m_highlightedRows.size());
|
||||
|
||||
if (m_highlightedRows.isEmpty() || reset)
|
||||
for (int row : qAsConst(oldSelected))
|
||||
for (int row : std::as_const(oldSelected))
|
||||
changedRows += row;
|
||||
|
||||
for (int row : qAsConst(m_highlightedRows))
|
||||
for (int row : std::as_const(m_highlightedRows))
|
||||
changedRows += row;
|
||||
|
||||
for (int row : qAsConst(changedRows))
|
||||
for (int row : std::as_const(changedRows))
|
||||
emit dataChanged(index(row, 0), index(row, Description), { Qt::BackgroundRole });
|
||||
}
|
||||
|
||||
|
||||
+2
-1
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "topic_editor.h"
|
||||
#include <utility>
|
||||
#include "ui_topic_editor.h"
|
||||
|
||||
#include <AudioVideoManagement/av_helper.h>
|
||||
@@ -620,7 +621,7 @@ void TopicEditor::onDeleteSequences()
|
||||
if (rows.count() == 1)
|
||||
curEditedRow = rows.first();
|
||||
|
||||
for (int row : qAsConst(rowIds))
|
||||
for (int row : std::as_const(rowIds))
|
||||
{
|
||||
m_model->removeRow(row);
|
||||
if (curEditedRow == row)
|
||||
|
||||
+2
-1
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "avm_used_streams_model.h"
|
||||
#include <utility>
|
||||
#include "avm_available_streams_model.h"
|
||||
#include <AudioVideoManagement/stream_name_mapping.h>
|
||||
#include <nglwidgets/ngltreeitem.h>
|
||||
@@ -474,7 +475,7 @@ QSet<int> UsedStreamsModel::fillTakenCameras(NGLTreeItem *getItem) const
|
||||
{
|
||||
QSet<int> ret;
|
||||
const QVector<NGLTreeItem *> &children = getItem->children();
|
||||
for (const auto &item : qAsConst(children))
|
||||
for (const auto &item : std::as_const(children))
|
||||
{
|
||||
if (item->childCount())
|
||||
ret += fillTakenCameras(item);
|
||||
|
||||
+1
-1
@@ -91,7 +91,7 @@ NGL_TARGET_LINK_LIBRARIES(avmCombatNetRadioGuiPlugin
|
||||
svcAvmCommon
|
||||
AvmShared
|
||||
svcExmClient
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
LtsWidgets
|
||||
LtsDataView
|
||||
LtsUtilsGuiDds
|
||||
|
||||
+2
-1
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "avm_cnr_json_helper.h"
|
||||
#include <utility>
|
||||
|
||||
#include <AudioVideoManagement/avm_dtc.h>
|
||||
|
||||
@@ -19,7 +20,7 @@ QByteArray cnrConfigVectorToJson(const QVector<CnrConfig> &configVector, int32_t
|
||||
QJsonObject obj;
|
||||
QJsonArray arr;
|
||||
|
||||
for (const CnrConfig &config : qAsConst(configVector))
|
||||
for (const CnrConfig &config : std::as_const(configVector))
|
||||
{
|
||||
if((isGlobal && config.exerciseId().is_set())
|
||||
|| (!isGlobal && !config.exerciseId().is_set()))
|
||||
|
||||
+2
-1
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "avm_combat_net_radio_dialog_model.h"
|
||||
#include <utility>
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <AudioVideoManagement/avm_ftc.h>
|
||||
@@ -110,7 +111,7 @@ bool CombatNetRadioDialogModel::init(const std::shared_ptr<Interface::Dtc> &avmD
|
||||
}
|
||||
bool CombatNetRadioDialogModel::onlyGlobals()
|
||||
{
|
||||
for(const CnrConfig &config : qAsConst(m_vecData))
|
||||
for(const CnrConfig &config : std::as_const(m_vecData))
|
||||
{
|
||||
if(config.exerciseId().is_set() && config.exerciseId().get() == m_exerciseId)
|
||||
return false;
|
||||
|
||||
+3
-2
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "avm_edit_combat_net_radio_dialog.h"
|
||||
#include <utility>
|
||||
#include "ui_avm_edit_combat_net_radio_dialog.h"
|
||||
#include <AudioVideoManagement/av_helper.h>
|
||||
#include <AudioVideoManagement/Shared/project_settings.h>
|
||||
@@ -191,7 +192,7 @@ void EditCombatNetRadioDialog::init(LtsSession::LtsSession *session)
|
||||
if (!m_ppmDtc->visibleParties(parties, LtsSessionData::LtsSessionData::getInstance()->getVisibleParties(m_exerciseId)))
|
||||
ERROR_LOG(m_logger) << "Could not retrieve visible Parties!";
|
||||
|
||||
for (const ParticipantManagement::Party &party : qAsConst(parties))
|
||||
for (const ParticipantManagement::Party &party : std::as_const(parties))
|
||||
m_ui->cbParty->addItem(ParticipantManagement::trPartyName(party.name()), party.id());
|
||||
|
||||
connect(m_ui->cbParty, QOverload<int>::of(&LtsWidgets::LtsComboBox::currentIndexChanged), this, &EditCombatNetRadioDialog::onPartyIndexChanged);
|
||||
@@ -481,7 +482,7 @@ void EditCombatNetRadioDialog::onPartyIndexChanged(int index)
|
||||
|
||||
int32_t partyId = m_ui->cbParty->itemData(index).toInt();
|
||||
|
||||
for (const ParticipantManagement::Participant &unit : qAsConst(m_units))
|
||||
for (const ParticipantManagement::Participant &unit : std::as_const(m_units))
|
||||
{
|
||||
QString unitStr;
|
||||
if (unit.partyId() == partyId)
|
||||
|
||||
+2
-1
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "avm_edit_frequency_planning_dialog.h"
|
||||
#include <utility>
|
||||
#include "ui_avm_edit_frequency_planning_dialog.h"
|
||||
#include "avm_edit_frequency_planning_frequency_data_model.h"
|
||||
|
||||
@@ -330,7 +331,7 @@ QVector<int> EditFrequencyPlanningDialog::otherActiveExercises() const
|
||||
allExercises.erase(newEnd, allExercises.end());
|
||||
|
||||
QVector<int> toBeConsidered;
|
||||
for (const auto &exercise : qAsConst(allExercises))
|
||||
for (const auto &exercise : std::as_const(allExercises))
|
||||
{
|
||||
if (exercise.id() == m_exerciseId)
|
||||
continue;
|
||||
|
||||
+11
-10
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "avm_edit_frequency_planning_frequency_data_model.h"
|
||||
#include <utility>
|
||||
|
||||
#include <Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
|
||||
#include <FileManagement/flm_translation.h>
|
||||
@@ -78,7 +79,7 @@ void EditFrequencyPlanningFrequencyDataModel::onFrequencyPlanningChanged(const F
|
||||
QVector<RadioCircuit*> circuits = AudioVideoManagement::fromJson(fpd.properties());
|
||||
if (circuits.size() > 1)
|
||||
{
|
||||
for (RadioCircuit *circuit : qAsConst(circuits))
|
||||
for (RadioCircuit *circuit : std::as_const(circuits))
|
||||
{
|
||||
itemData.radioCircuit = circuit;
|
||||
ConfigTreeItem *childItem = new ConfigTreeItem(QVariant::fromValue(itemData));
|
||||
@@ -109,7 +110,7 @@ void EditFrequencyPlanningFrequencyDataModel::onFrequencyPlanningChanged(const F
|
||||
}
|
||||
}
|
||||
|
||||
for (const FrequencyPlanningData &item : qAsConst(fpdMap))
|
||||
for (const FrequencyPlanningData &item : std::as_const(fpdMap))
|
||||
{
|
||||
setFrequencyPlanningData(item);
|
||||
}
|
||||
@@ -202,7 +203,7 @@ void EditFrequencyPlanningFrequencyDataModel::setCnrConfigs(const QVector<CnrCon
|
||||
{
|
||||
ConfigTreeItem *configItem = new ConfigTreeItem(QVariant::fromValue(id));
|
||||
insertRow(m_rootItem->childCount(), indexFromItem(m_rootItem), configItem);
|
||||
for (RadioCircuit *circuit : qAsConst(circuits))
|
||||
for (RadioCircuit *circuit : std::as_const(circuits))
|
||||
{
|
||||
id.radioCircuit = circuit;
|
||||
ConfigTreeItem *childItem = new ConfigTreeItem(QVariant::fromValue(id));
|
||||
@@ -721,7 +722,7 @@ void EditFrequencyPlanningFrequencyDataModel::setFrequencyPlanningData(const Fre
|
||||
{
|
||||
ConfigTreeItem *configItem = new ConfigTreeItem(QVariant::fromValue(data));
|
||||
insertRow(m_rootItem->childCount(), indexFromItem(m_rootItem), configItem);
|
||||
for (RadioCircuit *circuit : qAsConst(circuits))
|
||||
for (RadioCircuit *circuit : std::as_const(circuits))
|
||||
{
|
||||
data.radioCircuit = circuit;
|
||||
ConfigTreeItem *childItem = new ConfigTreeItem(QVariant::fromValue(data));
|
||||
@@ -752,7 +753,7 @@ void EditFrequencyPlanningFrequencyDataModel::setFrequencyPlanningData(const Fre
|
||||
if (circuits.size() <= 1)
|
||||
return;
|
||||
|
||||
for (RadioCircuit *circuit : qAsConst(circuits))
|
||||
for (RadioCircuit *circuit : std::as_const(circuits))
|
||||
{
|
||||
data.radioCircuit = circuit;
|
||||
ConfigTreeItem *childItem = new ConfigTreeItem(QVariant::fromValue(data));
|
||||
@@ -777,9 +778,9 @@ bool EditFrequencyPlanningFrequencyDataModel::checkResourceAssignments()
|
||||
{
|
||||
const FrequencyPlanningData &pI= startSearchIt.value();
|
||||
QSet<int> fsdIdsInner = frequencySetDataIds(pI.properties());
|
||||
for (int inner : qAsConst(fsdIdsInner))
|
||||
for (int inner : std::as_const(fsdIdsInner))
|
||||
{
|
||||
for (int outer : qAsConst(fsdIdsOuter))
|
||||
for (int outer : std::as_const(fsdIdsOuter))
|
||||
{
|
||||
if (inner != outer)
|
||||
{
|
||||
@@ -803,7 +804,7 @@ bool EditFrequencyPlanningFrequencyDataModel::checkResourceAssignments()
|
||||
}
|
||||
#ifdef LTS_DEBUG
|
||||
QString qs;
|
||||
for (int id : qAsConst(m_multipleAssignedCnrIds))
|
||||
for (int id : std::as_const(m_multipleAssignedCnrIds))
|
||||
{
|
||||
qs.append(QString::number(id));
|
||||
qs.append(QStringLiteral(", "));
|
||||
@@ -881,7 +882,7 @@ EditFrequencyPlanningFrequencyDataModel::ConfigTreeItem* EditFrequencyPlanningFr
|
||||
QSet<int> EditFrequencyPlanningFrequencyDataModel::getAllocatedFrequencyPlanningSetIds()
|
||||
{
|
||||
QSet<int> result;
|
||||
for (const auto &fpd : qAsConst(m_frequencyPlanningData))
|
||||
for (const auto &fpd : std::as_const(m_frequencyPlanningData))
|
||||
{
|
||||
result += AudioVideoManagement::frequencySetDataIds(fpd.properties());
|
||||
}
|
||||
@@ -889,7 +890,7 @@ QSet<int> EditFrequencyPlanningFrequencyDataModel::getAllocatedFrequencyPlanning
|
||||
if(m_exerciseId == 0)
|
||||
{
|
||||
QMap<qint32,AudioVideoManagement::FrequencyPlanning> frequencyPlannings = m_avmDtc->frequencyPlannings();
|
||||
for(const auto &frequencyPlanning : qAsConst(frequencyPlannings))
|
||||
for(const auto &frequencyPlanning : std::as_const(frequencyPlannings))
|
||||
{
|
||||
if(!frequencyPlanning.exerciseId().is_set())
|
||||
continue;
|
||||
|
||||
+2
-1
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "avm_edit_frequency_planning_frequency_data_model.h"
|
||||
#include <utility>
|
||||
#include "avm_edit_frequency_planning_resource_dialog.h"
|
||||
#include "ui_avm_edit_frequency_planning_resource_dialog.h"
|
||||
#include "avm_frequency_planning_widget.h"
|
||||
@@ -75,7 +76,7 @@ bool EditFrequencyPlanningResourceDialog::init(LtsSession::LtsSession *session,
|
||||
|
||||
QVector<RadioCircuit*> circuits = AudioVideoManagement::fromJson(planningData.properties());
|
||||
bool readOnly = isReadOnly(planningData.properties());
|
||||
for (RadioCircuit *circuit : qAsConst(circuits))
|
||||
for (RadioCircuit *circuit : std::as_const(circuits))
|
||||
{
|
||||
addMemberWidget(circuit, readOnly);
|
||||
}
|
||||
|
||||
+5
-4
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "avm_load_frequency_planning_dialog_model.h"
|
||||
#include <utility>
|
||||
|
||||
#include <Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
|
||||
#include <FileManagement/flm_translation.h>
|
||||
@@ -87,7 +88,7 @@ void LoadFrequencyPlanningDialogModel::onFrequencyPlanningChanged(const Frequenc
|
||||
|
||||
|
||||
QMap<qint32,AudioVideoManagement::FrequencyPlanning> frequencyPlannings = m_avmDtc->frequencyPlannings();
|
||||
for(const auto &frequencyPlanning : qAsConst(frequencyPlannings))
|
||||
for(const auto &frequencyPlanning : std::as_const(frequencyPlannings))
|
||||
{
|
||||
|
||||
|
||||
@@ -213,7 +214,7 @@ void LoadFrequencyPlanningDialogModel::setData(const QByteArray &data)
|
||||
ConfigTreeItem *configItem = new ConfigTreeItem(QVariant::fromValue(id));
|
||||
m_checkStates.insert(m_rootItem->childCount(), Qt::Unchecked);
|
||||
insertRow(m_rootItem->childCount(), indexFromItem(m_rootItem), configItem);
|
||||
for (RadioCircuit *circuit : qAsConst(circuits))
|
||||
for (RadioCircuit *circuit : std::as_const(circuits))
|
||||
{
|
||||
id.radioCircuit = circuit;
|
||||
ConfigTreeItem *childItem = new ConfigTreeItem(QVariant::fromValue(id));
|
||||
@@ -629,7 +630,7 @@ void LoadFrequencyPlanningDialogModel::checkConflicts()
|
||||
itemsInRow.append(item);
|
||||
itemsInRow += item->children();
|
||||
|
||||
for (NGLTreeItem *treeItem : qAsConst(itemsInRow))
|
||||
for (NGLTreeItem *treeItem : std::as_const(itemsInRow))
|
||||
{
|
||||
ItemData itemData = treeItem->data().value<ItemData>();
|
||||
|
||||
@@ -809,7 +810,7 @@ void LoadFrequencyPlanningDialogModel::setFrequencyPlanningData(const FrequencyP
|
||||
if (circuits.size() <= 1)
|
||||
return;
|
||||
|
||||
for (RadioCircuit *circuit : qAsConst(circuits))
|
||||
for (RadioCircuit *circuit : std::as_const(circuits))
|
||||
{
|
||||
data.radioCircuit = circuit;
|
||||
ConfigTreeItem *childItem = new ConfigTreeItem(QVariant::fromValue(data));
|
||||
|
||||
+2
-1
@@ -3,6 +3,7 @@
|
||||
|
||||
|
||||
#include "avm_radio_specifica_hf_widget.h"
|
||||
#include <utility>
|
||||
#include "ui_avm_radio_specifica_hf_widget.h"
|
||||
#include <AudioVideoManagement/avm_translation.h>
|
||||
|
||||
@@ -106,7 +107,7 @@ QJsonObject RadioSpecificaHfWidget::toJson() const
|
||||
|
||||
bool RadioSpecificaHfWidget::isFreqValid() const
|
||||
{
|
||||
for (const auto &range : qAsConst(m_ranges))
|
||||
for (const auto &range : std::as_const(m_ranges))
|
||||
if(m_ui->sbFrequency->value() >= range.first && m_ui->sbFrequency->value() <= range.second)
|
||||
return true;
|
||||
return false;
|
||||
|
||||
+2
-1
@@ -3,6 +3,7 @@
|
||||
|
||||
|
||||
#include "avm_radio_specifica_uhf_widget.h"
|
||||
#include <utility>
|
||||
#include "ui_avm_radio_specifica_uhf_widget.h"
|
||||
#include <AudioVideoManagement/avm_translation.h>
|
||||
|
||||
@@ -164,7 +165,7 @@ QJsonObject RadioSpecificaUhfWidget::toJson() const
|
||||
|
||||
bool RadioSpecificaUhfWidget::isFreqValid() const
|
||||
{
|
||||
for (const auto &range : qAsConst(m_ranges))
|
||||
for (const auto &range : std::as_const(m_ranges))
|
||||
if(m_ui->sbFrequency->value() >= range.first && m_ui->sbFrequency->value() <= range.second)
|
||||
return true;
|
||||
return false;
|
||||
|
||||
+2
-1
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include <Plugins/ParticipantManagement/ppm_data_plugin_interface.h>
|
||||
#include <utility>
|
||||
#include <Plugins/InfrastructureManagement/ism_data_plugin_interface.h>
|
||||
#include "avm_combat_net_radio_gui_plugin.h"
|
||||
#include "CombatNetRadioConfiguration/avm_combat_net_radio_dialog.h"
|
||||
@@ -124,7 +125,7 @@ LtsWidgets::LtsDialog *InterfaceImpl::onShowFrequencyPlanningDialog(QWidget *par
|
||||
{
|
||||
QMap<qint32,AudioVideoManagement::FrequencyPlanning> plannings = m_avmDataIfc->getDtc()->frequencyPlannings();
|
||||
|
||||
for(const FrequencyPlanning &planning : qAsConst(plannings))
|
||||
for(const FrequencyPlanning &planning : std::as_const(plannings))
|
||||
{
|
||||
if(planning.exerciseId().is_set())
|
||||
continue;
|
||||
|
||||
+1
-1
@@ -31,7 +31,7 @@ NGL_TARGET_LINK_LIBRARIES(AvmElokaGuiPlugin
|
||||
AvmDataPluginInterface
|
||||
PpmDataPluginInterface
|
||||
svcAvmCommon
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
LtsWidgets
|
||||
LtsDataView
|
||||
LtsUtilsGuiDds
|
||||
|
||||
+2
-1
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "avm_eloka_dialog.h"
|
||||
#include <utility>
|
||||
#include "ui_avm_eloka_dialog.h"
|
||||
|
||||
#include <avm_eloka_edit_dialog.h>
|
||||
@@ -278,7 +279,7 @@ bool ElokaDialog::isAnnouncement(ElokaData& data)
|
||||
{
|
||||
QMap<qint32, Stream> announcements;
|
||||
QMap<qint32, Stream> streams = m_avmDtc->streams();
|
||||
for (const Stream &stream : qAsConst(streams))
|
||||
for (const Stream &stream : std::as_const(streams))
|
||||
{
|
||||
if ((stream.type() == StreamType_def::AudioOut) ||
|
||||
(stream.type() == StreamType_def::AudioInOut))
|
||||
|
||||
+4
-3
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <utility>
|
||||
|
||||
#include "avm_eloka_edit_dialog.h"
|
||||
#include "ui_avm_eloka_edit_dialog.h"
|
||||
@@ -474,7 +475,7 @@ void ElokaEditDialog::fillComboBoxCircuit(ElokaCircuitType type)
|
||||
{
|
||||
case ElokaCircuitType::Cnr:
|
||||
{
|
||||
for (const CnrConfig &cnr : qAsConst(m_cnrConfigMap))
|
||||
for (const CnrConfig &cnr : std::as_const(m_cnrConfigMap))
|
||||
{
|
||||
if (!m_userProfile.contains(cnr.id(), ElokaCircuitType::Cnr))
|
||||
continue;
|
||||
@@ -487,7 +488,7 @@ void ElokaEditDialog::fillComboBoxCircuit(ElokaCircuitType type)
|
||||
}
|
||||
case ElokaCircuitType::Tvc:
|
||||
{
|
||||
for (const TvcConfig &tvc : qAsConst(m_tvcConfigMap))
|
||||
for (const TvcConfig &tvc : std::as_const(m_tvcConfigMap))
|
||||
{
|
||||
if (!m_userProfile.contains(tvc.id(), ElokaCircuitType::Tvc))
|
||||
continue;
|
||||
@@ -500,7 +501,7 @@ void ElokaEditDialog::fillComboBoxCircuit(ElokaCircuitType type)
|
||||
}
|
||||
case ElokaCircuitType::Announcement:
|
||||
{
|
||||
for (const Stream &stream : qAsConst(m_announcementMap))
|
||||
for (const Stream &stream : std::as_const(m_announcementMap))
|
||||
{
|
||||
QString internalName = QString::fromStdString(stream.name());
|
||||
QString displayName = m_streamNameMapping->displayName(internalName);
|
||||
|
||||
+1
-1
@@ -33,7 +33,7 @@ QT5_WRAP_UI(mvs_gui_SRCS
|
||||
NGL_ADD_LIBRARY(WS MvsVideoTeamGuiPlugin MODULE ${mvs_gui_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(MvsVideoTeamGuiPlugin
|
||||
# LtsPrinting
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
LtsWidgets
|
||||
LtsDataView
|
||||
LtsPrinting
|
||||
|
||||
+1
-1
@@ -34,7 +34,7 @@ NGL_TARGET_LINK_LIBRARIES(avmTrainingVoiceGuiPlugin
|
||||
svcAvmCommon
|
||||
AvmShared
|
||||
svcExmClient
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
LtsWidgets
|
||||
LtsDataView
|
||||
LtsUtilsGuiDds
|
||||
|
||||
+2
-1
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "avm_edit_training_voice_communication_dialog.h"
|
||||
#include <utility>
|
||||
#include "ui_avm_edit_training_voice_communication_dialog.h"
|
||||
#include <AudioVideoManagement/avm_dtc.h>
|
||||
#include <AudioVideoManagement/av_helper.h>
|
||||
@@ -197,7 +198,7 @@ QVector<int> EditTrainingVoiceCommunicationDialog::exercisesToConsider() const
|
||||
allExercises.erase(newEnd, allExercises.end());
|
||||
|
||||
QVector<int> toBeConsidered;
|
||||
for (const auto &exercise : qAsConst(allExercises))
|
||||
for (const auto &exercise : std::as_const(allExercises))
|
||||
{
|
||||
if (::isActive(exercise.state()))
|
||||
toBeConsidered.append(exercise.id());
|
||||
|
||||
+2
-2
@@ -27,13 +27,13 @@ set(SRCS
|
||||
NGL_ADD_LIBRARY2(WS AvmShared SHARED ${SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(AvmShared
|
||||
PUBLIC
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
svcAvmCommon
|
||||
Boost::boost
|
||||
PRIVATE
|
||||
LtsMultiMonitor
|
||||
LtsUtilsSettings
|
||||
Qt5::Gui
|
||||
Qt6::Gui
|
||||
nglsettings
|
||||
ngltools
|
||||
)
|
||||
|
||||
@@ -14,7 +14,7 @@ NGL_ADD_LIBRARY(WS BatGuiPlugin MODULE ${bat_gui_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(BatGuiPlugin
|
||||
LtsSession
|
||||
BatGuiPluginInterface
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
LtsNotification
|
||||
)
|
||||
IF(WIN32)
|
||||
|
||||
+3
-2
@@ -1,4 +1,5 @@
|
||||
#include "buildingmanager.h"
|
||||
#include <utility>
|
||||
|
||||
#include "iconcomponent.h"
|
||||
#include "modelsplittercomponent.h"
|
||||
@@ -284,7 +285,7 @@ void BuildingManager::updateShotDuration(unsigned int newDuration_s)
|
||||
QMutexLocker locker(&m_mutexShots);
|
||||
|
||||
|
||||
for (Building *building : qAsConst(mBuildings))
|
||||
for (Building *building : std::as_const(mBuildings))
|
||||
{
|
||||
|
||||
for (Shot *pShot : building->mShots)
|
||||
@@ -2688,7 +2689,7 @@ void BuildingManager::createRoomNames(dtEntity::EntityId buildingid, Building& b
|
||||
const QPointF qpfCenter(posX.x(), posX.y());
|
||||
QPointF nearestVertex;
|
||||
qreal distance = 999999999;
|
||||
for (const QPointF &vertex : qAsConst(roomObb.mPoly))
|
||||
for (const QPointF &vertex : std::as_const(roomObb.mPoly))
|
||||
{
|
||||
|
||||
qreal dis = (vertex-qpfCenter).manhattanLength();
|
||||
|
||||
@@ -6,7 +6,13 @@
|
||||
# Created by Mike Wille, SLSE, 2017-08-17
|
||||
#
|
||||
|
||||
FIND_PACKAGE(BgViewer REQUIRED)
|
||||
FIND_PACKAGE(BgViewer)
|
||||
IF (BgViewer_FOUND)
|
||||
SET(BgViewer_FOUND TRUE)
|
||||
ELSE()
|
||||
MESSAGE(WARNING "BgViewer not found; skipping BuildingViewerCommon")
|
||||
RETURN()
|
||||
ENDIF()
|
||||
SET(_ver 3.4.1)
|
||||
IF (WIN32)
|
||||
SET(_ver 3.4.0)
|
||||
@@ -90,7 +96,7 @@ INSTALL_SHARED_FILES(BuildingViewerCommon_SRCS
|
||||
NGL_ADD_LIBRARY2(WS BuildingViewerCommon SHARED ${BuildingViewerCommon_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(BuildingViewerCommon
|
||||
PRIVATE
|
||||
Qt5::OpenGL
|
||||
Qt6::OpenGL
|
||||
${OPENGL_LIBRARIES}
|
||||
${BGVIEWER_DTENTITYOSG_LIBRARY}
|
||||
${BGVIEWER_DTENTITY_LIBRARY}
|
||||
@@ -131,9 +137,9 @@ NGL_TARGET_LINK_LIBRARIES(BuildingViewerCommon
|
||||
ngltools
|
||||
LtsPluginManager
|
||||
PUBLIC
|
||||
Qt5::Core
|
||||
Qt5::Gui
|
||||
Qt5::Widgets
|
||||
Qt6::Core
|
||||
Qt6::Gui
|
||||
Qt6::Widgets
|
||||
AsbDataPluginInterface
|
||||
AvmDataPluginInterface
|
||||
BldDataPluginInterface
|
||||
|
||||
+2
-1
@@ -1,6 +1,7 @@
|
||||
|
||||
|
||||
#include "bdv_communication_interface_internal.h"
|
||||
#include <utility>
|
||||
#include <QTimer>
|
||||
#include <cassert>
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
@@ -446,7 +447,7 @@ void CommunicationInterfaceInternal::extHideMountingPointAsset(const QString &st
|
||||
|
||||
void CommunicationInterfaceInternal::clearCameras()
|
||||
{
|
||||
for (const DeviceInfo &di : qAsConst(m_deviceMap))
|
||||
for (const DeviceInfo &di : std::as_const(m_deviceMap))
|
||||
{
|
||||
if (!di.deviceName.startsWith(QLatin1String("Camera")))
|
||||
continue;
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "bdv_controller.h"
|
||||
#include <utility>
|
||||
#include "bdv_dds_controller.h"
|
||||
#include "bdv_bgviewer_widget_container.h"
|
||||
|
||||
@@ -170,7 +171,7 @@ QString BgViewerController::buildingModelPath()
|
||||
directoriesToSearch += QStringLiteral("/opt");
|
||||
#endif
|
||||
|
||||
for (const QString &d : qAsConst(directoriesToSearch))
|
||||
for (const QString &d : std::as_const(directoriesToSearch))
|
||||
{
|
||||
const QDir dir(d + QStringLiteral("/BuildingModels/StaticMeshes/"));
|
||||
if (dir.exists() && dir.isReadable())
|
||||
|
||||
+4
-3
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "bdv_dds_controller.h"
|
||||
#include <utility>
|
||||
|
||||
#include <Plugins/InfrastructureManagement/Shared/ism_mounting_point.h>
|
||||
#include <InfrastructureManagement/ism_dtc.h>
|
||||
@@ -477,7 +478,7 @@ bool BuildingViewerDdsController::writeBuildingDataToXML(const QString &modelPat
|
||||
sw.writeStartElement(QStringLiteral("Tag"));
|
||||
sw.writeStartElement(QStringLiteral("Group"));
|
||||
|
||||
for (const InfrastructureManagement::MainStructureElement &mse : qAsConst(mseMap))
|
||||
for (const InfrastructureManagement::MainStructureElement &mse : std::as_const(mseMap))
|
||||
{
|
||||
m_knownBuildings += mse.id();
|
||||
|
||||
@@ -532,7 +533,7 @@ void BuildingViewerDdsController::clearAssets()
|
||||
{
|
||||
INFO_LOG(m_logger) << "clearAssets: Removing " << m_knownAssetsInBgViewer.size() << " assets";
|
||||
|
||||
for (const auto &strUniqueAsset : qAsConst(m_knownAssetsInBgViewer))
|
||||
for (const auto &strUniqueAsset : std::as_const(m_knownAssetsInBgViewer))
|
||||
m_connection->extHideMountingPointAsset(strUniqueAsset);
|
||||
|
||||
m_mountingPointId2AssetType.clear();
|
||||
@@ -691,7 +692,7 @@ void BuildingViewerDdsController::setCurrentTrainingAreaMap(const QString &model
|
||||
directoriesToSearch += QStringLiteral("/opt");
|
||||
#endif
|
||||
|
||||
for (const QString &d : qAsConst(directoriesToSearch))
|
||||
for (const QString &d : std::as_const(directoriesToSearch))
|
||||
{
|
||||
const QDir dir(d + QStringLiteral("/BuildingModels/StaticMeshes/"));
|
||||
if (dir.exists() && dir.isReadable())
|
||||
|
||||
+2
-1
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "bdv_edit_model.h"
|
||||
#include <utility>
|
||||
#include <Common/logger.h>
|
||||
#include <Services/InfrastructureManagement/ism.hpp>
|
||||
#include <QtCore/QDebug>
|
||||
@@ -250,7 +251,7 @@ bool BuildingEditModel::init(int32_t mseId)
|
||||
|
||||
QModelIndex BuildingEditModel::modelIndexByMountingPointId(int mountingPointId) const
|
||||
{
|
||||
for(const QPersistentModelIndex &mi : qAsConst(m_mapModelIndices))
|
||||
for(const QPersistentModelIndex &mi : std::as_const(m_mapModelIndices))
|
||||
{
|
||||
if (privateData(mi)->data().value<TreeItem>().mountingPointId() == mountingPointId)
|
||||
return mi;
|
||||
|
||||
+3
-3
@@ -68,9 +68,9 @@ NGL_TARGET_LINK_LIBRARIES(BdvViewerGuiPlugin
|
||||
LtsWidgets
|
||||
NGLLogger
|
||||
nglwidgets
|
||||
Qt5::Core
|
||||
Qt5::Widgets
|
||||
Qt5::Xml
|
||||
Qt6::Core
|
||||
Qt6::Widgets
|
||||
Qt6::Xml
|
||||
TopicEditorBase
|
||||
LtsUtilsGuiDds
|
||||
LtsUtilsSettings
|
||||
|
||||
+2
-1
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "bdv_thread_video_exporter.h"
|
||||
#include <utility>
|
||||
#include "bdv_replay_handler.h"
|
||||
|
||||
#include <QElapsedTimer>
|
||||
@@ -28,7 +29,7 @@ void VideoExporter::sendAliveSignals()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "sendAliveSignals() called";
|
||||
|
||||
for (auto &e : qAsConst(m_vecVideosToExport))
|
||||
for (auto &e : std::as_const(m_vecVideosToExport))
|
||||
emit e.m_pExportNotifier->stillAlive();
|
||||
|
||||
DEBUG_LOG(m_logger) << "\tSignals emitted, mutex unlocked";
|
||||
|
||||
+4
-3
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "bdv_topic_replay_interface.h"
|
||||
#include <utility>
|
||||
#include "bdv_viewer_gui_plugin.h"
|
||||
#include "bdv_thread_video_exporter.h"
|
||||
#include "bdv_replay_handler.h"
|
||||
@@ -123,7 +124,7 @@ bool TopicReplayInterface::exportTopic(const QJsonObject &attributes,
|
||||
(m_startTimeSec + m_durationSec) * 1000);
|
||||
|
||||
QJsonArray arr;
|
||||
for (const SituationReplayTime &rt : qAsConst(m_sitReplayTimes))
|
||||
for (const SituationReplayTime &rt : std::as_const(m_sitReplayTimes))
|
||||
{
|
||||
if (m_startTimeSec > rt.topicEnd_s)
|
||||
continue;
|
||||
@@ -184,7 +185,7 @@ bool TopicReplayInterface::exportTopic(const QJsonObject &attributes,
|
||||
|
||||
QVector<QSharedPointer<ReplayHandler>> vecReplayHandler;
|
||||
vecReplayHandler.reserve(m_sitReplayTimes.size());
|
||||
for (const SituationReplayTime &srt : qAsConst(m_sitReplayTimes))
|
||||
for (const SituationReplayTime &srt : std::as_const(m_sitReplayTimes))
|
||||
vecReplayHandler.push_back(QSharedPointer<ReplayHandler>(new ReplayHandler(m_startTimeSec, m_startTimeSec + m_durationSec, srt)));
|
||||
|
||||
VideoInformation info(pExportNotifier, folderPath, attributes, vecReplayHandler, record_duration_s);
|
||||
@@ -280,7 +281,7 @@ bool TopicReplayInterface::exportBuildings(const QVector<int> &buildingIds) cons
|
||||
});
|
||||
knownBuildings.erase(std::unique(knownBuildings.begin(), knownBuildings.end()), knownBuildings.end());
|
||||
QJsonArray arrOut;
|
||||
for (const auto &b : qAsConst(knownBuildings))
|
||||
for (const auto &b : std::as_const(knownBuildings))
|
||||
arrOut += b.toJson();
|
||||
|
||||
f.resize(0);
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#
|
||||
NGL_ADD_LIBRARY(WS BldDataPlugin MODULE bld_data_plugin.cpp bld_data_plugin.h)
|
||||
NGL_TARGET_LINK_LIBRARIES(BldDataPlugin
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
BldDataPluginInterface
|
||||
svcBldClient
|
||||
NGLLogger
|
||||
|
||||
+3
-3
@@ -47,7 +47,7 @@ NGL_WRAP_UI(bld_info_gui_SRCS
|
||||
|
||||
NGL_ADD_LIBRARY(WS BldInfoGuiPlugin MODULE ${bld_info_gui_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(BldInfoGuiPlugin
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
BldInfoGuiPluginInterface
|
||||
BuildingViewerCommon
|
||||
NGLLogger
|
||||
@@ -56,8 +56,8 @@ NGL_TARGET_LINK_LIBRARIES(BldInfoGuiPlugin
|
||||
svcBldClient
|
||||
svcAsmClient
|
||||
svcBldCommon
|
||||
Qt5::Widgets
|
||||
Qt5::Network
|
||||
Qt6::Widgets
|
||||
Qt6::Network
|
||||
LtsWidgets
|
||||
LtsSession
|
||||
LtsUtilsSettings
|
||||
|
||||
+7
-6
@@ -4,6 +4,7 @@
|
||||
|
||||
|
||||
#include "bld_info_dialog.h"
|
||||
#include <utility>
|
||||
#include "ui_bld_info_dialog.h"
|
||||
#include "bld_history_dialog.h"
|
||||
#include "egcu_info_dialog.h"
|
||||
@@ -228,10 +229,10 @@ bool BldInfoDialog::init(LtsSession::LtsSession *session)
|
||||
{
|
||||
const QVector<InfrastructureManagement::InstrumentationAsset> &instrumentationAssets = assetsMapBuilding[m_mseId];
|
||||
const QMap<qint32, InfrastructureManagement::MountingPointAsset> &mountingPointAssets = m_ismDtc->mountingPointAssets();
|
||||
for (const auto &instrumentationAsset : qAsConst(instrumentationAssets))
|
||||
for (const auto &instrumentationAsset : std::as_const(instrumentationAssets))
|
||||
{
|
||||
InfrastructureManagement::MountingPointAsset mpa;
|
||||
for (const auto &mpax : qAsConst(mountingPointAssets))
|
||||
for (const auto &mpax : std::as_const(mountingPointAssets))
|
||||
{
|
||||
if (mpax.assetId() == instrumentationAsset.id())
|
||||
{
|
||||
@@ -366,7 +367,7 @@ bool BldInfoDialog::init(LtsSession::LtsSession *session)
|
||||
|
||||
const QMap<qint32, ParticipantManagement::ParticipantPosition> &participantPosition =
|
||||
m_ppmDtc->participantPositions();
|
||||
for (const ParticipantPosition &pp : qAsConst(participantPosition))
|
||||
for (const ParticipantPosition &pp : std::as_const(participantPosition))
|
||||
addParticipantPosition(pp, DataModification::eAdded);
|
||||
updateFloorParticipantTable();
|
||||
#endif
|
||||
@@ -658,7 +659,7 @@ void BldInfoDialog::updateFloorParticipantTable()
|
||||
|
||||
|
||||
QMap<int , QMap<int , int >> floorPartyPeople;
|
||||
for (const int floor : qAsConst(floors))
|
||||
for (const int floor : std::as_const(floors))
|
||||
{
|
||||
QMapIterator<int , QPair<int , int > > it(m_rawParticipantCount);
|
||||
while (it.hasNext())
|
||||
@@ -1056,7 +1057,7 @@ void BldInfoDialog::onMountingPointAssetChanged(const InfrastructureManagement::
|
||||
else if (modType == DataModification::eRemoved)
|
||||
{
|
||||
const QList<QPushButton *> &list = m_ui->gbSegments->findChildren<QPushButton *>();
|
||||
for (QPushButton *pb : qAsConst(list))
|
||||
for (QPushButton *pb : std::as_const(list))
|
||||
{
|
||||
if (pb->property("assetId").toInt() == data.assetId())
|
||||
{
|
||||
@@ -1074,7 +1075,7 @@ void BldInfoDialog::onMountingPointAssetChanged(const InfrastructureManagement::
|
||||
else if (modType == DataModification::eModified)
|
||||
{
|
||||
const QList<QPushButton *> &list = m_ui->gbSegments->findChildren<QPushButton *>();
|
||||
for (QPushButton *pb : qAsConst(list))
|
||||
for (QPushButton *pb : std::as_const(list))
|
||||
{
|
||||
if (pb->property("assetId").toInt() == data.assetId())
|
||||
pb->setText(data.name().empty() ? pb->property("assetName").toString() : QString::fromStdString(data.name()));
|
||||
|
||||
+2
-1
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "egcu_info_dialog.h"
|
||||
#include <utility>
|
||||
#include "ui_egcu_info_dialog.h"
|
||||
#include "relay_info.h"
|
||||
|
||||
@@ -368,7 +369,7 @@ void EgcuInfoDialog::showEgcuInfos(const InfrastructureManagement::StructureElem
|
||||
if (m_relayInfoWidgets.contains(relayId))
|
||||
m_relayInfoWidgets[relayId]->setEffectOverride(static_cast<InfrastructureManagement::EffectOverride::inner_enum>(value));
|
||||
}
|
||||
for (auto relayId : qAsConst(allRelayIds))
|
||||
for (auto relayId : std::as_const(allRelayIds))
|
||||
m_relayInfoWidgets[relayId]->setEffectOverride(InfrastructureManagement::EffectOverride_def::Automatic);
|
||||
}
|
||||
|
||||
|
||||
@@ -36,8 +36,11 @@ ADD_SUBDIRECTORY(OcBaseDownload)
|
||||
ADD_SUBDIRECTORY(OcSituationClient)
|
||||
ADD_SUBDIRECTORY(OnlineReports)
|
||||
ADD_SUBDIRECTORY(OperatorManagement)
|
||||
ADD_SUBDIRECTORY(ParticipantManagement) # uses nglwidgets => NGLTreeModel
|
||||
ADD_SUBDIRECTORY(PlanEditor)
|
||||
ADD_SUBDIRECTORY(ParticipantManagement) # includes ParticipantOrgChart (conditionally built)
|
||||
# PlanEditor requires WebEngine + ArcGIS - skip for Qt6 migration baseline
|
||||
IF(BUILD_PLUGINS_PLANEDITOR)
|
||||
ADD_SUBDIRECTORY(PlanEditor)
|
||||
ENDIF()
|
||||
ADD_SUBDIRECTORY(PlanOverlays)
|
||||
ADD_SUBDIRECTORY(PresentationManagement)
|
||||
ADD_SUBDIRECTORY(ProjectDataManagement)
|
||||
@@ -46,7 +49,10 @@ ADD_SUBDIRECTORY(ReportManagement)
|
||||
ADD_SUBDIRECTORY(SAAs)
|
||||
ADD_SUBDIRECTORY(ScreenRecording)
|
||||
ADD_SUBDIRECTORY(ServiceManagement)
|
||||
ADD_SUBDIRECTORY(ServiceMonitor)
|
||||
# ServiceMonitor requires WebEngine - skip for Qt6 migration baseline
|
||||
IF(BUILD_PLUGINS_SERVICEMONITOR)
|
||||
ADD_SUBDIRECTORY(ServiceMonitor)
|
||||
ENDIF()
|
||||
ADD_SUBDIRECTORY(SituationMapPlugin)
|
||||
ADD_SUBDIRECTORY(SituationReplay)
|
||||
ADD_SUBDIRECTORY(SituationReplayManagement)
|
||||
@@ -64,4 +70,7 @@ ADD_SUBDIRECTORY(VirtualKeyboard)
|
||||
IF(GUEZ_MODE)
|
||||
ADD_SUBDIRECTORY(WarehouseManagement)
|
||||
ENDIF()
|
||||
ADD_SUBDIRECTORY(OnlineHelp)
|
||||
# OnlineHelp requires WebEngine - skip for Qt6 migration baseline
|
||||
IF(BUILD_PLUGINS_ONLINEHELP)
|
||||
ADD_SUBDIRECTORY(OnlineHelp)
|
||||
ENDIF()
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#
|
||||
NGL_ADD_LIBRARY(WS CesDataPlugin MODULE ces_data_plugin.cpp ces_data_plugin.h)
|
||||
NGL_TARGET_LINK_LIBRARIES(CesDataPlugin
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
CesDataPluginInterface
|
||||
svcCesClient
|
||||
NGLLogger
|
||||
|
||||
+1
-1
@@ -34,7 +34,7 @@ NGL_TARGET_LINK_LIBRARIES(CesParticipantMoveGuiPlugin
|
||||
GuiPluginInterface
|
||||
AsmGuiPluginInterface
|
||||
ExmDataPluginInterface
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
PpmCommon
|
||||
FlmDataPluginInterface
|
||||
LtsUtilsGuiDds
|
||||
|
||||
+2
-1
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "participants_move_dialog.h"
|
||||
#include <utility>
|
||||
#include "participants_move_model.h"
|
||||
#include "ui_participants_move_dialog.h"
|
||||
#include <LtsWidgets/lts_column_filter_proxy_model.h>
|
||||
@@ -505,7 +506,7 @@ bool ParticipantsMoveDialog::isParticipantInUseForExplosionCluster(int id)
|
||||
}
|
||||
|
||||
const QMap<qint32, AreaEffectSimulation::ExplosionCluster> &ecMap = m_aesDtc->explosionClusters();
|
||||
for(const AreaEffectSimulation::ExplosionCluster &aes : qAsConst(ecMap))
|
||||
for(const AreaEffectSimulation::ExplosionCluster &aes : std::as_const(ecMap))
|
||||
{
|
||||
if (aes.participantId() == id &&
|
||||
(aes.effectStateId() == AreaEffectSimulation::AesEffectState::EsPrepared ||
|
||||
|
||||
+1
-1
@@ -47,7 +47,7 @@ NGL_TARGET_LINK_LIBRARIES(CesParticipantUASGuiPlugin
|
||||
GuiPluginInterface
|
||||
AsmGuiPluginInterface
|
||||
ExmDataPluginInterface
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
PpmCommon
|
||||
FlmDataPluginInterface
|
||||
LtsUtilsGuiDds
|
||||
|
||||
+3
-2
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include <LtsWidgets/lts_message_dialog.h>
|
||||
#include <utility>
|
||||
#include <Common/LtsCoordTrans/lts_coord_widget.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <ParticipantManagement/ppm_data_plugin_interface.h>
|
||||
@@ -581,7 +582,7 @@ void MissionPlanEdit::setUASCharges()
|
||||
const auto chargesForGearClass = m_pdmDtc->chargeTypes();
|
||||
m_ui->chargesCBox->clear();
|
||||
m_ui->chargesCBox->insertItem(m_ui->chargesCBox->count(), tr("Undefined"));
|
||||
for (const ProjectDataManagement::ChargeType &chargeType : qAsConst(chargesForGearClass))
|
||||
for (const ProjectDataManagement::ChargeType &chargeType : std::as_const(chargesForGearClass))
|
||||
{
|
||||
|
||||
if (!m_pdmDtc->isUasDroppable(chargeType.id(),0,0))
|
||||
@@ -620,7 +621,7 @@ void MissionPlanEdit::setData(int mpId)
|
||||
m_ui->participantCBox->setCurrentIndex(ppIdx);
|
||||
}
|
||||
|
||||
for (const auto &item : qAsConst(m_missionPlan.items()) )
|
||||
for (const auto &item : std::as_const(m_missionPlan.items()) )
|
||||
{
|
||||
const std::vector<ParticipantManagement::MissionAction> &msaVec = item.actions();
|
||||
WayPointParam wpp;
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#
|
||||
NGL_ADD_LIBRARY2(WS CodDataPlugin MODULE cod_data_plugin.cpp cod_data_plugin.h)
|
||||
NGL_TARGET_LINK_LIBRARIES(CodDataPlugin
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
CodDataPluginInterface
|
||||
svcCodClient
|
||||
NGLLogger
|
||||
|
||||
+1
-1
@@ -54,7 +54,7 @@ NGL_TARGET_LINK_LIBRARIES(CodCodificationDataGuiPlugin
|
||||
CodGuiPluginInterface
|
||||
CodDataPluginInterface
|
||||
PpmDataPluginInterface
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
KDReports::KDReports
|
||||
LtsWidgets
|
||||
LtsDataView
|
||||
|
||||
+3
-2
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "cod_assign_codification_data_table.h"
|
||||
#include <utility>
|
||||
#include "cod_codification_data_overview_model.h"
|
||||
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
@@ -66,7 +67,7 @@ bool AssignCodificationDataTable::init(const std::shared_ptr<CodificationManagem
|
||||
m_ppmDtc->visibleParties(userVisibleParties, LtsSessionData::LtsSessionData::getInstance()->getVisibleParties(m_session->exerciseId()));
|
||||
DEBUG_LOG(m_logger) << "Number of parties visible to the user in the exercise: " << userVisibleParties.size();
|
||||
|
||||
for (const ParticipantManagement::Party &party : qAsConst(userVisibleParties))
|
||||
for (const ParticipantManagement::Party &party : std::as_const(userVisibleParties))
|
||||
{
|
||||
|
||||
if (party.id() != 2 && party.id() != 3)
|
||||
@@ -133,7 +134,7 @@ bool AssignCodificationDataTable::apply()
|
||||
removeAllAssignments();
|
||||
|
||||
bool bStartRequests = false;
|
||||
for (LtsWidgets::LtsComboBox *cb : qAsConst(m_tableVec))
|
||||
for (LtsWidgets::LtsComboBox *cb : std::as_const(m_tableVec))
|
||||
{
|
||||
int partyId = cb->property("partyId").toInt();
|
||||
int tableId = cb->currentData().toInt();
|
||||
|
||||
+2
-1
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "cod_csv_import.h"
|
||||
#include <utility>
|
||||
#include "cod_numeral_code_model.h"
|
||||
#include "cod_authentication_code_model.h"
|
||||
#include "cod_logistical_terms_model.h"
|
||||
@@ -550,7 +551,7 @@ bool CSVImport::removeRedundantCvsSeperators(QByteArray &qbaLine, int desiredVal
|
||||
int seperatorCnt = 0;
|
||||
|
||||
|
||||
for (const char c : qAsConst(qbaLine))
|
||||
for (const char c : std::as_const(qbaLine))
|
||||
{
|
||||
if (c == ';')
|
||||
++seperatorCnt;
|
||||
|
||||
+2
-2
@@ -16,8 +16,8 @@ NGL_WRAP_UI(lt_SRCS ui/maindialog.ui)
|
||||
NGL_ADD_EXECUTABLE(WS CODTest ${lt_SRCS})
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(CODTest
|
||||
Qt5::Widgets
|
||||
Qt5::Core
|
||||
Qt6::Widgets
|
||||
Qt6::Core
|
||||
nglapplication
|
||||
NGLLogger
|
||||
)
|
||||
|
||||
+1
-1
@@ -46,7 +46,7 @@ NGL_TARGET_LINK_LIBRARIES(CdsSimulationGuiPlugin
|
||||
ngltools
|
||||
PdmDataPluginInterface
|
||||
PpmDataPluginInterface
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
situationMap
|
||||
situationMapGeometryModel
|
||||
SituationMapGuiPluginInterface
|
||||
|
||||
+2
-1
@@ -2,6 +2,7 @@
|
||||
|
||||
|
||||
#include "cds_calculations.h"
|
||||
#include <utility>
|
||||
|
||||
#include <InfrastructureManagement/ism_dtc.h>
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
@@ -79,7 +80,7 @@ QPolygonF getBuildingFootprint(int buildingId, const std::shared_ptr<Infrastruct
|
||||
|
||||
footprint.reserve(relPositions.size());
|
||||
|
||||
for (const auto &relPosition : qAsConst(relPositions))
|
||||
for (const auto &relPosition : std::as_const(relPositions))
|
||||
{
|
||||
const QPointF relPositionRotate = SituationMap::MathUtils::rotate(relPosition, center, angleRad);
|
||||
const QPointF geoPositionRotate = referencePointUTM.geographic(relPositionRotate);
|
||||
|
||||
Loaded 100 of 2395 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user