lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds immediate migration results in progress

Browse Source
This commit is contained in:
torsten committed 2026-08-19 11:18:24 +02:00
1 parent 8453e104c5
commit 3bb6e89496
2102 files changed
+17482 -15071
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_model.cpp
+5 -5
View File
@@ -99,14 +99,14 @@ MapObjectModel::MapObjectModel(QObject *parent)
},
parent)
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
}
MapObjectModel::~MapObjectModel()
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
}
void MapObjectModel::initModel(Map *map)
@@ -441,7 +441,7 @@ UniqueMapId MapObjectModel::uniqueMapIdOfIndex(const QModelIndex &index) const
void MapObjectModel::onDataChanged(UniqueMapId uniqueMapId)
{
TRACE_LOG() << Q_FUNC_INFO << " START, uniqueMapId=" << uniqueMapId;
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, uniqueMapId=" << uniqueMapId;
int row = findRowForUniqueMapId(uniqueMapId);
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_model.h
+2
View File
@@ -168,9 +168,11 @@ public:
void setSourceModel(QAbstractItemModel *sourceModel) override;
protected:
NGL::INGLLogger &m_logger;
bool lessThan(const QModelIndex &source_left, const QModelIndex &source_right) const override;
protected:
NGL::INGLLogger &m_logger;
MapObjectModel *m_sourceModel = nullptr;
};
qt6-after/qt6-migrated-legatus/Lts/Plugins/SituationMapPlugin/Gui/SituationMap/MapObjectSelection/map_object_selection_widget.cpp
+23 -24
View File
@@ -306,40 +306,39 @@ void MapObjectSelectionLtsDialog::onServiceMonitorRequestedAdd()
MapObjectSelectionWidget::MapObjectSelectionWidget(QWidget *parent)
: BaseClass(parent)
, m_ui(new Ui::MapObjectSelectionDialog)
{
TRACE_LOG() << Q_FUNC_INFO << " START";
MapObjectSelectionWidget::MapObjectSelectionWidget(QWidget *parent) : BaseClass(parent)
, m_ui(new Ui::MapObjectSelectionDialog),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
m_ui->setupUi(this);
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
}
MapObjectSelectionWidget::~MapObjectSelectionWidget()
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
clearSelectionOfMapObjects(true);
delete m_ui;
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
}
bool MapObjectSelectionWidget::init(Map *map, AdapterDds *adapterDds)
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
if (!map)
{
ERROR_LOG() << Q_FUNC_INFO << " no map";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " no map";
return false;
}
if (!adapterDds)
{
ERROR_LOG() << Q_FUNC_INFO << " no adapterDds";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " no adapterDds";
return false;
}
@@ -351,7 +350,7 @@ bool MapObjectSelectionWidget::init(Map *map, AdapterDds *adapterDds)
connect(&m_map->partyIdToColorFunctor(), &PartyIdToColorFunctor::partyChanged,
this, &MapObjectSelectionWidget::onPartyIdsChanged, Qt::UniqueConnection);
TRACE_LOG() << Q_FUNC_INFO << " END";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END";
return true;
}
@@ -417,11 +416,11 @@ void MapObjectSelectionWidget::setMapObjectsToDisplay(const Map::RefPointerMapOb
void MapObjectSelectionWidget::setMapObjectsToDisplay(const QVector<UniqueMapId> &uniqueMapIds)
{
TRACE_LOG() << Q_FUNC_INFO << " START, uniqueMapIds.size()=" << uniqueMapIds.size();
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, uniqueMapIds.size()=" << uniqueMapIds.size();
if (m_map.isNull())
{
ERROR_LOG() << Q_FUNC_INFO << " no map";
ERROR_LOG(m_logger) << Q_FUNC_INFO << " no map";
return;
}
@@ -481,7 +480,7 @@ void MapObjectSelectionWidget::setMapObjectsToDisplay(const QVector<UniqueMapId>
if (m_adapterDds->unifiedMapObjectData(uniqueMapId, umodOut))
mapObjectDataVec.append(dataFromUnified(uniqueMapId, umodOut));
else
ERROR_LOG() << Q_FUNC_INFO << " unifiedMapObjectData failed, uniqueMapId=" << uniqueMapId;
ERROR_LOG(m_logger) << Q_FUNC_INFO << " unifiedMapObjectData failed, uniqueMapId=" << uniqueMapId;
}
@@ -491,7 +490,7 @@ void MapObjectSelectionWidget::setMapObjectsToDisplay(const QVector<UniqueMapId>
m_ui->ltsDataView->setSortIndicator(MapObjectModel::Columns::EQUIPMENT_NUMBER, Qt::AscendingOrder);
m_ui->ltsDataView->setSortIndicator(MapObjectModel::Columns::PARTY, Qt::AscendingOrder);
TRACE_LOG() << Q_FUNC_INFO << " END, uniqueMapIds.size()=" << uniqueMapIds.size();
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, uniqueMapIds.size()=" << uniqueMapIds.size();
}
@@ -563,7 +562,7 @@ QVector<int> MapObjectSelectionWidget::visibleBuildingIds() const
bool MapObjectSelectionWidget::addMapObject(const UniqueMapId &uniqueMapId)
{
TRACE_LOG() << Q_FUNC_INFO << " START, uniqueMapId=" << uniqueMapId;
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, uniqueMapId=" << uniqueMapId;
if (m_map.isNull() || m_adapterDds.isNull() || m_mapObjectModel.isNull())
return false;
@@ -575,13 +574,13 @@ bool MapObjectSelectionWidget::addMapObject(const UniqueMapId &uniqueMapId)
if (m_adapterDds->unifiedMapObjectData(uniqueMapId, umodOut))
return m_mapObjectModel->addMapObjectData(dataFromUnified(uniqueMapId, umodOut));
TRACE_LOG() << Q_FUNC_INFO << " END, uniqueMapId=" << uniqueMapId;
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, uniqueMapId=" << uniqueMapId;
return false;
}
bool MapObjectSelectionWidget::updateMapObject(const UniqueMapId &uniqueMapId)
{
TRACE_LOG() << Q_FUNC_INFO << " START, uniqueMapId=" << uniqueMapId;
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, uniqueMapId=" << uniqueMapId;
if (m_map.isNull() || m_adapterDds.isNull() || !m_mapObjectModel)
return false;
@@ -593,20 +592,20 @@ bool MapObjectSelectionWidget::updateMapObject(const UniqueMapId &uniqueMapId)
if (m_adapterDds->unifiedMapObjectData(uniqueMapId, umodOut))
return m_mapObjectModel->updateMapObjectData(dataFromUnified(uniqueMapId, umodOut));
ERROR_LOG() << Q_FUNC_INFO << " unifiedMapObjectData failed, uniqueMapId=" << uniqueMapId;
TRACE_LOG() << Q_FUNC_INFO << " END, uniqueMapId=" << uniqueMapId;
ERROR_LOG(m_logger) << Q_FUNC_INFO << " unifiedMapObjectData failed, uniqueMapId=" << uniqueMapId;
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, uniqueMapId=" << uniqueMapId;
return false;
}
void MapObjectSelectionWidget::onMapObjectRemoved(UniqueMapId uniqueMapId)
{
TRACE_LOG() << Q_FUNC_INFO << " START, uniqueMapId=" << uniqueMapId;
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START, uniqueMapId=" << uniqueMapId;
if (!m_mapObjectModel)
return;
m_mapObjectModel->remove(uniqueMapId);
TRACE_LOG() << Q_FUNC_INFO << " END, uniqueMapId=" << uniqueMapId;
TRACE_LOG(m_logger) << Q_FUNC_INFO << " END, uniqueMapId=" << uniqueMapId;
}
void MapObjectSelectionWidget::onPartyIdsChanged()
@@ -647,7 +646,7 @@ void MapObjectSelectionWidget::onMapObjectClicked(UniqueMapId uniqueMapId)
void MapObjectSelectionWidget::onMapObjectEntered(const QModelIndex &index)
{
TRACE_LOG() << Q_FUNC_INFO << " START";
TRACE_LOG(m_logger) << Q_FUNC_INFO << " START";
if (!m_mapObjectModel)
return;