Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen
- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung - 44 Export-Header Include-Pfade korrigiert (_export.h) - 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h) - INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros - Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits) - FATAL_LOG Makro hinzugefügt - InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h) - FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h) - AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp) - SymbolAppearance Klasse vollständig definiert mit content() Methode - BuildingComponentFilter Klasse definiert mit Copy-Konstruktor - Ftc Factory: nullptr Return (abstract class) - AesFilter Klasse in aes.hpp hinzugefügt - Dtc Klasse in ppm.hpp mit participantChanged Signal - AesType Enum: alle 15 At* Werte definiert - AesEffectState_def: EsReceived hinzugefügt - DataModification Enum: eAdded/eModified/eRemoved - function_reply_object.h → core_types.h Include-Pfad (72 Dateien) - Enum-Class-Streaming Template-Operator in INGLLogger.h - ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen - ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge - QRegExp → QRegularExpression in tpm_js_parser.cpp - .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert - Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
2785 files changed
+18754
-18316
No files matched your search
+3
-4
@@ -20,7 +20,6 @@ BuildingEdit::BuildingEdit(QWidget *parent)
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::OkApplyCancel)
|
||||
, m_requestHelper(new LtsUtils::RequestHelper(this))
|
||||
, m_ui(new Ui::BuildingEdit)
|
||||
, m_logger(getLogger("BuildingViewer::BuildingEdit"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
@@ -176,7 +175,7 @@ bool BuildingEdit::apply()
|
||||
|
||||
|
||||
|
||||
DEBUG_LOG(m_logger) << "fortifyFactors.size()=" << fortifyFactors.size();
|
||||
DEBUG_LOG() << "fortifyFactors.size()=" << fortifyFactors.size();
|
||||
if (fortifyFactors.size())
|
||||
{
|
||||
m_requestHelper->addRequest([this, fortifyFactors]()
|
||||
@@ -188,7 +187,7 @@ bool BuildingEdit::apply()
|
||||
fortifyRequest.fortifyFactors().reserve(fortifyFactors.size());
|
||||
for (const auto &e : fortifyFactors)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "push_back= databaseId=" << e.structureElementId()
|
||||
DEBUG_LOG() << "push_back= databaseId=" << e.structureElementId()
|
||||
<< " fortifyFactor=" << e.fortifyFactor();
|
||||
fortifyRequest.fortifyFactors().push_back(Buildings::FortifyFactor(e.structureElementId(), e.fortifyFactor()));
|
||||
}
|
||||
@@ -306,7 +305,7 @@ bool BuildingEdit::sendBuildingStateRequest(ProjectDataManagement::Vulnerability
|
||||
requestData.buildings(buildings);
|
||||
requestData.vulnerabilityState(state);
|
||||
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION << "currentData: " << state;
|
||||
DEBUG_LOG() << Q_FUNC_INFO << "currentData: " << state;
|
||||
|
||||
return m_bldFtc->setBuildingStatesRequest(requestData, this);
|
||||
});
|
||||
|
||||
-1
@@ -81,7 +81,6 @@ private:
|
||||
QString m_buildingName;
|
||||
int32_t m_buildingDatabaseId = 0;
|
||||
int32_t m_buildingId = 0;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
}
|
||||
+8
-9
@@ -27,7 +27,6 @@ BuildingEditModel::BuildingEditModel(QObject *parent,
|
||||
, m_ismDtc(ismDtc)
|
||||
, m_bldDtc(bldDtc)
|
||||
, m_buildingName(QString())
|
||||
, m_logger(getLogger("BuildingViewer::BuildingEdit"))
|
||||
{}
|
||||
|
||||
QVariant BuildingEditModel::data(const QModelIndex &index, int role) const
|
||||
@@ -77,7 +76,7 @@ QVariant BuildingEditModel::data(const QModelIndex &index, int role) const
|
||||
|
||||
bool BuildingEditModel::slotUpdateRow(const BuildingViewer::TreeItem &room, const bool fortifyChanged)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "slotUpdateRow isBuilding=" << room.isBuilding()
|
||||
DEBUG_LOG() << "slotUpdateRow isBuilding=" << room.isBuilding()
|
||||
<< " isFloor" << room.isFloor()
|
||||
<< " isRoom" << room.isRoom();
|
||||
|
||||
@@ -123,7 +122,7 @@ bool BuildingEditModel::onInsertRow(int &row, const QModelIndex &parent, const B
|
||||
|
||||
bool BuildingEditModel::init(int32_t mseId)
|
||||
{
|
||||
INFO_LOG(m_logger) << "init mseId=" << mseId;
|
||||
INFO_LOG() << "init mseId=" << mseId;
|
||||
NGLTreeModel::resetModel();
|
||||
m_mapRoomsWithChangedFortifyFactor.clear();
|
||||
|
||||
@@ -142,7 +141,7 @@ bool BuildingEditModel::init(int32_t mseId)
|
||||
const std::vector<InfrastructureManagement::StructureElement> &vecElements = building.elements();
|
||||
for (const auto &se : vecElements)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "se: " << se;
|
||||
DEBUG_LOG() << "se: " << se;
|
||||
if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType::Building)
|
||||
{
|
||||
BuildingViewer::TreeItem rootItemBuilding(se);
|
||||
@@ -164,7 +163,7 @@ bool BuildingEditModel::init(int32_t mseId)
|
||||
|
||||
for (const auto &se : vecElements)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "se: =" << se;
|
||||
DEBUG_LOG() << "se: =" << se;
|
||||
if (se.structureElementTypeId() == InfrastructureManagement::StructureElementType_def::Floor)
|
||||
{
|
||||
BuildingViewer::TreeItem itemRoom(se);
|
||||
@@ -209,7 +208,7 @@ bool BuildingEditModel::init(int32_t mseId)
|
||||
}
|
||||
catch (const std::out_of_range &e)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Caught exception while trying to get superior id for building " << rootName << " with room with mounting point id: " << se.mountingPointId() << ": " << e.what();
|
||||
WARNING_LOG() << "Caught exception while trying to get superior id for building " << rootName << " with room with mounting point id: " << se.mountingPointId() << ": " << e.what();
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -232,7 +231,7 @@ bool BuildingEditModel::init(int32_t mseId)
|
||||
int parentId = item.hasSuperior() ? item.getSuperior() : rootId;
|
||||
if (!parentItemIndexCache.contains(parentId))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Invalid building structure! Tree can not be built!";
|
||||
ERROR_LOG() << "Invalid building structure! Tree can not be built!";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -256,7 +255,7 @@ QModelIndex BuildingEditModel::modelIndexByMountingPointId(int mountingPointId)
|
||||
if (privateData(mi)->data().value<TreeItem>().mountingPointId() == mountingPointId)
|
||||
return mi;
|
||||
}
|
||||
WARNING_LOG(m_logger)<<"Could not find modelindex for given room mountig point id: " << mountingPointId;
|
||||
WARNING_LOG()<<"Could not find modelindex for given room mountig point id: " << mountingPointId;
|
||||
return {};
|
||||
}
|
||||
|
||||
@@ -266,7 +265,7 @@ QModelIndex BuildingEditModel::modelIndexByStructureElementId(int structureEleme
|
||||
auto it = m_mapModelIndices.find(structureElementId);
|
||||
if (it == m_mapModelIndices.end())
|
||||
{
|
||||
WARNING_LOG(m_logger)<<"Could not find modelindex for given room structreElementId: " << structureElementId;
|
||||
WARNING_LOG()<<"Could not find modelindex for given room structreElementId: " << structureElementId;
|
||||
return {};
|
||||
}
|
||||
return it.value();
|
||||
|
||||
-2
@@ -63,8 +63,6 @@ private:
|
||||
std::shared_ptr<Buildings::Interface::Dtc> m_bldDtc;
|
||||
|
||||
QString m_buildingName;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
|
||||
|
||||
|
||||
+6
-7
@@ -13,9 +13,8 @@ ReplayHandler::ReplayHandler(int buildingTopicStart_s, int buildingTopicEnd_s, c
|
||||
, m_replayDuration_ms(0)
|
||||
, m_startOffset_ms(0)
|
||||
, m_replayInfo(replay)
|
||||
, m_logger(getLogger("ReplayHandler"))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "buildingTopicStart_s = " << buildingTopicStart_s
|
||||
DEBUG_LOG() << "buildingTopicStart_s = " << buildingTopicStart_s
|
||||
<< ", buildingTopicEnd_s = " << buildingTopicEnd_s
|
||||
<< ", replay.topicStart_s = " << replay.topicStart_s
|
||||
<< ", replay.topicEnd_s = " << replay.topicEnd_s
|
||||
@@ -31,7 +30,7 @@ ReplayHandler::ReplayHandler(int buildingTopicStart_s, int buildingTopicEnd_s, c
|
||||
|
||||
m_actualReplayStart_ms = replay.replayStart_ms + start_diff_ms;
|
||||
m_startOffset_ms = 0;
|
||||
DEBUG_LOG(m_logger) << "Replay starts before Building-Topic: Shift replay starting point to m_actualReplayStart_ms = " << m_actualReplayStart_ms;
|
||||
DEBUG_LOG() << "Replay starts before Building-Topic: Shift replay starting point to m_actualReplayStart_ms = " << m_actualReplayStart_ms;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -39,7 +38,7 @@ ReplayHandler::ReplayHandler(int buildingTopicStart_s, int buildingTopicEnd_s, c
|
||||
|
||||
m_actualReplayStart_ms = replay.replayStart_ms;
|
||||
m_startOffset_ms = std::abs(start_diff_ms);
|
||||
DEBUG_LOG(m_logger) << "Building-Topic starts before Replay: Starting Replay after " << m_startOffset_ms << "msec";
|
||||
DEBUG_LOG() << "Building-Topic starts before Replay: Starting Replay after " << m_startOffset_ms << "msec";
|
||||
}
|
||||
|
||||
|
||||
@@ -48,12 +47,12 @@ ReplayHandler::ReplayHandler(int buildingTopicStart_s, int buildingTopicEnd_s, c
|
||||
if (replay.topicEnd_s > buildingTopicEnd_s)
|
||||
{
|
||||
m_actualReplayEnd_ms -= (replay.topicEnd_s - buildingTopicEnd_s) * 1000;
|
||||
DEBUG_LOG(m_logger) << "Replay longer than Building-Topic, cutting replay end to m_actualReplayEnd_ms = " << m_actualReplayEnd_ms;
|
||||
DEBUG_LOG() << "Replay longer than Building-Topic, cutting replay end to m_actualReplayEnd_ms = " << m_actualReplayEnd_ms;
|
||||
}
|
||||
|
||||
m_replayDuration_ms = m_actualReplayEnd_ms - m_actualReplayStart_ms;
|
||||
|
||||
DEBUG_LOG(m_logger) << "Replay from " << m_actualReplayStart_ms << " to " << m_actualReplayEnd_ms << " (duration = " << m_replayDuration_ms << ")";
|
||||
DEBUG_LOG() << "Replay from " << m_actualReplayStart_ms << " to " << m_actualReplayEnd_ms << " (duration = " << m_replayDuration_ms << ")";
|
||||
|
||||
if (m_startOffset_ms == 0)
|
||||
m_startOffset_ms = -1;
|
||||
@@ -72,7 +71,7 @@ void ReplayHandler::tick(qint64 diffSinceLastTick)
|
||||
return;
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "ReplayHandler::tick(): Remaining: " << m_replayDuration_ms << "msec";
|
||||
DEBUG_LOG() << "ReplayHandler::tick(): Remaining: " << m_replayDuration_ms << "msec";
|
||||
|
||||
if (m_startOffset_ms == -1)
|
||||
{
|
||||
|
||||
-2
@@ -31,7 +31,5 @@ private:
|
||||
qint64 m_replayDuration_ms;
|
||||
qint64 m_startOffset_ms;
|
||||
TopicReplay::Interface::SituationReplayTime m_replayInfo;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
}
|
||||
+10
-11
@@ -14,9 +14,8 @@ namespace BuildingViewer
|
||||
{
|
||||
VideoExporter::VideoExporter(QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_logger(getLogger("ThreadVideoExporter"))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "ThreadVideoExporter has been created";
|
||||
DEBUG_LOG() << "ThreadVideoExporter has been created";
|
||||
}
|
||||
|
||||
void VideoExporter::init(const VideoInformation &videoInfo)
|
||||
@@ -27,12 +26,12 @@ void VideoExporter::init(const VideoInformation &videoInfo)
|
||||
|
||||
void VideoExporter::sendAliveSignals()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "sendAliveSignals() called";
|
||||
DEBUG_LOG() << "sendAliveSignals() called";
|
||||
|
||||
for (auto &e : std::as_const(m_vecVideosToExport))
|
||||
emit e.m_pExportNotifier->stillAlive();
|
||||
|
||||
DEBUG_LOG(m_logger) << "\tSignals emitted, mutex unlocked";
|
||||
DEBUG_LOG() << "\tSignals emitted, mutex unlocked";
|
||||
}
|
||||
|
||||
|
||||
@@ -43,17 +42,17 @@ void VideoExporter::doExport()
|
||||
if (QThread::currentThread()->isInterruptionRequested())
|
||||
break;
|
||||
VideoInformation toExport = m_vecVideosToExport.takeFirst();
|
||||
DEBUG_LOG(m_logger) << "Starting export of " << toExport.m_strFolderPath;
|
||||
DEBUG_LOG() << "Starting export of " << toExport.m_strFolderPath;
|
||||
|
||||
const auto state = toExport.m_bgViewerState.value(QStringLiteral("arrBuildingStates"));
|
||||
|
||||
if (!state.isArray())
|
||||
{
|
||||
WARNING_LOG(m_logger) << "No opened buildings, nothing to export, skipping video!";
|
||||
WARNING_LOG() << "No opened buildings, nothing to export, skipping video!";
|
||||
continue;
|
||||
}
|
||||
|
||||
DEBUG_LOG(m_logger) << "Emitting 'signalStartRecording'";
|
||||
DEBUG_LOG() << "Emitting 'signalStartRecording'";
|
||||
emit signalStartRecording(toExport.m_strFolderPath, state);
|
||||
|
||||
QSharedPointer<ReplayHandler> pHandler;
|
||||
@@ -84,7 +83,7 @@ void VideoExporter::doExport()
|
||||
if (diff_ms >= 1000)
|
||||
{
|
||||
last_tick_elapsed = elapsed_sum_ms;
|
||||
DEBUG_LOG(m_logger) << "Export: " << elapsed_sum_ms / 1000 << "/" << record_duration_ms / 1000 << "[s] passed";
|
||||
DEBUG_LOG() << "Export: " << elapsed_sum_ms / 1000 << "/" << record_duration_ms / 1000 << "[s] passed";
|
||||
}
|
||||
|
||||
if (pHandler)
|
||||
@@ -98,12 +97,12 @@ void VideoExporter::doExport()
|
||||
if (QThread::currentThread()->isInterruptionRequested())
|
||||
break;
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "Done. Emitting 'signalStopRecording'";
|
||||
DEBUG_LOG() << "Done. Emitting 'signalStopRecording'";
|
||||
emit signalStopRecording();
|
||||
|
||||
DEBUG_LOG(m_logger) <<"Export done, emitting 'signalExportSuccessful'";
|
||||
DEBUG_LOG() <<"Export done, emitting 'signalExportSuccessful'";
|
||||
toExport.m_pExportNotifier->setExportSuccessful(toExport.m_strFolderPath);
|
||||
DEBUG_LOG(m_logger) <<"\tsignal emitted";
|
||||
DEBUG_LOG() <<"\tsignal emitted";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
-1
@@ -56,6 +56,5 @@ private:
|
||||
void sendAliveSignals();
|
||||
|
||||
QVector<VideoInformation> m_vecVideosToExport;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
}
|
||||
+12
-13
@@ -31,7 +31,6 @@ namespace BuildingViewer
|
||||
TopicReplayInterface::TopicReplayInterface(BgViewerController *bgvController, LtsSession::LtsSession *session)
|
||||
: m_bgvController(bgvController)
|
||||
, m_session(session)
|
||||
, m_logger(getLogger("TopicReplayInterface"))
|
||||
{
|
||||
session->getForeignGuiInterface<SituationReplay::ForeignGuiInterface>(m_replayIfc);
|
||||
}
|
||||
@@ -105,7 +104,7 @@ bool TopicReplayInterface::exportTopic(const QJsonObject &attributes,
|
||||
const QJsonArray states = attributes[QStringLiteral("arrBuildingStates")].toArray();
|
||||
if (states.isEmpty())
|
||||
{
|
||||
INFO_LOG(m_logger) << "Nothing to export";
|
||||
INFO_LOG() << "Nothing to export";
|
||||
emit pExportNotifier->exportSuccessful(QString());
|
||||
return true;
|
||||
}
|
||||
@@ -114,7 +113,7 @@ bool TopicReplayInterface::exportTopic(const QJsonObject &attributes,
|
||||
QFile f(folderPath + QLatin1Char('/') + filename);
|
||||
if (!f.open(QIODevice::WriteOnly))
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Can not open file '" << f.fileName() << "' for writing!";
|
||||
WARNING_LOG() << "Can not open file '" << f.fileName() << "' for writing!";
|
||||
pExportNotifier->setExportFailed();
|
||||
return false;
|
||||
}
|
||||
@@ -137,7 +136,7 @@ bool TopicReplayInterface::exportTopic(const QJsonObject &attributes,
|
||||
obj[QStringLiteral("replays")] = arr;
|
||||
f.write(QJsonDocument(obj).toJson(QJsonDocument::Indented));
|
||||
f.close();
|
||||
DEBUG_LOG(m_logger) << "BDV filename: " << f.fileName();
|
||||
DEBUG_LOG() << "BDV filename: " << f.fileName();
|
||||
|
||||
QVector<int> buildingIds;
|
||||
buildingIds.reserve(states.size());
|
||||
@@ -147,7 +146,7 @@ bool TopicReplayInterface::exportTopic(const QJsonObject &attributes,
|
||||
int buildingId = featureId2DatabaseId(QString::fromStdString(vws.m_featureID));
|
||||
if (buildingId <= 0)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Could not retrieve building id from '" << vws.m_featureID << "' - skipping";
|
||||
WARNING_LOG() << "Could not retrieve building id from '" << vws.m_featureID << "' - skipping";
|
||||
continue;
|
||||
}
|
||||
buildingIds += buildingId;
|
||||
@@ -173,7 +172,7 @@ bool TopicReplayInterface::exportTopic(const QJsonObject &attributes,
|
||||
|
||||
if (!m_replayIfc || !m_bgvController)
|
||||
{
|
||||
ERROR_LOG(m_logger) << "BuildingViewer exportTopic: m_replayIfc==nullptr, can not start replay, aborting export";
|
||||
ERROR_LOG() << "BuildingViewer exportTopic: m_replayIfc==nullptr, can not start replay, aborting export";
|
||||
emit pExportNotifier->exportFailed();
|
||||
Q_ASSERT(false);
|
||||
return false;
|
||||
@@ -225,7 +224,7 @@ bool TopicReplayInterface::exportBuildings(const QVector<int> &buildingIds) cons
|
||||
const QString modelPath = BgViewerController::buildingModelPath();
|
||||
if (modelPath.isEmpty())
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Could not find path with building models - can not copy models";
|
||||
WARNING_LOG() << "Could not find path with building models - can not copy models";
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -233,13 +232,13 @@ bool TopicReplayInterface::exportBuildings(const QVector<int> &buildingIds) cons
|
||||
QDir dir(outputPath);
|
||||
if (!dir.exists() && !dir.mkpath(outputPath))
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Could not create path " << outputPath;
|
||||
WARNING_LOG() << "Could not create path " << outputPath;
|
||||
return false;
|
||||
}
|
||||
QFile f(outputPath + QStringLiteral("/buildings.json"));
|
||||
if (!f.open(QIODevice::ReadWrite))
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Could not open file " << f.fileName() << " for read/write: " << f.errorString();
|
||||
WARNING_LOG() << "Could not open file " << f.fileName() << " for read/write: " << f.errorString();
|
||||
return false;
|
||||
}
|
||||
const QJsonArray arr(QJsonDocument::fromJson(f.readAll()).array());
|
||||
@@ -258,7 +257,7 @@ bool TopicReplayInterface::exportBuildings(const QVector<int> &buildingIds) cons
|
||||
const auto mse = ismDtc->mainStructureElement(buildingId);
|
||||
if (mse.id() != buildingId)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Could not find MainStructureElement for building with id " << buildingId << " - skipping";
|
||||
WARNING_LOG() << "Could not find MainStructureElement for building with id " << buildingId << " - skipping";
|
||||
continue;
|
||||
}
|
||||
const QString fnIve = QString::fromStdString(mse.name()) + QStringLiteral(".flt.ive");
|
||||
@@ -295,7 +294,7 @@ bool TopicReplayInterface::exportShaders() const
|
||||
{
|
||||
const QString shaderPath(NGL::findFile(NGL::FileType::ConfigFile, QStringLiteral("shaders")));
|
||||
const QString outputPath(m_basePath + QStringLiteral("BuildingModels/shaders/"));
|
||||
DEBUG_LOG(m_logger) << "shaderPath: " << shaderPath << ", outputPath: " << outputPath;
|
||||
DEBUG_LOG() << "shaderPath: " << shaderPath << ", outputPath: " << outputPath;
|
||||
return NGL::copyDirContentsToDir(shaderPath, outputPath);
|
||||
}
|
||||
|
||||
@@ -307,10 +306,10 @@ bool TopicReplayInterface::copyFile(const QString &srcFn, const QString &srcDir,
|
||||
QFile f(src);
|
||||
if (!f.exists() || (!QFile::exists(dst) && !f.copy(dst)))
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Could not copy " << src << " to " << dst << ": " << f.errorString();
|
||||
WARNING_LOG() << "Could not copy " << src << " to " << dst << ": " << f.errorString();
|
||||
return false;
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "Copied from " << src << " to " << dst;
|
||||
DEBUG_LOG() << "Copied from " << src << " to " << dst;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
-1
@@ -62,6 +62,5 @@ private:
|
||||
#endif
|
||||
BgViewerController *m_bgvController = nullptr;
|
||||
LtsSession::LtsSession *m_session = nullptr;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
}
|
||||
-1
@@ -12,7 +12,6 @@ namespace BuildingViewer
|
||||
BgViewerDataViewDialog::BgViewerDataViewDialog(QWidget *parent)
|
||||
: LtsWidgets::LtsDialog(parent, LtsWidgets::ButtonCombination::CloseOnly)
|
||||
, m_ui(new Ui::BgViewerDataViewDialog)
|
||||
, m_logger(getLogger("BgViewerDataViewDialog"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
|
||||
-1
@@ -39,6 +39,5 @@ signals:
|
||||
|
||||
private:
|
||||
Ui::BgViewerDataViewDialog *m_ui;
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
}
|
||||
-1
@@ -15,7 +15,6 @@ BgViewerDataView::BgViewerDataView(QWidget *parent)
|
||||
: QWidget(parent)
|
||||
, m_ui(new Ui::BgViewerDataView)
|
||||
, m_pModel(new BgViewerDataViewModel(this))
|
||||
, m_logger(getLogger("BgViewerDataView"))
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
|
||||
|
||||
-2
@@ -54,7 +54,5 @@ private:
|
||||
BgViewerDataViewModel *m_pModel = nullptr;
|
||||
BgViewerController *m_pBgvController = nullptr;
|
||||
int m_lastSelectedRow { -1 };
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
};
|
||||
}
|
||||
+2
-3
@@ -22,7 +22,6 @@ namespace BuildingViewer
|
||||
BdvPluginProvider::BdvPluginProvider(LtsSession::LtsSession *session, QObject *parent)
|
||||
: PluginProvider(parent)
|
||||
, m_session(session)
|
||||
, m_logger(getLogger("BdvPluginProvider"))
|
||||
{}
|
||||
|
||||
bool BdvPluginProvider::init()
|
||||
@@ -37,7 +36,7 @@ bool BdvPluginProvider::init()
|
||||
|
||||
if (!m_session->getDtc<Buildings::DataInterface>(m_bldDtc))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Fetching 'm_bldDtc' failed!";
|
||||
ERROR_LOG() << "Fetching 'm_bldDtc' failed!";
|
||||
return false;
|
||||
}
|
||||
m_session->getForeignGuiInterface<Buildings::ForeignInfoGuiInterface>(m_bldInfoIfc);
|
||||
@@ -53,7 +52,7 @@ bool BdvPluginProvider::init()
|
||||
|
||||
if (!m_session->getDtc<ParticipantManagement::DataInterface>(m_ppmDtc))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Fetching 'm_ppmDtc' failed!";
|
||||
ERROR_LOG() << "Fetching 'm_ppmDtc' failed!";
|
||||
return false;
|
||||
}
|
||||
m_session->getForeignGuiInterface<ParticipantManagement::ForeignParticipantInfoGuiInterface>(m_ppmParticipantInfoIfc);
|
||||
|
||||
+1
-3
@@ -62,9 +62,7 @@ private:
|
||||
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
|
||||
std::shared_ptr<SituationReplay::Interface::Dtc> m_srpDtc;
|
||||
std::shared_ptr<ProjectDataManagement::Interface::Dtc> m_pdmDtc;
|
||||
std::shared_ptr<ParticipantManagement::ForeignParticipantInfoGuiInterface> m_ppmParticipantInfoIfc;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<ParticipantManagement::ForeignParticipantInfoGuiInterface> m_ppmParticipantInfoIfc;
|
||||
};
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user