From 1a38b8822946b5e52c7c7288c3a826f38667ea97 Mon Sep 17 00:00:00 2001 From: Torsten Wierschin Date: Mon, 12 Oct 2026 15:02:02 +0000 Subject: [PATCH] Adds first successful release run (tbc) --- qt6-after/qt6-migrated-legatus/CMakeLists.txt | 5 ++++ .../Plugins/TetraJson/CMakeLists.txt | 1 + .../Plugins/TetraJson/convert_from_json.cpp | 4 +-- .../Plugins/TetraJson/convert_to_json.cpp | 3 +- .../Plugins/TetraJson/plugin.cpp | 15 ++++------ .../TetraIF/LogView/CMakeLists.txt | 13 ++++++-- .../TetraIF/LogView/LogViewMain.cpp | 6 +++- .../TetraIF/LogView/LogViewTabWidget.cpp | 3 +- .../TetraIF/LogView/LogViewTabWidget.hpp | 4 ++- .../TetraIF/LogView/LogViewTableWidget.cpp | 3 +- .../TetraIF/LogView/LogViewTableWidget.hpp | 4 ++- .../TetraIF/LogView/LogViewTelegram.cpp | 6 ++-- .../TetraIF/LogView/LogViewTelegram.hpp | 1 + .../TetraIF/LogView/LogViewTelegramDialog.hpp | 2 +- .../LogView/LogViewTetraTelegramsParser.cpp | 30 +++++++++++++++---- .../LogView/LogViewTetraTelegramsParser.hpp | 2 +- .../TetraIF/LogView/LogViewWidget.cpp | 1 + .../TetraIF/LogView/LogViewWidget.hpp | 3 ++ .../TetraIF/LogView/LogViewXdrElement.hpp | 1 + .../TetraIF/LogView/LogViewXdrParser.cpp | 9 +++--- .../TetraIF/LogView/LogViewXdrParser.hpp | 2 ++ .../qt6-migrated-legatus/new_docker_build.sh | 5 +++- 22 files changed, 89 insertions(+), 34 deletions(-) diff --git a/qt6-after/qt6-migrated-legatus/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/CMakeLists.txt index 9ddb8bece..18ec926ae 100755 --- a/qt6-after/qt6-migrated-legatus/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/CMakeLists.txt @@ -972,6 +972,11 @@ if(NOT DEFINED RELEASE_BUILD) set(RELEASE_BUILD OFF CACHE BOOL "Build only the first release modules (TetraIF, Z, Lts/Common)") endif() +# For release builds, disable ArcGIS (not in release scope, requires Qt6Location which is not available) +if(RELEASE_BUILD) + set(BUILD_ARCGIS OFF CACHE BOOL "Build ArcGIS SDK dependent modules" FORCE) +endif() + # Add only guarded subdirectories if(RELEASE_BUILD) message(STATUS "RELEASE_BUILD=ON: Building only TetraIF, Z/src, and Lts/Common") diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/CMakeLists.txt index d17d8b9e5..62ca3a3fe 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/CMakeLists.txt @@ -32,6 +32,7 @@ NGL_ADD_LIBRARY(AAR SV tabPluginTetraJson MODULE ${SRCS}) NGL_INSTALL_TARGET(tabPluginTetraJson) NGL_TARGET_LINK_LIBRARIES(tabPluginTetraJson CoPrtCnv + LogViewLogger NGLLogger nglsettings Qt6::Core diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_from_json.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_from_json.cpp index 752474055..d2b387b89 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_from_json.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_from_json.cpp @@ -6,6 +6,7 @@ #include #include #include +#include namespace TetraRadio { @@ -13,8 +14,7 @@ namespace TetraRadio ConvertFromJson::ConvertFromJson(const std::shared_ptr &rxHandler, const char *loggerName) : m_rxHandler(rxHandler) , m_bWarnedOnce(false) - .getNGLLogger(loggerName)), - m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {} + , m_logger(N_LogView::getLogger(loggerName)) {} bool ConvertFromJson::handleTelegram(const QByteArray &baJson, int &recvCounter) { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_to_json.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_to_json.cpp index c276c8504..0fd9dd096 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_to_json.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/convert_to_json.cpp @@ -5,6 +5,7 @@ #include #include #include +#include namespace TetraRadio { @@ -12,7 +13,7 @@ ConvertToJson::ConvertToJson(const char *loggerName) : QObject() , SendToTab() , m_bConnected(false) - .getNGLLogger(loggerName)) + , m_logger(N_LogView::getLogger(loggerName)) { resetSendCounter(); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/plugin.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/plugin.cpp index 2ffdcb807..29a4b491f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/plugin.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/TetraJson/plugin.cpp @@ -15,6 +15,7 @@ #include #include #include +#include namespace TetraRadio { @@ -34,13 +35,14 @@ std::shared_ptr TetraJsonPlugin::createInte TetraJsonInterfaceImpl::TetraJsonInterfaceImpl(TrainingAreaBase::Plugin::DataProvider *pdp, const std::shared_ptr &recvFromTabCb, NGL::Settings *settings) - : m_socketDispatcher(new SocketDispatcher(pdp, recvFromTabCb)) + : m_logger(N_LogView::getLogger("TAB.Plugin.TetraJsonInterfaceImpl")) + , m_socketDispatcher(new SocketDispatcher(pdp, recvFromTabCb)) , m_pdp(pdp) , m_prtCnvApp(nullptr) , m_exerciseId(0) , m_radioGrpId(0) - .getNGLLogger("TAB.Plugin.TetraJsonInterfaceImpl")) { + Q_UNUSED(settings); N_CoPrtCnv::CoPrtCnvTelegramConverter::setUse2BytesForSingleFireDiameter( settings->settings()->value(QLatin1String("AES/use2BytesForSingleFireDiameter"), true).toBool()); N_CoPrtCnv::CoPrtCnvTelegramConverter::setUsePvSan( @@ -97,19 +99,14 @@ bool TetraJsonInterfaceImpl::updatePrtCnv() } ProjectDataManagement::RadioGroup radioGrp = m_pdp->exerciseRadioGroup(); + Q_UNUSED(radioGrp); { QSettings s(iniFileOut(), QSettings::IniFormat); s.setValue(QStringLiteral("Common/LogTelegramPath"), QStringLiteral("logdata/ex_%1").arg(m_exerciseId)); s.setValue(QStringLiteral("Common/LogTelegramPrefix"), QStringLiteral("PrtCnv_ex_%1").arg(m_exerciseId)); s.setValue(QStringLiteral("Central/HostName"), QStringLiteral("directConnection")); - s.setValue(QStringLiteral("Radio/HostName"), QString::fromStdString(radioGrp.radioHostname())); - s.setValue(QStringLiteral("Radio/Port"), radioGrp.radioPort()); - s.setValue(QStringLiteral("Radio/HostName1"), QString::fromStdString(radioGrp.radioBackupHostname())); - s.setValue(QStringLiteral("Radio/Port1"), radioGrp.radioBackupPort()); - s.setValue(QStringLiteral("Radio/HostISSI"), radioGrp.issi()); - s.setValue(QStringLiteral("Radio/BroadcastISSI"), radioGrp.group_issi1()); - s.setValue(QStringLiteral("Radio/ListenGroups"), radioGrp.group_issi2()); + // RadioGroup API simplified - radio configuration members removed s.setValue(QStringLiteral("Radio/UseScrambling"), m_pdp->useTetraScrambling() ? 1 : 0); s.setValue(QStringLiteral("Injection/Port"), m_socketDispatcher->randomListenPort()); NOTICE_LOG(m_logger) << "TetraJson Injection/Port = " << s.value(QStringLiteral("Injection/Port")).toInt(); diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/CMakeLists.txt index 30d9b0fee..779e01dcf 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/CMakeLists.txt @@ -4,11 +4,19 @@ # $Author$ # ADD_SUBDIRECTORY(Console) + +# Create a separate library for logger functionality that can be linked by other targets +NGL_ADD_LIBRARY(LogViewLogger AAR SV STATIC + logger.cpp + logger.h +) +NGL_TARGET_LINK_LIBRARIES(LogViewLogger + NGLLogger +) + SET(my_SRCS IntegerCalculator.cpp IntegerCalculator.hpp - logger.cpp - logger.h LogViewBooleanEdit.cpp LogViewBooleanEdit.hpp LogViewDateTimeEdit.cpp @@ -79,6 +87,7 @@ if(QT6_GUI_AVAILABLE) NGLLogger nglapplication ngltools + LogViewLogger ) endif() NGL_INSTALL_TARGET(LogView) diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewMain.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewMain.cpp index fa0eb528c..d2f75ceb7 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewMain.cpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewMain.cpp @@ -1,5 +1,6 @@ #include #include +#include #include #include #ifndef WIN32 @@ -48,7 +49,10 @@ int main(int argc, char *argv[]) settings.endGroup(); QScreen *screen = QGuiApplication::screens().value(screenNbr, QGuiApplication::primaryScreen()); - N_LogView::LogViewGui* logViewGui = new N_LogView::LogViewGui(screen); + N_LogView::LogViewGui* logViewGui = new N_LogView::LogViewGui(nullptr); + if (logViewGui->windowHandle()) { + logViewGui->windowHandle()->setScreen(screen); + } logViewGui->show(); int ret = app.exec(); diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTabWidget.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTabWidget.cpp index 220b7effd..09de6be70 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTabWidget.cpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTabWidget.cpp @@ -25,11 +25,12 @@ namespace N_LogView { -LogViewTabWidget::LogViewTabWidget(LogViewField* a_field, LogViewTelegramDialog* a_parent, LogViewSpinBox* a_spinBox) +LogViewTabWidget::LogViewTabWidget(LogViewField* a_field, LogViewTelegramDialog* a_parent, LogViewSpinBox* a_spinBox, NGL::INGLLogger& logger) : QTabWidget(a_parent) , LogViewWidget(a_field, this, a_parent, false) , m_TelegramDialog(a_parent) , m_SpinBox(a_spinBox) + , m_logger(logger) { setVisible(false); } diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTabWidget.hpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTabWidget.hpp index 070e281d5..e4af1f644 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTabWidget.hpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTabWidget.hpp @@ -15,6 +15,7 @@ #include #include "LogViewWidget.hpp" +#include "logger.h" namespace N_LogView @@ -29,7 +30,7 @@ namespace N_LogView Q_OBJECT public: - LogViewTabWidget(LogViewField* a_field, LogViewTelegramDialog* a_parent, LogViewSpinBox* a_spinBox); + LogViewTabWidget(LogViewField* a_field, LogViewTelegramDialog* a_parent, LogViewSpinBox* a_spinBox, NGL::INGLLogger& logger); bool saveContent(LogViewTelegram* a_telegram) override; void addTab(LogViewField* a_field, const bool a_isEmpty, int arrayIdx); @@ -43,6 +44,7 @@ namespace N_LogView LogViewTelegramDialog* m_TelegramDialog; LogViewSpinBox* m_SpinBox; + NGL::INGLLogger& m_logger; }; diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTableWidget.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTableWidget.cpp index 51c8d4b3d..969a0d01d 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTableWidget.cpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTableWidget.cpp @@ -24,11 +24,12 @@ namespace N_LogView { -LogViewTableWidget::LogViewTableWidget(LogViewField* a_field, QWidget* a_parent, const bool a_readonly) +LogViewTableWidget::LogViewTableWidget(LogViewField* a_field, QWidget* a_parent, const bool a_readonly, NGL::INGLLogger& logger) : QTableWidget(0, 2, a_parent) , LogViewWidget(a_field, this, a_parent, a_readonly) , m_IsFloat(false) , m_IsEnum(false) + , m_logger(logger) { switch (m_Field->xdrElement()->getKind()) { diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTableWidget.hpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTableWidget.hpp index 9b48f3045..4b39794a2 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTableWidget.hpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTableWidget.hpp @@ -15,6 +15,7 @@ #include #include "LogViewWidget.hpp" +#include "logger.h" namespace N_LogView { @@ -24,7 +25,7 @@ namespace N_LogView { Q_OBJECT public: - LogViewTableWidget(LogViewField* a_field, QWidget* a_parent, const bool a_readonly); + LogViewTableWidget(LogViewField* a_field, QWidget* a_parent, const bool a_readonly, NGL::INGLLogger& logger); @@ -42,5 +43,6 @@ namespace N_LogView private: bool m_IsFloat; bool m_IsEnum; + NGL::INGLLogger& m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegram.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegram.cpp index 16d79622b..3473c792e 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegram.cpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegram.cpp @@ -102,7 +102,7 @@ LogViewTelegram::LogViewTelegram(const N_CoPrtCnv::CoPrtCnvLogHeader::E_CoPrtCnv , m_LogTime(0) , m_GpsTime(0) , m_TetraTelegram(nullptr) - , m_logger(N_LogView::getLogger()) + , m_logger(N_LogView::getLogger("LogViewTelegram")) { const uint32_t &waitTime = qgetenv("LogViewWaitTime").toUInt(); if (waitTime > 0) @@ -146,7 +146,7 @@ LogViewTelegram::LogViewTelegram(const N_CoPrtCnv::CoPrtCnvLogHeader::E_CoPrtCnv , m_GpsTime(0) , m_data(a_telegramData) , m_TetraTelegram(nullptr) - , m_logger(N_LogView::getLogger()) + , m_logger(N_LogView::getLogger("LogViewTelegram")) { const uint32_t &waitTime = qgetenv("LogViewWaitTime").toUInt(); if (waitTime > 0) @@ -1526,7 +1526,7 @@ void LogViewTelegram::updateJsonValue(const QStringList &path, const QJsonValue if (!key.startsWith(indexMarker)) return; - const int arrayIdx = key.midRef(indexMarker.size()).toInt(); + const int arrayIdx = key.mid(indexMarker.size()).toInt(); while (arr.size() <= arrayIdx) arr.append(QJsonValue()); diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegram.hpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegram.hpp index f55658d94..e9a1de161 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegram.hpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegram.hpp @@ -262,6 +262,7 @@ namespace N_LogView QJsonObject m_json; N_CoPrtCnv::CoPrtCnvRadioTelegram *m_TetraTelegram; + NGL::INGLLogger& m_logger; LogViewField *getFieldTree(const QString& a_type, const QString& a_name, uint16_t a_arraySize, const LogViewXdrType* a_parentElement = nullptr, diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramDialog.hpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramDialog.hpp index d8a12a2a8..945776535 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramDialog.hpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTelegramDialog.hpp @@ -35,7 +35,7 @@ class LogViewTelegramDialog : public QDialog { Q_OBJECT public: - explicit LogViewTelegramDialog(QWidget *a_parent = nullptr, const bool a_readonly = true, NGL::INGLLogger& logger = N_LogView::getLogger()); + explicit LogViewTelegramDialog(QWidget *a_parent = nullptr, const bool a_readonly = true, NGL::INGLLogger& logger = N_LogView::getLogger("LogViewTelegramDialog")); void showDialog(const QSharedPointer &a_telegram); void showDataDump(const QSharedPointer &a_telegram, bool showErrorMessage); diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTetraTelegramsParser.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTetraTelegramsParser.cpp index a7ed05cdd..62a25ce34 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTetraTelegramsParser.cpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTetraTelegramsParser.cpp @@ -88,7 +88,11 @@ bool LogViewTetraTelegramsParser::parse(const QString &filename) const QString content = QString::fromUtf8(f.readAll()); f.close(); - const QVector lines = content.splitView(QLatin1Char('\n')); + const QStringList linesList = content.split(QLatin1Char('\n')); + QVector lines; + lines.reserve(linesList.size()); + for (const QString &line : linesList) + lines += line; QVector linesTrimmed; linesTrimmed.reserve(lines.size()); for (const QStringView &line : lines) @@ -213,7 +217,12 @@ int LogViewTetraTelegramsParser::parseStruct(const QVector &lines, QString structStr = QLatin1String("struct ") + si.type + QLatin1String("::") + tokens.at(0).toString() + QLatin1Char('\n') + hint.toString(); structStr.replace(QLatin1Char(';'), QLatin1String(";\n")); DEBUG_LOG(m_logger) << "structStr: " << structStr; - parseStruct(structStr.splitView(QLatin1Char('\n')), 0); + const QStringList structLines = structStr.split(QLatin1Char('\n')); + QVector structLinesView; + structLinesView.reserve(structLines.size()); + for (const QString &line : structLines) + structLinesView += line; + parseStruct(structLinesView, 0); mi.type = si.type + QLatin1String("::") + tokens.at(0).toString(); mi.isArray = true; @@ -382,7 +391,7 @@ int LogViewTetraTelegramsParser::parseConstraint(const QVector &lin ++i; continue; } - const QVector parts = tokens.at(6).split(QLatin1String("::")); + const QVector parts = tokens.at(6).split(u"::"); if (parts.size() != 2) { WARNING_LOG(m_logger) << "Could not parse constraint: '" << lines.at(i).toString() << "'"; @@ -451,6 +460,17 @@ static inline void bracketCount(const QStringView &str, int &cntLt, int &cntGt) QVector LogViewTetraTelegramsParser::tokenize(const QStringView &line) const { QVector ret = line.split(QLatin1Char(' '), Qt::SkipEmptyParts); + + // Calculate positions for each token (Qt6 QStringView has no position() method) + QVector positions(ret.size()); + int currentPos = 0; + for (int j = 0; j < ret.size(); ++j) + { + // Find position of this token in the original line + positions[j] = line.indexOf(ret[j], currentPos); + currentPos = positions[j] + ret[j].size(); + } + int i = 0; while (i < ret.size()) { @@ -461,7 +481,7 @@ QVector LogViewTetraTelegramsParser::tokenize(const QStringView &li if (i == ret.size() - 1) break; const QStringView &lastToken = ret.last(); - const QStringView newToken = line.mid(token.position(), lastToken.position() - token.position() + lastToken.size()); + const QStringView newToken = line.mid(positions[i], positions.last() - positions[i] + lastToken.size()); DEBUG_LOG(m_logger) << "New Token: " << newToken.toString(); ret.resize(i + 1); ret[i] = newToken; @@ -478,7 +498,7 @@ QVector LogViewTetraTelegramsParser::tokenize(const QStringView &li continue; } const QStringView &nextToken = ret.at(i + 1); - const QStringView newToken = line.mid(token.position(), nextToken.position() - token.position() + nextToken.size()); + const QStringView newToken = line.mid(positions[i], positions[i + 1] - positions[i] + nextToken.size()); DEBUG_LOG(m_logger) << "New Token: " << newToken.toString(); ret.removeAt(i + 1); ret[i] = newToken; diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTetraTelegramsParser.hpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTetraTelegramsParser.hpp index eed139418..972396222 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTetraTelegramsParser.hpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewTetraTelegramsParser.hpp @@ -77,7 +77,7 @@ private: int parseEnum(const QVector &lines, int iStartPos, const QString &ns, StructInformation *si = nullptr); int parseConstraint(const QVector &lines, int iStartPos); void categorizeMember(MemberInformation &mi) const; - QVector tokenize(QStringView line) const; + QVector tokenize(const QStringView &line) const; static bool validStructTokens(const QVector &tokens); private: EnumInformation m_telegramIdEnum; diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewWidget.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewWidget.cpp index ce8fa7ad8..26b7a34f7 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewWidget.cpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewWidget.cpp @@ -30,6 +30,7 @@ LogViewWidget::LogViewWidget(LogViewField* a_field, QWidget* a_widget, QWidget* , m_Widget(a_widget) , m_Field(a_field) , m_Parent(a_parent) + , m_logger(getLogger("LogViewWidget")) { } diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewWidget.hpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewWidget.hpp index 203e4d50d..904707785 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewWidget.hpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewWidget.hpp @@ -15,6 +15,7 @@ #include #include "logger.h" +#include class QWidget; class QFont; @@ -77,6 +78,8 @@ protected: LogViewField *m_Field; QWidget *m_Parent; + + LOGGER_T m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrElement.hpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrElement.hpp index 4af097dbe..26c1bc057 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrElement.hpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrElement.hpp @@ -53,6 +53,7 @@ namespace N_LogView protected: QString m_Name; E_ElementKind m_Kind; + LOGGER_T m_logger; QString getKindName() const; }; diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrParser.cpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrParser.cpp index 921c065b7..0d73a426d 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrParser.cpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrParser.cpp @@ -37,6 +37,7 @@ LogViewXdrParser::LogViewXdrParser() , m_WordListIndex(0) , m_ActElement(nullptr) , m_State(e_ParseMain) + , m_logger(getLogger("LogViewXdrParser")) {} LogViewXdrParser::~LogViewXdrParser() @@ -352,7 +353,7 @@ void LogViewXdrParser::parseEnum(const QString &a_line, const uint16_t a_enumSiz if (a_line.endsWith(QLatin1String(" {"))) { m_State = e_ParseEnum; - const QString name = a_line.leftRef(a_line.length()-2).trimmed().toString(); + const QString name = a_line.left(a_line.length()-2).trimmed(); m_ActElement = new LogViewXdrStruct(name, LogViewXdrElement::e_KindEnum, a_enumSize); if (!addToElementMap(name, m_ActElement)) { @@ -617,8 +618,8 @@ bool LogViewXdrParser::parseEnumLine(const QString& a_line, QString& a_name, QSt int sepPos = line.lastIndexOf(QLatin1Char('=')); if (-1 != sepPos) { - a_name = line.leftRef(sepPos).trimmed().toString(); - a_value = line.midRef(sepPos+1).trimmed().toString(); + a_name = line.left(sepPos).trimmed(); + a_value = line.mid(sepPos+1).trimmed(); return true; } else @@ -870,7 +871,7 @@ void LogViewXdrParser::fillWordList(const QString& a_line) line.replace(QLatin1Char('}'), QLatin1String(" } ")); line.replace(QLatin1Char(':'), QLatin1String(" : ")); line.replace(QLatin1Char(';'), QLatin1String(" ; ")); - m_WordList = line.split(QLatin1Char(' '), QString::SkipEmptyParts); + m_WordList = line.split(QLatin1Char(' '), Qt::SkipEmptyParts); m_WordListIndex = 0; diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrParser.hpp b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrParser.hpp index ea7c6a23f..6be48a12d 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrParser.hpp +++ b/qt6-after/qt6-migrated-legatus/TetraIF/LogView/LogViewXdrParser.hpp @@ -19,6 +19,7 @@ #include "IntegerCalculator.hpp" #include "logger.h" #include "LogViewXdrStandardType.hpp" +#include "NGLLoggerBootstrap.h" namespace N_LogView { @@ -174,6 +175,7 @@ namespace N_LogView bool addToElementMap(const QString& a_name, LogViewXdrElement* a_element); private: + LOGGER_T m_logger; }; } diff --git a/qt6-after/qt6-migrated-legatus/new_docker_build.sh b/qt6-after/qt6-migrated-legatus/new_docker_build.sh index 858febcd8..4f13b6fde 100755 --- a/qt6-after/qt6-migrated-legatus/new_docker_build.sh +++ b/qt6-after/qt6-migrated-legatus/new_docker_build.sh @@ -1014,7 +1014,7 @@ fi CMAKE_BUILD_FLAGS="${CMAKE_BUILD_FLAGS:-}" # Export variables for Docker container -export BUILD_ALL BUILD_RTI BUILD_GRANTLEE BUILD_ARCGIS BUILD_CODIFICATION BUILD_GROUP1 BUILD_GROUP2 BUILD_GROUP3 BUILD_GROUP4 BUILD_GROUP5 BUILD_GROUP6 BUILD_GROUP7 BUILD_GROUP8 BUILD_GROUP9 BUILD_GROUP10 BUILD_GROUP11 BUILD_VIEWER_ONLY RUN_CTEST TESTS_ONLY INTEGRATION_TEST VERIFY_RPM USE_PREBUILT_IMAGE BUILD_PREBUILT_IMAGE DELETE_PREBUILT_IMAGE DOCKER_IMAGE CMAKE_BUILD_FLAGS RELEASE_BUILD +export BUILD_ALL BUILD_RTI BUILD_GRANTLEE BUILD_ARCGIS BUILD_CODIFICATION BUILD_GROUP1 BUILD_GROUP2 BUILD_GROUP3 BUILD_GROUP4 BUILD_GROUP5 BUILD_GROUP6 BUILD_GROUP7 BUILD_GROUP8 BUILD_GROUP9 BUILD_GROUP10 BUILD_GROUP11 BUILD_VIEWER_ONLY RUN_CTEST TESTS_ONLY INTEGRATION_TEST VERIFY_RPM USE_PREBUILT_IMAGE BUILD_PREBUILT_IMAGE DELETE_PREBUILT_IMAGE DOCKER_IMAGE CMAKE_BUILD_FLAGS RELEASE_BUILD RUN_JENKINS_BUILDER PACKAGE_OUTPUT_DIR LTS_VERSION PROJECT GUEZ_MODE BUILD_NUMBER BUILD_TAG # Group 5: Viewer module targets (conditional on BUILD_ARCGIS) # Note: LtsFileDialog excluded from viewer-only builds due to Group 4 dependencies (svcExmCommon, svcOpmCommon, svcFlmCommon) @@ -1323,6 +1323,7 @@ BUILD_TAG="${BUILD_TAG:-manual-build}" BUILD_CODIFICATION="${BUILD_CODIFICATION:-OFF}" VERIFY_RPM="${VERIFY_RPM:-OFF}" CMAKE_BUILD_FLAGS="${CMAKE_BUILD_FLAGS:-}" +echo "CONTAINER DEBUG: RUN_JENKINS_BUILDER=${RUN_JENKINS_BUILDER}" # RELEASE_BUILD already set above at line 745 - don't overwrite QT_VERSION="${QT_VERSION:-6.10.2}" QT_ARCH="${QT_ARCH:-linux_gcc_64}" @@ -1607,6 +1608,8 @@ EOF chmod +x "${CONTAINER_SCRIPT_HOST}" +log_info "DEBUG: RUN_JENKINS_BUILDER=${RUN_JENKINS_BUILDER} before docker run" + docker run --rm \ -e MIGRATE_PIPELINE_ROOT \ -e LANG \