From 84f8cfb41f879afbef0338cdc912f118a4928b0e Mon Sep 17 00:00:00 2001 From: berrux_dev Date: Tue, 17 Nov 2026 17:28:48 +0100 Subject: [PATCH] Remove unused code from the Release 2 scope modules Trim mostly-deletion changes (~700 lines) across the modules the Release 2 build compiles: unused telegrams and receiver/handler code in TrainingAreaBase (telegrams, recv_from_dds_aes/fts, ism/main/pdm/position handlers), dead members in SqlBrowser and ProjectDataManagement, unused LtsPluginManager loader paths, LtsSession unit-test, WlsTetra and DdsView cleanups, plus the stale include_directories removal in Lts/CMakeLists.txt. Continues the Release 2 source prune (keep only what the build compiles). Excluded from this commit by design: the machine-specific .envrc (MIGRATE_PIPELINE_ROOT path fix stays uncommitted) and the untracked qt5-before/ reference tree. --- .../qt6-migrated-legatus/Lts/CMakeLists.txt | 9 +- .../Lts/Common/LtsNotification/CMakeLists.txt | 3 - .../LtsPluginManager/lts_plugin_loader.cpp | 40 ---- .../LtsPluginManager/lts_plugin_loader.h | 6 - .../LtsPluginManager/lts_plugin_manager.cpp | 13 -- .../LtsPluginManager/lts_plugin_manager.h | 2 - .../unit-test/ltssession_unit_test.cpp | 3 - .../Plugins/WlsTetra/CMakeLists.txt | 1 - .../Plugins/WlsTetra/logger.cpp | 1 - .../Messages/client_message.cpp | 5 - .../Messages/client_message.h | 7 - .../Messages/reply_message.cpp | 17 +- .../Messages/reply_message.h | 4 - .../Proxies/TrainingAreaBase/dds_handler.cpp | 1 - .../Proxies/TrainingAreaBase/exm_handler.cpp | 6 - .../Proxies/TrainingAreaBase/exm_handler.h | 5 - .../Proxies/TrainingAreaBase/ism_handler.cpp | 76 +------- .../Proxies/TrainingAreaBase/ism_handler.h | 20 +- .../Lts/Proxies/TrainingAreaBase/logger.cpp | 4 - .../Lts/Proxies/TrainingAreaBase/logger.h | 2 - .../Proxies/TrainingAreaBase/main_handler.cpp | 16 -- .../Proxies/TrainingAreaBase/main_handler.h | 8 +- .../Proxies/TrainingAreaBase/pdm_handler.cpp | 26 --- .../TrainingAreaBase/position_handler.cpp | 15 +- .../TrainingAreaBase/position_handler.h | 5 - .../Proxies/TrainingAreaBase/ppm_handler.cpp | 2 - .../Proxies/TrainingAreaBase/ppm_handler.h | 2 - .../TrainingAreaBase/recv_from_dds_aes.cpp | 99 +--------- .../TrainingAreaBase/recv_from_dds_aes.h | 40 +--- .../TrainingAreaBase/recv_from_dds_fts.cpp | 6 - .../tab_record_replay_plugin_custom.cpp | 5 +- .../training_area_telegrams.cpp | 25 --- .../training_area_telegrams.h | 172 ------------------ .../ProjectDataManagement/CMakeLists.txt | 13 +- .../chargetype_rename.cpp | 1 - .../ProjectDataManagement/chargetype_rename.h | 1 - .../Lts/Tools/DdsView/rw/rwwidgets.cpp | 8 - .../Lts/Tools/SqlBrowser/AddLine.cpp | 17 +- .../Lts/Tools/SqlBrowser/AddLine.h | 3 - .../Lts/Tools/SqlBrowser/AddModel.cpp | 13 -- .../Lts/Tools/SqlBrowser/BrowserWnd.cpp | 26 --- .../Lts/Tools/SqlBrowser/BrowserWnd.h | 5 - .../Lts/Tools/SqlBrowser/CMakeLists.txt | 2 - .../Lts/Tools/SqlBrowser/DataModel.cpp | 17 -- .../Lts/Tools/SqlBrowser/WaitWnd.h | 2 - 45 files changed, 30 insertions(+), 724 deletions(-) diff --git a/qt6-after/qt6-migrated-legatus/Lts/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/CMakeLists.txt index dc5346cee..2fb661986 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/CMakeLists.txt @@ -16,8 +16,6 @@ else() endif() # Add only existing subdirectories to allow partial checkouts / incremental migration -# Release 2 scope: Tools, DDS, Common, Services (minimal), Proxies (TrainingAreaBase only), Plugins (Styles only for LtsWidgets dependency) -# Excluded: Application, Viewer, Projects, most Plugins (not in Release 2) set(LTS_SUBDIRS Tools DDS Common Services Proxies Plugins) foreach(dir IN LISTS LTS_SUBDIRS) if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${dir}") @@ -46,13 +44,10 @@ ENDIF() INCLUDE(MacroCodeGenIdl) # Add stub headers for non-RTI/non-FilterManagement builds -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include/AudioVideoManagement/) +# (AudioVideoManagement, TopicEditorBase, OperatorManagement, LtsScriptTimeline and +# Services/PresentationManagement entries removed: pruned in Release 2, paths gone.) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include/NGLLogger/) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include/LtsSession/) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include/TopicEditorBase/) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include/OperatorManagement/) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include/LtsScriptTimeline/) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include/LtsUtilsGuiDds/) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include/Services/PresentationManagement/) CODEGEN_WRITE_SERVICEFILE_INFO() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/CMakeLists.txt index 8b5d90d53..a31debd5f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/CMakeLists.txt @@ -5,7 +5,6 @@ # Created by Mike Wille, SLSE, 2016-01-13 # - # Make ${Qt6_Widgets} optional if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets) set(Qt6_Widgets ${Qt6_Widgets}) @@ -13,7 +12,6 @@ else() set(Qt6_Widgets "") endif() - SET(LtsNoti_SRCS lts_notification.h lts_notification.cpp @@ -22,7 +20,6 @@ SET(LtsNoti_SRCS ) NGL_ADD_LIBRARY2(WS LtsNotification SHARED ${LtsNoti_SRCS}) - NGL_TARGET_INCLUDE_DIRECTORIES(LtsNotification PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../ diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_loader.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_loader.cpp index 6b1aa4110..83654b003 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_loader.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_loader.cpp @@ -11,20 +11,16 @@ #include "lts_plugin_loader.h" #include #include - #include #include - #include #include #include #include #include #include - #include - namespace LtsPluginManager { @@ -42,7 +38,6 @@ void LtsPluginLoaderHandler::cleanupPluginLoader() s_ltsPluginLoader->ltsPluginLoader.unloadAllPlugins(); } - LtsPluginLoader *LtsPluginLoader::getInstance() { if (!s_ltsPluginLoader.exists()) @@ -50,7 +45,6 @@ LtsPluginLoader *LtsPluginLoader::getInstance() return &s_ltsPluginLoader->ltsPluginLoader; } - LtsPluginLoader::~LtsPluginLoader() { unloadAllPlugins(); @@ -72,7 +66,6 @@ void LtsPluginLoader::unloadAllPlugins() m_loadedPlugins.clear(); } - void LtsPluginLoader::checkPlugins(const QVector &appVector, QStringList &errors /* out */) { @@ -84,7 +77,6 @@ void LtsPluginLoader::checkPlugins(const QVector dataPlugins; QVector guiPlugins; auto addDataPluginFn = [&](const PluginInstance &pi) @@ -110,8 +102,6 @@ void LtsPluginLoader::checkPlugins(const QVector &plugins, const QString &pluginType) { @@ -133,18 +123,13 @@ void LtsPluginLoader::checkPlugins(const QVector plugins(dataPlugins + guiPlugins); - // check if all in apps.json requested plugins are available for (auto i1 = appVector.constBegin(); i1 != appVector.constEnd(); ++i1) // Apps { const LtsAppDescriptor::AppDescription &app = *i1; - //WARNING_LOG(logger) << "Checking app '"< &piVector = app.pluginInfos; for (auto i2 = piVector.constBegin(); i2 != piVector.constEnd(); i2++) // App's Required Plugins @@ -174,7 +159,6 @@ void LtsPluginLoader::checkPlugins(const QVector &loadPlugin, const QStringList &requiredPlugins, @@ -211,30 +195,25 @@ bool LtsPluginLoader::loadPlugins(PluginType requestedPluginType, } } - { QMutableListIterator i1(optionalPluginsList); // delete all plugins from the to-load list that were cached while (i1.hasNext()) { const QString pluginName = i1.next().toLower(); - QMap::iterator i2 = m_loadedPlugins.find(PluginKey(requestedPluginType, pluginName)); - if (i2 != m_loadedPlugins.end()) { DEBUG_LOG(logger) << "Plugin " << pluginName << " already loaded, using that instance"; if (loadPlugin) loadPlugin(i2.value()); - i1.remove(); } } } } - QFileInfo libPathInfo(QCoreApplication::applicationDirPath() + QStringLiteral("/../lib/")); QString libPath(libPathInfo.absolutePath()); if (!libPathInfo.exists()) @@ -272,7 +251,6 @@ bool LtsPluginLoader::loadPlugins(PluginType requestedPluginType, continue; const QString absoluteFilePath = pluginDir.filePath(); - DEBUG_LOG(logger) << "File Path: " << absoluteFilePath; // if (!filename.contains(type)) @@ -284,7 +262,6 @@ bool LtsPluginLoader::loadPlugins(PluginType requestedPluginType, std::unique_ptr pluginLoader(new QPluginLoader); pluginLoader->setFileName(absoluteFilePath); - const QJsonObject jObj = pluginLoader->metaData(); QJsonObject::const_iterator iid = jObj.find(QStringLiteral("IID")); @@ -297,7 +274,6 @@ bool LtsPluginLoader::loadPlugins(PluginType requestedPluginType, const QString jsonIid = iid.value().toString().toLower(); // LOWERCASE ! (pun intended) // Use QStringView for efficient string operations const QList iidParameters = QStringView{jsonIid}.split(QLatin1Char(':')); - DEBUG_LOG(logger) << "Plugin " << absoluteFilePath << " provides iid '" << jsonIid; if (iidParameters.count() != 3) @@ -316,7 +292,6 @@ bool LtsPluginLoader::loadPlugins(PluginType requestedPluginType, } PluginType pluginType = PluginType::UNKNOWN; - const QString pluginName = iidParameters.at(2).toString(); const QString pluginTypeString = iidParameters.at(0).toString(); switch (pluginTypes.indexOf(pluginTypeString)) @@ -367,11 +342,9 @@ bool LtsPluginLoader::loadPlugins(PluginType requestedPluginType, { QMutableListIterator i (requiredPluginsList); - while (i.hasNext()) { const QString requiredPlugin = i.next().toLower(); - if (pluginName == requiredPlugin) { found = true; @@ -381,13 +354,11 @@ bool LtsPluginLoader::loadPlugins(PluginType requestedPluginType, } } - if (!found) { for (auto i = optionalPluginsList.constBegin(); i != optionalPluginsList.constEnd(); i++) { const QString optionalPlugin = (*i).toLower(); - if (pluginName == optionalPlugin) { found = true; @@ -396,25 +367,19 @@ bool LtsPluginLoader::loadPlugins(PluginType requestedPluginType, } } - if (!found) { DEBUG_LOG(logger) << "Plugin " << pluginName << " was not requested"; continue; // plugin was not requested to be loaded } } - - // before we create a new instance of a plugin, which is not needed as one instance is perfectly fine to use for many apps, look it up in the loaded plugins list - if (loadPlugin && !m_loadedPlugins.isEmpty()) // only lookup if there is something to lookup TODO: faster to NOT do that check? { QMap::iterator i = m_loadedPlugins.find(PluginKey(requestedPluginType, pluginName)); - if (i != m_loadedPlugins.end()) { DEBUG_LOG(logger) << "Plugin " << pluginName << " already loaded, using that instance ("<metaObject()->className()<<")"; - loadPlugin(i.value()); continue; // found, next plugin! } @@ -422,7 +387,6 @@ bool LtsPluginLoader::loadPlugins(PluginType requestedPluginType, // plugin not already loaded: QObject *plugin = pluginLoader->instance(); - if (!plugin) { ERROR_LOG(logger) << "Failed to load " << filename << " - " << pluginLoader->errorString(); @@ -435,7 +399,6 @@ bool LtsPluginLoader::loadPlugins(PluginType requestedPluginType, pi.fullFileName = absoluteFilePath; pi.plugin = plugin; pi.pluginLoader = pluginLoader.get(); - if (loadPlugin && !loadPlugin(pi)) // does the dev want this plugin? if no, unload it! TODO: really unload? or still cache it?? { DEBUG_LOG(logger) << "Plugin " << pluginName << " unloaded"; @@ -444,7 +407,6 @@ bool LtsPluginLoader::loadPlugins(PluginType requestedPluginType, continue; // next plugin } pi.pluginLoader = pluginLoader.release(); - // the dev decided to use that plugin, so cache it m_loadedPlugins.insert(PluginKey(requestedPluginType, pluginName), pi); @@ -454,13 +416,11 @@ bool LtsPluginLoader::loadPlugins(PluginType requestedPluginType, DEBUG_LOG(logger) << "Loaded " << jsonIid << " - File: " << filename; } // end of >> pluginDir.hasNext(); - if (checkPluginsLists && !requiredPluginsList.isEmpty()) { WARNING_LOG(logger) << "These plugins could not be found for Plugin Type " << (int)requestedPluginType << ": " << requiredPluginsList.join(QStringLiteral(", ")); return false; } - return true; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_loader.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_loader.h index a5e96f82e..6cbd3b80d 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_loader.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_loader.h @@ -53,7 +53,6 @@ enum class PluginType }; - struct PluginInstance // one instance for one plugin { QString pluginName; @@ -63,23 +62,18 @@ struct PluginInstance // one instance for one plugin QPluginLoader *pluginLoader = nullptr; }; - class LTSPLUGINLOADER_EXPORT LtsPluginLoader { public: static LtsPluginLoader *getInstance(); - void unloadAllPlugins(); - void checkPlugins(const QVector &appVector, QStringList &errors /* out */); - bool loadPlugins(PluginType requestedPluginType, const std::function &loadPlugin, const QStringList &requiredPlugins = QStringList(), /* leave empty to get all plugins of the given type */ const QString &specialTopicTypeFilter = QString(), const QStringList &optionalPlugins = QStringList()); - typedef QPair PluginKey; private: diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_manager.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_manager.cpp index dd8bfffab..82d6b3688 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_manager.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_manager.cpp @@ -52,7 +52,6 @@ LtsPluginManager::LtsPluginManager() LtsPluginManager::~LtsPluginManager() { - delete m_sessionManager; } @@ -100,9 +99,7 @@ bool LtsPluginManager::startApp(const LtsAppDescriptor::AppDescription& app, boo const LtsSession::DdsConnectionParams& connParams, const QString& workspaceId, bool hidden) { - LtsWidgets::LtsWaitDialogContainer wait; - m_app = app; LtsPluginLoader* pluginLoader = LtsPluginLoader::getInstance(); @@ -134,12 +131,10 @@ bool LtsPluginManager::startApp(const LtsAppDescriptor::AppDescription& app, boo for (auto i = dataPlugins.constBegin(); i != dataPlugins.constEnd(); ++i) { const PluginInstance& pi = *i; - AppPluginInstance api; api.pluginInstance = pi; api.m_appName = m_app.appName; api.m_appId = m_app.id; - dataApiList.append(api); } @@ -147,7 +142,6 @@ bool LtsPluginManager::startApp(const LtsAppDescriptor::AppDescription& app, boo for (auto i = guiPlugins.constBegin(); i != guiPlugins.constEnd(); ++i) { const PluginInstance& pi = *i; - AppPluginInstance api; api.pluginInstance = pi; api.m_appName = m_app.appName; @@ -156,17 +150,13 @@ bool LtsPluginManager::startApp(const LtsAppDescriptor::AppDescription& app, boo for (auto i2 = app.pluginInfos.constBegin(); i2 != app.pluginInfos.constEnd(); ++i2) { const LtsAppDescriptor::PluginInfo& rp = *i2; - if (rp.type == LtsAppDescriptor::PluginInfo::PluginType::GUI && rp.iid == pi.pluginName) { - api.m_flags = rp.flags; api.m_options = rp.options; - break; } } - guiApiList.append(api); } @@ -174,12 +164,10 @@ bool LtsPluginManager::startApp(const LtsAppDescriptor::AppDescription& app, boo if (!connParamsNew.isValid()) { INFO_LOG(m_logger) << "Invalid connection params given - using default parameter"; - connParamsNew.domainId = LtsSessionData::LtsSessionData::getInstance()->getDomainIdPreset(); connParamsNew.partitionId = 0; connParamsNew.exerciseId = 0; connParamsNew.partitionType = IDL::PartitionType::Global; - connParamsNew.tcpConnectionUrl = LtsSessionData::LtsSessionData::getInstance()->getTcpConnectionUrl(); } if (LtsSessionData::LtsSessionData::getInstance()->getQosFile().size() > 0 && @@ -192,7 +180,6 @@ bool LtsPluginManager::startApp(const LtsAppDescriptor::AppDescription& app, boo ERROR_LOG(m_logger) << "Could not create Global Session - abort."; return false; } - return true; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_manager.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_manager.h index d1c73e08e..e226b80e2 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_manager.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/lts_plugin_manager.h @@ -58,7 +58,6 @@ namespace LtsPluginManager struct AppPluginInstance { PluginInstance pluginInstance; - QFlags m_flags; QStringList m_options; QString m_appName; @@ -77,7 +76,6 @@ class LTSPLUGINMANAGER_EXPORT LtsPluginManager : public QObject const LtsSession::DdsConnectionParams& connParams, const QString& workspaceId = QString(), bool hidden = false); LtsSession::LtsSession* getSession(IDL::PartitionType partitionType, int partitionId); - bool isInitialized() const { return m_initialized; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/unit-test/ltssession_unit_test.cpp b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/unit-test/ltssession_unit_test.cpp index 440257f54..ff3db60fc 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/unit-test/ltssession_unit_test.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/unit-test/ltssession_unit_test.cpp @@ -31,9 +31,6 @@ private slots: void clearScope(); private: - // LtsSessionData is a process-wide singleton and clear() only resets the - // preset + operator state. Bring it back to a known baseline before each - // slot so the slots do not depend on execution order. void resetSessionData(); }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/CMakeLists.txt index 3d7019956..3d1f7fa33 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/CMakeLists.txt @@ -12,7 +12,6 @@ else() set(Qt6_WebSockets "") endif() - SET(SRCS logger.cpp logger.h diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/logger.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/logger.cpp index f8ccd7492..262db8b41 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/logger.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/Plugins/WlsTetra/logger.cpp @@ -8,7 +8,6 @@ */ #include "logger.h" - #include namespace WlsTetra diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/Messages/client_message.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/Messages/client_message.cpp index 73a3ab31e..3f841426a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/Messages/client_message.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/Messages/client_message.cpp @@ -44,17 +44,12 @@ LtsWebSocket::AbstractClientMessage *ClientMessageFactory::createMessage(LtsWebS return checkResult(client, message, result); } - - - ClientMessage::ClientMessage(DataManager *dataManager, LtsWebSocket::ReplyHandler *client, const QString &type, const int typeId, const QString &uuid, const QJsonValue &data) : LtsWebSocket::AbstractClientMessage(client, type, typeId, uuid, data) , m_dataManager(dataManager) , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {} - - SendBiteRequest::SendBiteRequest(DataManager *dataManager, LtsWebSocket::ReplyHandler *client, const QString &type, const int typeId, const QString &uuid, const QJsonValue &data) : ClientMessage(dataManager, client, type, typeId, uuid, data) {} diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/Messages/client_message.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/Messages/client_message.h index f0070c0a5..74e3e4eb4 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/Messages/client_message.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/Messages/client_message.h @@ -24,15 +24,10 @@ class DataManager; namespace ClientMessages { - - class ClientMessageFactory final : public LtsWebSocket::AbstractClientMessageFactory { public: explicit ClientMessageFactory(DataManager *dataManager); - - - LtsWebSocket::AbstractClientMessage *createMessage(LtsWebSocket::ReplyHandler *client, const QString &message); @@ -41,8 +36,6 @@ private: }; - - class ClientMessage : public LtsWebSocket::AbstractClientMessage { protected: diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/Messages/reply_message.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/Messages/reply_message.cpp index 33a70d66c..614207bfa 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/Messages/reply_message.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/Messages/reply_message.cpp @@ -21,9 +21,7 @@ using namespace JsonKeys; namespace Messages { - - - + QString ReplyMessage::toJsonString() const { return QString::fromUtf8(QJsonDocument(m_jsonRepresentation).toJson(QJsonDocument::Compact)); @@ -35,8 +33,6 @@ ReplyMessage::ReplyMessage(const QString &type, const int typeId, const QString } - - OkMessage::OkMessage(const OkMessage::OkData &data) : ReplyMessage(OK(), 1, data.uuid) { @@ -47,8 +43,6 @@ OkMessage::OkMessage(const OkMessage::OkData &data) })); } - - ErrorMessage::ErrorMessage(const ErrorMessage::ErrorData &data) : ReplyMessage(ERROR_(), -1, data.uuid) { @@ -59,9 +53,6 @@ ErrorMessage::ErrorMessage(const ErrorMessage::ErrorData &data) })); } - - - QJsonObject BiteDataMessage::ErrorText::toJson() const { return QJsonObject({{LANG(), lang}, @@ -81,7 +72,6 @@ QJsonObject BiteDataMessage::BasicError::toJson() const return QJsonObject({{ERROR_TEXT(), text}}); } - QJsonObject BiteDataMessage::BiteError::toJson() const { return QJsonObject({{ERROR_TEXT(), vecToPath(errorTexts)}, @@ -92,7 +82,6 @@ QJsonObject BiteDataMessage::BiteError::toJson() const }); } - BiteDataMessage::BiteDataMessage(const BiteDataMessage::BiteData &data, const QString &uuid) : ReplyMessage(BITE_DATA(), 2, uuid) { @@ -108,7 +97,6 @@ BiteDataMessage::BiteDataMessage(const BiteDataMessage::BiteData &data, const QS })); } - PositionMessage::PositionMessage(const PositionMessage::PositionData &data, const QString &uuid) : ReplyMessage(POSITION_DATA(), 3, uuid) { @@ -120,9 +108,6 @@ PositionMessage::PositionMessage(const PositionMessage::PositionData &data, cons {LAST_POSITION_UPDATE(), data.gpsTime} })); } - - - } } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/Messages/reply_message.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/Messages/reply_message.h index 6708fb4a1..51cb08097 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/Messages/reply_message.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/WebSocketInterface/Messages/reply_message.h @@ -27,11 +27,8 @@ namespace Messages class ReplyMessage : public LtsWebSocket::ReplyMessage { public: - ReplyMessage() = default; - virtual ~ReplyMessage() = default; - virtual QString toJsonString() const; protected: @@ -73,7 +70,6 @@ public: {} }; - class OkMessage final : public ReplyMessage { diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/dds_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/dds_handler.cpp index e825012f6..f89656b9d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/dds_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/dds_handler.cpp @@ -7,7 +7,6 @@ */ #include "dds_handler.h" - #include #include #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/exm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/exm_handler.cpp index cb7326327..5d0cdf790 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/exm_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/exm_handler.cpp @@ -1,6 +1,3 @@ - - - #include "exm_handler.h" #include "main_handler.h" #include @@ -34,7 +31,6 @@ ExerciseManagement::Exercise ExmHandler::exercise(int exerciseId) return m_exmDtc->exercise(exerciseId); } - void ExmHandler::onExerciseChanged(const ExerciseManagement::Exercise &data, DataModification modType) { if (!data.radioGroupId.has_value() || data.radioGroupId.get() == 0) @@ -68,6 +64,4 @@ void ExmHandler::onExerciseChanged(const ExerciseManagement::Exercise &data, Dat if (bExercise2RadioGroupChanged) emit exercise2RadioGroupChanged(); } - - } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/exm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/exm_handler.h index 43cb1ebd5..b992fe1a9 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/exm_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/exm_handler.h @@ -1,6 +1,3 @@ - - - #pragma once #include #include @@ -15,9 +12,7 @@ class ExmHandler final : public QObject Q_OBJECT public: explicit ExmHandler(MainHandler *mainHandler); - bool init(); - std::unordered_map exercise2RadioGroup() const { return m_exercise2RadioGroup; } ExerciseManagement::Exercise exercise(int exerciseId); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.cpp index 8d31b5c44..3a92a6a1b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.cpp @@ -1,6 +1,4 @@ - - #include "ism_handler.h" #include #include "main_handler.h" @@ -42,20 +40,6 @@ bool IsmHandler::init() ERROR_LOG(m_logger) << "Can not read data from ISM"; return false; } - - - - - - - - - - - - - - return true; } @@ -77,8 +61,6 @@ IsmHandler::OpsData IsmHandler::dataFromOpsCode(int ipsCode) int assetId = m_dtcIsm->getAssetIdFromOpticalCode(ipsCode); OpsData opsData; - - if ( assetId < 0) { WARNING_LOG(m_logger) << "No asset for ops code=" << ipsCode << " found"; @@ -87,14 +69,6 @@ IsmHandler::OpsData IsmHandler::dataFromOpsCode(int ipsCode) opsData.opsCode = ipsCode; opsData.assetId = assetId; - - - - - - - - DEBUG_LOG(m_logger) << "OpsData.structureElementId=" << opsData.structureElementId << " assetId=" << opsData.assetId << " mountingPointTypeId=" << opsData.mountingPointTypeId @@ -102,14 +76,11 @@ IsmHandler::OpsData IsmHandler::dataFromOpsCode(int ipsCode) << " mainStructureElementId=" << opsData.mainStructureElementId << " roomId=" << opsData.roomId; - { - - + { DEBUG_LOG(m_logger) <<"---------------- UPDATE OPS-Data ------------------"; updateOpsData(opsData, true); opsData= m_opsData[opsData.opsCode] ; } - return opsData; } @@ -171,10 +142,8 @@ void IsmHandler::onMountingPointAssetChanged(const InfrastructureManagement::Mou case DataModification::eModified: { OpsData opsData; - opsData.opsCode = m_dtcIsm->getOpticalCodeFromAssetId(data.assetId); opsData.assetId = data.assetId; - updateOpsData(opsData, true); break; } @@ -189,8 +158,6 @@ void IsmHandler::onMountingPointAssetChanged(const InfrastructureManagement::Mou void IsmHandler::rotateBuildingFootprint(int mseId) { - - if ( m_relBuildingFootprintsRotated.contains(mseId)) { DEBUG_LOG(m_logger) << " mainStructureElements.Rotate already done id=" << mseId; @@ -225,7 +192,6 @@ void IsmHandler::rotateBuildingFootprint(int mseId) void IsmHandler::onMainStructureElementChanged(const InfrastructureManagement::MainStructureElement &data, DataModification modType) { - switch (modType) { case DataModification::eAdded: @@ -234,9 +200,7 @@ void IsmHandler::onMainStructureElementChanged(const InfrastructureManagement::M int exerciseId = m_mainHandler->ddsHandler()->getExerciseId(); if ( !m_dtcIsm->isElementAssignedToExercise(data, exerciseId)) { - INFO_LOG(m_logger) << "HandlerBuildingData::onMainStructureElementChanged() id=" << data.id << " remove"; - - + INFO_LOG(m_logger) << "HandlerBuildingData::onMainStructureElementChanged() id=" << data.id << " remove"; m_buildingBoundingBoxes.remove(data.id); m_relBuildingFootprints.remove(data.id); m_relBuildingFootprintsRotated.remove((data.id)); @@ -250,7 +214,6 @@ void IsmHandler::onMainStructureElementChanged(const InfrastructureManagement::M continue; removeOpsDataByStructureElementId(se.id); } - QMutableHashIterator iter(m_opsData); while (iter.hasNext()) @@ -267,10 +230,6 @@ void IsmHandler::onMainStructureElementChanged(const InfrastructureManagement::M return; } - - - - for (const InfrastructureManagement::StructureElement &se : data.elements) { if (se.mountingPointTypeId != InfrastructureManagement::MountingPointType::IndoorIPS && @@ -284,9 +243,7 @@ void IsmHandler::onMainStructureElementChanged(const InfrastructureManagement::M updateOpsData(it.value()); } DEBUG_LOG(m_logger) << " mainStructureElements Vor Rotate id=" << data.id; - QMap mainFootprints = m_dtcIsm->getFootprintsByExerciseId(exerciseId); - - + QMap mainFootprints = m_dtcIsm->getFootprintsByExerciseId(exerciseId); if (mainFootprints.contains(data.id)) { rotateBuildingFootprint(data.id); @@ -315,9 +272,7 @@ void IsmHandler::onMainFootprintChanged(const InfrastructureManagement::MainFoot { case DataModification::eAdded: case DataModification::eModified: - { - - + { DEBUG_LOG(m_logger) << "mainStructureElements onMainFootprintChanged id=" << data.id; double minX = 0; double maxX = 0; @@ -445,11 +400,8 @@ void IsmHandler::updateOpsData(OpsData &data, bool force) const auto &mainStructureElements = m_dtcIsm->mainStructureElements(); - for (const auto &mse : std::as_const(mainStructureElements)) { - - if (!force && !m_dtcIsm->isElementAssignedToExercise(mse, exerciseId)) continue; for (const InfrastructureManagement::StructureElement &se : mse.elements) @@ -500,13 +452,9 @@ bool IsmHandler::posInExtendedBuildingFootprint(int mainStructureElementId, cons return false; } - - - DEBUG_LOG(m_logger) << "mainStructureElementId=" << mainStructureElementId << " position=" << position; - int exerciseId = m_mainHandler->ddsHandler()->getExerciseId(); InfrastructureManagement::MainStructureElement mse = m_dtcIsm->mainStructureElement(mainStructureElementId); @@ -516,29 +464,21 @@ bool IsmHandler::posInExtendedBuildingFootprint(int mainStructureElementId, cons if (!m_buildingBoundingBoxes.contains(mainStructureElementId)) return false; - TetraIcd::RelativePosition relBldgPosition = m_mainHandler->posHandler()->geographicToRelative(mse.geoPosition); TetraIcd::RelativePosition relPosition = m_mainHandler->posHandler()->geographicToRelative(position); DEBUG_LOG(m_logger) << "relBldgPosition=" << relBldgPosition.offsetX << "/" << relBldgPosition.offsetY << ", relPosition=" << relPosition.offsetX << "/" << relPosition.offsetY; + QPointF relPositionMgrs(relPosition.offsetX, relPosition.offsetY); - - - - - - QPolygonF relBuildingFootprint = m_relBuildingFootprintsRotated[mainStructureElementId]; QPointF relPositionF(relPosition.offsetX - relBldgPosition.offsetX, relPosition.offsetY - relBldgPosition.offsetY); + if (relBuildingFootprint.containsPoint(relPositionF, Qt::OddEvenFill)) { DEBUG_LOG(m_logger) << "Position is inside Building-Footprint"; return true; } - - - - + DEBUG_LOG(m_logger) << "relBuildingFootprint.size=" << relBuildingFootprint.size(); for (int i = 0; i < relBuildingFootprint.size() ; i++) { @@ -613,6 +553,4 @@ double IsmHandler::squareLen(const QPointF &p1, const QPointF &p2) double vy = p2.y() - p1.y(); return vx * vx + vy * vy; } - - } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.h index b08f10b6e..726807ad5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ism_handler.h @@ -1,5 +1,4 @@ - #pragma once #include #include @@ -41,10 +40,7 @@ public: bool init(); OpsData dataFromOpsCode(int ipsCode) ; - int getAssetTypeIdFromStructureElementId (int structureElementId) {return m_structure_ElementId2AssetTypeId.value(structureElementId);} - - - + int getAssetTypeIdFromStructureElementId (int structureElementId) {return m_structure_ElementId2AssetTypeId.value(structureElementId);} bool posInExtendedBuildingFootprint(int mainStructureElementId, const Core::GeoPosition &position, const int mountPointTypeId) const; private Q_SLOTS: @@ -67,24 +63,16 @@ private: NGL::INGLLogger &m_logger; MainHandler *m_mainHandler; - - QHash m_opsData; - - + QHash m_opsData; QMap m_structure_ElementId2AssetTypeId; QMap m_structureElementId2AssetId; - QMap m_assetId2StructureElementId; - - + QMap m_assetId2StructureElementId; QMap m_buildingBoundingBoxes; QMap m_relBuildingFootprints; - QMap m_relBuildingFootprintsRotated; - + QMap m_relBuildingFootprintsRotated; QMap m_buildingBoundingBoxesMgrs; QMap m_relBuildingFootprintsRotatedMgrs; - std::shared_ptr m_dtcIsm; - int m_distanceIpsToGps; int m_distanceOpsToGps; }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/logger.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/logger.cpp index db48b646f..48541b023 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/logger.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/logger.cpp @@ -1,8 +1,5 @@ - - #include "logger.h" - #include namespace TrainingAreaBase @@ -27,5 +24,4 @@ namespace TrainingAreaBase abort(); } } - } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/logger.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/logger.h index a478e6bfd..0eed2dbd6 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/logger.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/logger.h @@ -1,6 +1,4 @@ - - #pragma once #include diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.cpp index d102bef80..2bbffbfa0 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.cpp @@ -19,10 +19,8 @@ #include #include #include - #include #include - #include #include #include @@ -42,18 +40,15 @@ MainHandler::~MainHandler() LtsPluginManager::LtsPluginLoader::getInstance()->unloadAllPlugins(); m_interfaces.clear(); m_ifcConnectionState.clear(); - m_rxHandler.reset(); m_txHandler.reset(); m_ftsHandler.reset(); - m_posHandler.reset(); m_ppmHandler.reset(); m_pdmHandler.reset(); m_exmHandler.reset(); m_ismHandler.reset(); m_aesHandler.reset(); - m_ddsHandler.reset(); m_dbHandler.reset(); } @@ -168,8 +163,6 @@ bool MainHandler::init(int domainId, int exerciseId) for (const std::shared_ptr &ifc : m_interfaces) m_txHandler->addTxHandler(ifc->sendToTab()); - - // WebSocketServer m_handlerWebSocket = std::make_shared(this); DEBUG_LOG(m_logger) << "Reset WebSocketInterfaceHandler successful."; @@ -181,8 +174,6 @@ bool MainHandler::init(int domainId, int exerciseId) } m_ddsHandler->pacemaker()->addPort(m_handlerWebSocket->serverWebSocketPort(), Core::CorePortType::WebSocketServer, QStringLiteral("{\"id\":\"TAB\"}")); DEBUG_LOG(m_logger) << "Initialisation WebSocketInterfaceHandler successful."; - - m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running); return true; } @@ -234,7 +225,6 @@ bool MainHandler::loadPlugin(const LtsPluginManager::PluginInstance &pi) connect(ifc.get(), &Plugin::Interface::directMessage, this, &MainHandler::onDirectMessage); m_interfaces.push_back(ifc); - m_ccsMap = m_pdmHandler->dtc()->canComponentStrings(); m_bctMap = m_pdmHandler->dtc()->biteComponentTexts(); @@ -356,7 +346,6 @@ void MainHandler::onConnectionState(const QString &name, bool connectionState) { m_ifcConnectionState.insert(name, connectionState); } - DEBUG_LOG(m_logger) << "Publishing connection states: " << m_ifcConnectionState.size(); TrainingAreaBase::Connections connections; @@ -371,17 +360,13 @@ void MainHandler::onDirectMessage(const QByteArray &jsonMessage) { DEBUG_LOG(m_logger) << "Got direct message " << jsonMessage; WebSocketInterface::Messages::BiteDataMessage::BiteData biteData; - QJsonObject obj = QJsonDocument::fromJson(jsonMessage).object(); - biteData.equipNo = obj.value(WebSocketInterface::JsonKeys::EQUIP_NO()).toInt(); biteData.isLicensed = obj.value(QStringLiteral("doLicence")).toBool(); - qint64 biteState = obj.value(QStringLiteral("biteState")).toInt(); qint64 configState = obj.value(QStringLiteral("configState")).toInt(); qint64 batteryState = obj.value(QStringLiteral("batteryState")).toInt(); qint64 configError = obj.value(QStringLiteral("configError")).toInt(); - QJsonArray biteError = obj.value(QStringLiteral("biteError")).toArray(); if (biteData.equipNo <= 0) @@ -515,7 +500,6 @@ void MainHandler::onPositionChanged(int equipNo, const ParticipantManagement::Pa positionData.equipNo = equipNo; positionData.pos = pos.pos; positionData.gpsTime = pos.sampleTime; - WebSocketInterface::Messages::PositionMessage *msg = new WebSocketInterface::Messages::PositionMessage(positionData, QUuid::createUuid().toString()); if (m_handlerWebSocket != nullptr) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.h index 17d9f9472..234cee9d5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/main_handler.h @@ -1,5 +1,4 @@ - #pragma once #include @@ -24,9 +23,6 @@ #include "tab_plugin_interface.h" #include "WebSocketInterface/websocket_interface_handler.h" #include - - - #include "logger.h" namespace NGLDB @@ -65,7 +61,6 @@ public: std::shared_ptr ppmHandler() const { return m_ppmHandler; } std::shared_ptr posHandler() const { return m_posHandler; } - int exerciseId() const override { return m_ddsHandler->ddsConnector()->getPartitionId(); } bool useTetraScrambling() const override; ProjectDataManagement::RadioGroup exerciseRadioGroup() const override; @@ -107,8 +102,7 @@ private: std::shared_ptr m_posHandler; std::vector> m_interfaces; std::shared_ptr m_handlerWebSocket; - - + ExerciseManagement::Exercise m_exerciseData; QMap m_ccsMap; QMap m_bctMap; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/pdm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/pdm_handler.cpp index 5301863e1..461a21cd3 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/pdm_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/pdm_handler.cpp @@ -1,10 +1,7 @@ - - #include "pdm_handler.h" #include #include "main_handler.h" - #include #include @@ -38,8 +35,6 @@ bool PdmHandler::init() bool PdmHandler::initializePdm() { - - if (!m_dtcPdm->waitForHistoricalDataChargeType(20000) || !m_dtcPdm->waitForHistoricalDataGearType(20000) || @@ -176,32 +171,11 @@ int PdmHandler::vulnerabilityKindId(int tasVulnerabilityKindId, int equipmentNum return it.value().taVulnerabilityKind; } - QMap PdmHandler::radioGroups() { initializePdm(); return m_radioGroups; } - - - - - - - - - - - - - - - - - - - - static const int s_unknownMarker = 0x80000000; int PdmHandler::chargeTypeIdFromGearAndChargeTasCode(int gearTasCode, int chargeTasCode) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/position_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/position_handler.cpp index 0c72f87f6..85b2e8fce 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/position_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/position_handler.cpp @@ -1,6 +1,4 @@ - - #include "position_handler.h" #include "exm_handler.h" #include "logger.h" @@ -50,14 +48,9 @@ bool PositionHandler::initCoordinateConversion() const const LtsCoordTrans::UtmCoordinate bottomLeft(LtsCoordTrans::UtmCoordinate::fromGeographic(ta.bottomLeft.lon, ta.bottomLeft.lat)); - const QPointF mid(bottomLeft.geographic(ta.width / 2, ta.height / 2)); - - - + const QPointF mid(bottomLeft.geographic(ta.width / 2, ta.height / 2)); QString mgrs = LtsCoordTrans::mgrsFromGeographic(mid.x(), mid.y(), -1); mgrs += QStringLiteral("00000000000000"); - - m_utm2Geographic = LtsCoordTrans::UtmCoordinate::fromMgrs(mgrs); LtsCoordTrans::UtmCoordinate topRight(bottomLeft); @@ -116,10 +109,7 @@ QPointF PositionHandler::geographicToRelativePointF(const Core::GeoPosition2D &p QPointF PositionHandler::geographicToRelativePointF(const Core::GeoPosition &p) const { initCoordinateConversion(); - - const LtsCoordTrans::UtmCoordinate point(LtsCoordTrans::UtmCoordinate::fromGeographic(p.lon, p.lat, m_utm2Geographic.zone)); - return QPointF(point.x - m_utm2Geographic.x, point.y - m_utm2Geographic.y); } @@ -140,7 +130,6 @@ TetraIcd::RelativePosition PositionHandler::geographicToRelative(const Core::Geo const LtsCoordTrans::UtmCoordinate &PositionHandler::baseCoordinate() const { initCoordinateConversion(); - return m_utm2Geographic; } @@ -165,8 +154,6 @@ double PositionHandler::speed (const TetraIcd::RelativePosition &relPos, const i << " timeStamp=" << timeStamp << " lastParticipantPosition=" << lastParticipantPosition.time << " deltaTime=" << deltaTime; - - double speed = line.length() / (deltaTime / 1000); return speed; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/position_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/position_handler.h index 3c1bf8d76..0a63c6201 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/position_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/position_handler.h @@ -37,7 +37,6 @@ public: TetraIcd::RelativePosition geographicToRelative(const Core::GeoPosition2D &p, double z) const; const LtsCoordTrans::UtmCoordinate &baseCoordinate() const; - static bool isPositionMarkedInvalid(const TetraIcd::RelativePosition &p) { static_assert(std::is_integral::value, "RelativePosition.offsetX must be an integer!"); @@ -48,10 +47,8 @@ public: (invalidPos == (p.offsetY & threeBytes))); } - double speed(const TetraIcd::RelativePosition &relPos, const int equipNo, const qint64 timeStamp) const; bool isTimeToPerformSpeedCheckExceeded(const int equipNo, const qint64 timeStamp, const int maxTime) const; - void setLastPosition(int equipNo, const TrainingAreaBase::TabPosition &pos); void setLastMountPointTypeId(int equipNo, const int lastMountPointTypeId); void setLastBuildingId(int equipNo, const int lastBuildingId); @@ -61,7 +58,6 @@ public: int lastMountPointTypeId(const int equipNo) const; int lastBuildingId(const int equipNo) const; int lastRoomId(const int equipNo) const; - bool isInTrainingArea(const TetraIcd::RelativePosition &relPos) const; private: @@ -73,7 +69,6 @@ private: mutable std::shared_ptr m_dtcAsm; mutable LtsCoordTrans::UtmCoordinate m_utm2Geographic; QHash m_lastPosition; - mutable QPointF m_relPosBottomLeft; mutable QPointF m_relPosTopRight; }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ppm_handler.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ppm_handler.cpp index e52560950..8dd46b102 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ppm_handler.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ppm_handler.cpp @@ -1,6 +1,4 @@ - - #include "ppm_handler.h" #include "main_handler.h" #include "send_to_tab.h" diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ppm_handler.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ppm_handler.h index 663a33e64..24d30f71f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ppm_handler.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/ppm_handler.h @@ -20,9 +20,7 @@ class PpmHandler final : public QObject Q_OBJECT public: explicit PpmHandler(MainHandler *mainHandler); - bool init(); - std::shared_ptr getDtc() { return m_ppmDtc; } std::unordered_map> exerciseEquipmentAssignment() const { return m_exerciseEquipmentAssignments; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_aes.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_aes.cpp index 2f174f044..134409730 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_aes.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_aes.cpp @@ -1,6 +1,4 @@ - - #include "recv_from_dds_aes.h" #include #include "main_handler.h" @@ -15,15 +13,11 @@ namespace TrainingAreaBase { - - - AesStateHandler::AesStateHandler(MainHandler *mainHandler) : m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) , m_dbInterface(mainHandler->dbHandler()->db()) , m_exerciseId(mainHandler->exerciseId()) {} - template<> void RecvFromDdsAes::txData(const TrainingAreaBase::TetraIcd::DusMineReactivation &tele) { @@ -38,8 +32,6 @@ bool AesStateHandler::init() { const auto cb = [this](const Database::AesId2TaId & item) { - - m_tetraId2ddsId[item.aesTetraId] = item.aesDdsId; m_ddsId2TetraId[item.aesDdsId] = item.aesTetraId; DEBUG_LOG(m_logger) << "AES internal DDS id: " << item.aesDdsId << " - tetra id: " << item.aesTetraId; @@ -59,7 +51,6 @@ bool AesStateHandler::init() int AesStateHandler::createAesTetraId(int aesDdsId, bool &alreadyExists) { alreadyExists = false; - Database::AesId2TaId aes2Ta; aes2Ta.aesTetraId = getAesTetraId(aesDdsId); if (aes2Ta.aesTetraId != 0) @@ -107,9 +98,6 @@ bool AesStateHandler::update(int aesDdsId, int aesTetraId, bool bSentToTetra) return true; } - - - RecvFromDdsAes::RecvFromDdsAes(MainHandler *mainHandler, const std::shared_ptr &txCallback, QObject *parent) @@ -128,7 +116,6 @@ RecvFromDdsAes::RecvFromDdsAes(MainHandler *mainHandler, connect(m_checkOutdatedTelegramsTimer, &QTimer::timeout, this, &RecvFromDdsAes::onCheckOutdatedTelegrams); - m_sendDusMineReactivtionTimer->setSingleShot(true); m_sendDusMineReactivtionTimer->setInterval(200); connect(m_sendDusMineReactivtionTimer, &QTimer::timeout, @@ -372,9 +359,6 @@ bool RecvFromDdsAes::sendSingleFireSMArt(const SendCesHitRequest &request) return true; } - - - template void RecvFromDdsAes::handleEffectSimulation(const T &data, DataModification modType, TetraIcd::AreaEffectSimulationType aesType) { @@ -442,8 +426,6 @@ void RecvFromDdsAes::handleEffectSimulation(const T &data, DataModification modT } else { - - if (!(std::is_same::value) || (data.effectStateId == AreaEffectSimulation::AesEffectState::EsActivated)) handleSendToTetra(data, aesType); @@ -545,12 +527,9 @@ void RecvFromDdsAes::onTriggeredImpactsChanged(const AreaEffectSimulation::Trigg return; if (data.aesTypeId != AreaEffectSimulation::AesType::AtMineAreaSingleMines) return; - - if (data.aesItemId == 0) return; - bool completeUntriggered = true; for (size_t i = 0; i < data.bitfield.size() && completeUntriggered; ++i) { @@ -572,7 +551,6 @@ void RecvFromDdsAes::onTriggeredImpactsChanged(const AreaEffectSimulation::Trigg if (completeUntriggered) return; - auto it = m_currentMineArea.find(data.aesItemId); if (it != m_currentMineArea.end()) { @@ -605,9 +583,7 @@ void RecvFromDdsAes::onTriggeredImpactsChanged(const AreaEffectSimulation::Trigg } TetraIcd::MineAreaSingleMineState out; - out.aesDdsId = data.aesItemId; - out.mineCount = data.impactCount; out.mineState.reserve(data.bitfield.size()); for (const auto &c : data.bitfield) @@ -625,23 +601,16 @@ void RecvFromDdsAes::onDusMineStateChanged(const AreaEffectSimulation::DusMineSt if (vec.size() == 0) return; - for (const auto &mine : vec) { - - if (!m_mainHandler->pdmHandler()->isReactivatableChargeType({mine.chargeTypeId, 0,0})) continue; - - if (mine != m_allReactivatableDusMines.value(mine.eqId)) { - if (!mine.triggered && m_allReactivatableDusMines.contains(mine.eqId) && m_allReactivatableDusMines.value(mine.eqId).triggered ) m_minesToSend << mine.eqId; - m_allReactivatableDusMines.insert(mine.eqId, mine); } } @@ -711,16 +680,11 @@ void setCommonCombatParams(T &out, const S &in, const int aesTetraId) out.effectDuration = in.effectDuration; } - void RecvFromDdsAes::onEffectsChanged(const AreaEffectSimulation::Effects &data, DataModification modType) { if (modType == DataModification::eRemoved) return; - - - - if (data.aesTypeId != AreaEffectSimulation::AesType::AtExplosionClusterSingleExplosions) return; @@ -728,32 +692,23 @@ void RecvFromDdsAes::onEffectsChanged(const AreaEffectSimulation::Effects &data, if (aesItemId <= 0) return; - const AreaEffectSimulation::ExplosionCluster &aes = m_dtcAes->explosionCluster(aesItemId); if (aes.id != aesItemId) return; - const bool bIsLaserGuidable = m_mainHandler->pdmHandler()->isLaserGuidable(aes.chargeStruct); if (!bIsLaserGuidable) return; - - - const std::vector &singleEffectsRef = data.singleEffects; - if (!singleEffectsRef.empty()) { - bool bAlreadyExists = false; const int aesTetraId = m_aesStateHandler->createAesTetraId(aesItemId, bAlreadyExists); - DEBUG_LOG(m_logger) << "RecvFromDdsAes::onEffectsChanged(Effects, " << aesTetraId << ")"; TetraIcd::CreateAreaExplosion cAes; - setCommonCombatParams(cAes, aes, aesTetraId); if(cAes.effectStart > 0) { @@ -763,11 +718,9 @@ void RecvFromDdsAes::onEffectsChanged(const AreaEffectSimulation::Effects &data, cAes.effectStart += (delayMSec); } - const AreaEffectSimulation::SingleEffect &firstSingleEffect = singleEffectsRef.front(); const Core::GeoPosition &fsePosition = firstSingleEffect.position; cAes.relCorner = m_posHandler->geographicToRelative(fsePosition); - cAes.width = qRound(aes.area.width); cAes.height = qRound(aes.area.height); cAes.rotationAngle = aes.area.rotation; @@ -784,14 +737,7 @@ void RecvFromDdsAes::onEffectsChanged(const AreaEffectSimulation::Effects &data, for (const Core::GeoPosition2D &pos : std::as_const(aes.mhPoints)) mhPointsRef.emplace_back(m_posHandler->geographicToRelative(pos, 0)); - - - - - - - cAes.chargeTypeId = 254; - + cAes.chargeTypeId = 254; txData(cAes); } } @@ -810,9 +756,7 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::AirS setCommonCombatParams(cAes, aes, aesTetraId); cAes.header.equipmentNumber = 0; - cAes.relEffectPosition = m_posHandler->geographicToRelative(aes.impactPosition, 0); - - + cAes.relEffectPosition = m_posHandler->geographicToRelative(aes.impactPosition, 0); const auto chargeType(pdm()->chargeTypeFromId(aes.chargeStruct.chargeTypeId)); cAes.chargeTypeId = chargeType.legacyId > 0 ? chargeType.legacyId : chargeType.id; @@ -846,7 +790,6 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::BCCo cAes.validityTimeWind = aes.weatherTimestamp; cAes.relPositionValidityTimeWind = m_posHandler->geographicToRelative(aes.weatherPosition, 0); - const auto chargeType(pdm()->chargeTypeFromId(aes.chargeStruct.chargeTypeId)); cAes.chargeTypeId = chargeType.legacyId > 0 ? chargeType.legacyId : chargeType.id; @@ -890,8 +833,6 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Expl cAes.impactCount = aes.cannonCount * aes.cannonRounds; cAes.impactEdgeLength = qRound(pdm()->impactEdgeLength(aes.chargeStruct)); cAes.hazardDistance = m_mainHandler->pdmHandler()->hazardDistance(aes.chargeStruct); - - const auto chargeType(pdm()->chargeTypeFromId(aes.chargeStruct.chargeTypeId)); cAes.chargeTypeId = chargeType.legacyId > 0 ? chargeType.legacyId : chargeType.id; @@ -903,17 +844,13 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Expl void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::ExplosionCluster &aes, int aesTetraId) { - const bool bIsLaserGuidable = m_mainHandler->pdmHandler()->isLaserGuidable(aes.chargeStruct); - DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation " << ", aes " << aes << ", bIsLaserGuidable " << bIsLaserGuidable; if (bIsLaserGuidable) { - - return; } @@ -925,10 +862,7 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Expl DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation(ExplosionArea, " << aesTetraId << ")"; TetraIcd::CreateAreaExplosion cAes; - setCommonCombatParams(cAes, aes, aesTetraId); - - cAes.relCorner = m_posHandler->geographicToRelative(aes.area.cornerBottomLeft, 0); cAes.width = qRound(aes.area.width); cAes.height = qRound(aes.area.height); @@ -948,9 +882,6 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Expl int chargeTypeId = 0; const auto chargeType(pdm()->chargeTypeFromId(aes.chargeStruct.chargeTypeId)); chargeTypeId = pdm()->legacyChargeTypeIgniterType(aes.chargeStruct.chargeTypeId, aes.chargeStruct.igniterTypeId, aes.chargeStruct.igniterFunctionId); - - - if (chargeTypeId > 0) cAes.chargeTypeId = chargeTypeId; else @@ -960,7 +891,6 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Expl if (cAes.chargeTypeId <= 0) return; - txData(cAes); } @@ -979,8 +909,6 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Expl cAes.header.equipmentNumber = equipmentNumber; cAes.relEffectPosition = m_posHandler->geographicToRelative(aes.impactPosition, 0); cAes.effectDiameter = qRound(2 * pdm()->impactRadius(aes.chargeStruct)); - - const auto chargeType(pdm()->chargeTypeFromId(aes.chargeStruct.chargeTypeId)); cAes.chargeTypeId = chargeType.legacyId > 0 ? chargeType.legacyId : chargeType.id; @@ -1002,13 +930,8 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Mine TetraIcd::CreateMineArea cAes; setCommonCombatParams(cAes, aes, aesTetraId); - - - cAes.layingDepth = aes.width; cAes.layingDensity = aes.density; - - const auto chargeType(pdm()->chargeTypeFromId(aes.chargeStruct.chargeTypeId)); cAes.chargeTypeId = chargeType.legacyId > 0 ? chargeType.legacyId : chargeType.id; @@ -1069,9 +992,7 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::NCon cAes.borderLengthOuter = qRound(aes.borderLengthOuter); cAes.spanAngle = aes.spanAngle; cAes.rotationAngle = aes.rotationAngle; - cAes.chargeTypeId = aes.chargeStruct.chargeTypeId; - txData(cAes); } @@ -1111,9 +1032,7 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::Tech DEBUG_LOG(m_logger) << "RecvFromDdsAes::sendCreateEffectSimulation(TechnicalArea, " << aesTetraId << ")"; TetraIcd::TechnicalArea fAes; - fAes.aesDdsId = aes.id; - fAes.name = aes.name; fAes.taType = static_cast(aes.type); fAes.relCorner = m_posHandler->geographicToRelative(aes.area.cornerBottomLeft, 0); @@ -1148,15 +1067,12 @@ void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::DusS void RecvFromDdsAes::sendCreateEffectSimulation(const AreaEffectSimulation::GasPipe &aes, int aesTetraId) { - Q_UNUSED(aes); Q_UNUSED(aesTetraId); } - void RecvFromDdsAes::sendModifyEffectSimulationName(TetraIcd::AreaEffectSimulationType aesType, int aesTetraId, const std::string &name, int aesId) { - if (aesTetraId == 0) { WARNING_LOG(m_logger) << "Trying to modify an effect simulation name but have no aes identification: " << name; @@ -1167,10 +1083,8 @@ void RecvFromDdsAes::sendModifyEffectSimulationName(TetraIcd::AreaEffectSimulati TetraIcd::ModifyAreaEffectSimulationName mAes; mAes.aesType = aesType; - mAes.aesDdsId = aesId; - + mAes.aesDdsId = aesId; mAes.name = name; - txData(mAes); } @@ -1181,8 +1095,6 @@ void RecvFromDdsAes::sendRemoveEffectSimulation(TetraIcd::AreaEffectSimulationTy if (aesType == TetraIcd::AreaEffectSimulationType::GasPipeDetonation) return; - - const int aesTetraId = m_aesStateHandler->getAesTetraId(aesDdsId); if (aesTetraId == 0) { @@ -1237,8 +1149,6 @@ void RecvFromDdsAes::sendPauseEffectSimulation(int aesDdsId) TetraIcd::PauseEffectSimulation dAes; dAes.aesDdsId = aesDdsId; - - txData(dAes); } @@ -1269,7 +1179,6 @@ void RecvFromDdsAes::sendResumeEffectSimulation(const AreaEffectSimulation::Expl TetraIcd::ResumeEffectSimulation dAes; dAes.aesDdsId = aes.id; - dAes.sequelNumber = AreaEffectSimulation::Polygons::getSequelNumber(aes.id, aes.cannonCount * aes.cannonRounds, aes.originalEffectDuration, @@ -1281,7 +1190,6 @@ void RecvFromDdsAes::sendResumeEffectSimulation(const AreaEffectSimulation::Expl txData(dAes); } - template<> void RecvFromDdsAes::sendResumeEffectSimulation(const AreaEffectSimulation::ExplosionCluster &aes) { @@ -1370,6 +1278,5 @@ void RecvFromDdsAes::fillCentralChangesTable(const T &data) { dataChanged(data); } - } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_aes.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_aes.h index 6e32ec2f3..f2ffae9cc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_aes.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_aes.h @@ -1,6 +1,4 @@ - - #pragma once #include @@ -60,8 +58,6 @@ private: int m_exerciseId; }; - - class RecvFromDdsAes : public QObject { Q_OBJECT @@ -95,21 +91,15 @@ public: } void resetAllDusMines(); - - std::shared_ptr dtcAes() const { return m_dtcAes;} private: - template void handleEffectSimulation(const T &data, DataModification modType, TetraIcd::AreaEffectSimulationType aesType); - - template void fillCentralChangesTable(const T &data); template void handleSendToTetra(const T &data, TetraIcd::AreaEffectSimulationType aesType); - void onAirSupportImpactChanged(const AreaEffectSimulation::AirSupportImpact &data, DataModification modType); void onBcContaminationChanged(const AreaEffectSimulation::BCContamination &data, DataModification modType); void onExplosionAreaChanged(const AreaEffectSimulation::ExplosionArea &data, DataModification modType); @@ -147,7 +137,6 @@ private: static_assert(std::is_base_of::value, "Given type for sendResumeEffectSimulation is not an aes item!"); } - void doSpecialization(const AreaEffectSimulation::ExplosionArea &data, std::unordered_map &cont) { cont[data.id].remainExplosionNumber = data.remainExplosionNumber; } @@ -170,8 +159,6 @@ private: DEBUG_LOG(m_logger) << "new AES Item: " << data; return true; } - - it->second.effectStateId = data.effectStateId; doSpecialization(data, cont); @@ -182,12 +169,11 @@ private: return false; } - T tmp(it->second); - tmp.name = data.name; tmp.sampleTime = data.sampleTime; onlyNameChanged = (tmp == data); - + tmp.name = data.name; + tmp.sampleTime = data.sampleTime; + onlyNameChanged = (tmp == data); std::swap(it->second, dataTmp); - DEBUG_LOG(m_logger) << "changed AES Item: " << data; return true; } @@ -202,14 +188,14 @@ private: bool dataChanged(const AreaEffectSimulation::ExplosionArea ¤t, bool &onlyNameChanged) { AreaEffectSimulation::ExplosionArea copy(current); - - copy.remainExplosionNumber = 0; return dataChanged(copy, m_currentExplosionArea, onlyNameChanged); + copy.remainExplosionNumber = 0; + return dataChanged(copy, m_currentExplosionArea, onlyNameChanged); } bool dataChanged(const AreaEffectSimulation::ExplosionCluster ¤t, bool &onlyNameChanged) { AreaEffectSimulation::ExplosionCluster copy(current); - - copy.remainExplosionNumber = 0; return dataChanged(copy, m_currentExplosionCluster, onlyNameChanged); + copy.remainExplosionNumber = 0; + return dataChanged(copy, m_currentExplosionCluster, onlyNameChanged); } bool dataChanged(const AreaEffectSimulation::ExplosionSingle ¤t, bool &onlyNameChanged) @@ -240,17 +226,14 @@ private: { return dataChanged(current, m_currentGasPipes, onlyNameChanged); } - bool dataChanged(const AreaEffectSimulation::BoobyTrap ¤t) { bool placeholder; Q_UNUSED(placeholder); return dataChanged(current, m_currentBoobyTraps, placeholder); - } - bool dataChanged(const AreaEffectSimulation::OffRouteMine ¤t) { bool placeholder; @@ -320,7 +303,6 @@ private: } std::shared_ptr pdm(); - template void txData(const T &tele) { @@ -348,19 +330,12 @@ private: std::unordered_map m_currentTechnicalArea; std::unordered_map m_currentDusSingleMine; std::unordered_map m_currentGasPipes; - - std::unordered_map m_currentBoobyTraps; - - std::unordered_map m_currentOffRouteMines; - - std::shared_ptr m_ddsConnector; std::shared_ptr m_txCallback; std::shared_ptr m_dtcAes; std::shared_ptr m_aesStateHandler; - QMap m_currentEffectState; QMap m_allReactivatableDusMines; QVector m_minesToSend; @@ -368,7 +343,6 @@ private: MainHandler *m_mainHandler; QTimer *m_checkOutdatedTelegramsTimer; QTimer *m_sendDusMineReactivtionTimer; - QVector m_sentAesTelegrams; QVector m_sentAesTelegramsAesIds; }; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_fts.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_fts.cpp index 88c3e8ef9..20cc25408 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_fts.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/recv_from_dds_fts.cpp @@ -11,14 +11,10 @@ #include "main_handler.h" #include "ism_handler.h" #include "settings.h" - #include - namespace TrainingAreaBase { - - RecvFromDdsFts::RecvFromDdsFts(MainHandler *mainHandler, const std::shared_ptr &ftsTab, const std::shared_ptr &txCallback) : Interface::Fts::DemandBiteRequestHandler(ftsTab) @@ -222,7 +218,6 @@ void RecvFromDdsFts::onSendGeopairingDataRequest(const rti::core::SampleIdentity data.payloadType = TetraIcd::OpaquePayloadDataBase::Type::Geopairing; data.header.equipmentNumber = request.equipmentNumber; data.payload = request.payload; - m_ftsTab->sendGeopairingDataReply(cookie, fillFro(request.participantId, m_txCallback->txData(data))); } @@ -232,7 +227,6 @@ void RecvFromDdsFts::onSendTargetDataRequest(const rti::core::SampleIdentity &co data.payloadType = TetraIcd::OpaquePayloadDataBase::Type::Target; data.header.equipmentNumber = request.equipmentNumber; data.payload = request.payload; - m_ftsTab->sendTargetDataReply(cookie, fillFro(request.participantId, m_txCallback->txData(data))); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_record_replay_plugin_custom.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_record_replay_plugin_custom.cpp index f3bf9658d..51651f24c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_record_replay_plugin_custom.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/tab_record_replay_plugin_custom.cpp @@ -6,10 +6,8 @@ * $Author$ */ - #include "tab_record_replay_plugin_custom.h" - namespace TrainingAreaBase { @@ -67,8 +65,7 @@ bool RecordReplayPluginCustom::ppmDdsTopicsFromDatabase(NSqlQuery &q, qint64 fro if (!readEquipmentPosition(q, fromTime, toTime)) return false; if (!readEquipmentState(q, fromTime, toTime)) return false; if (!readSpecialSensorData(q, fromTime, toTime)) return false; - - + return true; } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/training_area_telegrams.cpp b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/training_area_telegrams.cpp index 69a3d1265..3b210748c 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/training_area_telegrams.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/training_area_telegrams.cpp @@ -1,9 +1,6 @@ - - #include "training_area_telegrams.h" #include - #include #include #include @@ -12,7 +9,6 @@ namespace TrainingAreaBase { namespace TetraIcd { - JsonException::JsonException(const QJsonObject &obj, const QString &key) : m_obj(obj) , m_key(key) @@ -3063,10 +3059,8 @@ namespace TrainingAreaBase UAVAction UAVAction::fromJson(const QJsonObject &obj) { UAVAction ret; - get(obj, TASK(), ret.task); get(obj, POSITION(), ret.absPosition); - return ret; } @@ -3075,16 +3069,13 @@ namespace TrainingAreaBase return QJsonObject{{TASK(), enumToJson(task)}, {POSITION(), absPosition.toJson()}}; } - UAVPerformMission UAVPerformMission::fromJson(const QJsonObject &obj) { UAVPerformMission ret; - get(obj, HEADER(), ret.header); get(obj, ACTIONS(), ret.actions); get(obj, MISSION_NAME(), ret.missionName); get(obj, MISSION_ID(), ret.missionId); - return ret; } @@ -3093,14 +3084,11 @@ namespace TrainingAreaBase return QJsonObject{{HEADER(), header.toJson()}, {ACTIONS(), arrayToJson(actions)}, {MISSION_NAME(), missionName}, {MISSION_ID(), missionId}}; } - UAVStatus UAVStatus::fromJson(const QJsonObject &obj) { UAVStatus ret; - get(obj, HEADER(), ret.header); get(obj, UAVSTATE(), ret.uavState); - return ret; } @@ -3109,14 +3097,11 @@ namespace TrainingAreaBase return QJsonObject{{HEADER(), header.toJson()}, {UAVSTATE(), enumToJson(uavState)}}; } - UAVRadioLinkConnectionStatus UAVRadioLinkConnectionStatus::fromJson(const QJsonObject &obj) { UAVRadioLinkConnectionStatus ret; - get(obj, HEADER(), ret.header); get(obj, UAVCONNECTIONSTATE(), ret.uavConnectionState); - return ret; } @@ -3125,16 +3110,13 @@ namespace TrainingAreaBase return QJsonObject{{HEADER(), header.toJson()}, {UAVCONNECTIONSTATE(), enumToJson(uavConnectionState)}}; } - UAVMissionStatus UAVMissionStatus::fromJson(const QJsonObject &obj) { UAVMissionStatus ret; - get(obj, HEADER(), ret.header); get(obj, CURRENT_ACTION(), ret.currentAction); get(obj, CURRENT_MISSION_NAME(), ret.currentMissionName); get(obj, MISSION_ENDED(), ret.missionEnded); - return ret; } @@ -3146,14 +3128,11 @@ namespace TrainingAreaBase {MISSION_ENDED(), missionEnded}}; } - UAVChangeState UAVChangeState::fromJson(const QJsonObject &obj) { UAVChangeState ret; - get(obj, HEADER(), ret.header); get(obj, REQUESTED_STATE(), ret.requestedState); - return ret; } @@ -3165,11 +3144,9 @@ namespace TrainingAreaBase ExFireReadiness ExFireReadiness::fromJson(const QJsonObject &obj) { ExFireReadiness ret; - get(obj, HEADER(), ret.header); get(obj, PARTY_ID(), ret.partyId); get(obj, REFERENCE(), ret.reference); - return ret; } @@ -3181,7 +3158,6 @@ namespace TrainingAreaBase ExFiredReport ExFiredReport::fromJson(const QJsonObject &obj) { ExFiredReport ret; - get(obj, HEADER(), ret.header); get(obj, PARTY_ID(), ret.partyId); get(obj, REFERENCE(), ret.reference); @@ -3198,7 +3174,6 @@ namespace TrainingAreaBase ExConfirmationReport ExConfirmationReport::fromJson(const QJsonObject &obj) { ExConfirmationReport ret; - get(obj, HEADER(), ret.header); get(obj, PARTY_ID(), ret.partyId); get(obj, REFERENCE(), ret.reference); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/training_area_telegrams.h b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/training_area_telegrams.h index 2b5ea15f1..1493dfda9 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/training_area_telegrams.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Proxies/TrainingAreaBase/training_area_telegrams.h @@ -31,7 +31,6 @@ namespace TrainingAreaBase QByteArray m_what; }; - enum TelegramId { UNKNOWN = -1, @@ -130,22 +129,16 @@ namespace TrainingAreaBase UAV_RADIO_LINK_CONNECTION_STATUS = 9006, UAV_MISSION_STATUS = 9007, UAV_CHANGE_STATE = 9008, - - EX_FIRE_READINESS = 9100, EX_FIRED_REPORT = 9101, EX_CONFIRMATION_REPORT = 9102, }; - template struct Constraints; - - struct TrainingAreaTelegram { TrainingAreaTelegram() = default; virtual ~TrainingAreaTelegram() = default; - virtual QJsonObject toJson() const = 0; virtual QString type() const = 0; virtual TelegramId id() const = 0; @@ -340,17 +333,11 @@ namespace TrainingAreaBase enum class UAVRadioLinkConnectionStatusType { - Undefined = 0, - Disconnected = 1, - Connecting = 2, - Diconnecting = 3, - Connected = 4, - Error = 5, }; @@ -373,7 +360,6 @@ namespace TrainingAreaBase { int equipmentNumber = 0; qint64 timeStamp = 0; - static Header fromJson(const QJsonObject &obj); QJsonObject toJson() const; }; @@ -383,7 +369,6 @@ namespace TrainingAreaBase int offsetX = 0; int offsetY = 0; double offsetZ = 0; - explicit RelativePosition(int x = 0, int y = 0, double z = 0) : offsetX(x) , offsetY(y) @@ -395,7 +380,6 @@ namespace TrainingAreaBase QJsonObject toJson() const; }; - struct AbsolutePosition { double lon = 0; @@ -403,7 +387,6 @@ namespace TrainingAreaBase double z = 0; bool isValid() const { return (lon != 0 && lat != 0); } - static AbsolutePosition fromJson(const QJsonObject &obj); QJsonObject toJson() const; }; @@ -423,7 +406,6 @@ namespace TrainingAreaBase bool moreThan4SatellitesAvailable = false; bool dgpsModeAvailable = false; int pdopValue = 0; - static GpsQuality fromJson(const QJsonObject &obj); QJsonObject toJson() const; }; @@ -433,7 +415,6 @@ namespace TrainingAreaBase int gearTasCode = 0; int gearSerialNumber = 0; bool chargeCounting = false; - static Gear fromJson(const QJsonObject &obj); QJsonObject toJson() const; }; @@ -445,12 +426,10 @@ namespace TrainingAreaBase int chargeTypeId = 0; int remain = 0; int location = 0; - static GearCharge fromJson(const QJsonObject &obj); QJsonObject toJson() const; }; - struct WlsPosition { double x = 0; @@ -463,7 +442,6 @@ namespace TrainingAreaBase int playerOrientation = 0; int weaponOrientation = 0; bool isValid = false; - static WlsPosition fromJson(const QJsonObject &obj); QJsonObject toJson() const; }; @@ -478,7 +456,6 @@ namespace TrainingAreaBase bool gpsOn = false; bool inBlockedArea = false; WlsPosition relativePosition; - static WlsParticipantState fromJson(const QJsonObject &obj); QJsonObject toJson() const; }; @@ -504,7 +481,6 @@ namespace TrainingAreaBase int current() const { return m_current; } bool switchOrValue() const { return m_switchOrValue; } QString serialNumber() const { return m_serialNumber; } - static BatteryState fromJson(const QJsonObject &obj); QJsonObject toJson() const; }; @@ -513,11 +489,8 @@ namespace TrainingAreaBase { UAVActionTask task; AbsolutePosition absPosition; - - static QString TASK() { return QLatin1String("task"); } static QString POSITION() { return QLatin1String("position"); } - static UAVAction fromJson(const QJsonObject &obj); QJsonObject toJson() const; }; @@ -527,7 +500,6 @@ namespace TrainingAreaBase { qint64 timeStamp = 0; int32_t ackCounter = 0; - static Acknowledge fromJson(const QJsonObject &obj); QJsonObject toJson() const override; }; @@ -537,7 +509,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::BESTAETIGUNG; } }; - struct Init : TrainingAreaTelegramTmpl { Header header; @@ -546,7 +517,6 @@ namespace TrainingAreaBase bool resetManipulation = false; bool resetVulnerabilityState = false; bool restockSanitationMaterial = false; - static Init fromJson(const QJsonObject &obj); QJsonObject toJson() const override; }; @@ -556,13 +526,11 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::INIT; } }; - struct ManipulationReport : TrainingAreaTelegramTmpl { Header header; bool isManipulation = false; int equipmentFunctionId; - static ManipulationReport fromJson(const QJsonObject &obj); QJsonObject toJson() const override; }; @@ -572,12 +540,10 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::MANIPULATIONSMELDUNG; } }; - struct DemandBite : TrainingAreaTelegramTmpl { Header header; bool withSelfTest = false; - static DemandBite fromJson(const QJsonObject &obj); QJsonObject toJson() const override; }; @@ -592,7 +558,6 @@ namespace TrainingAreaBase { Header header; bool nbcProtectionActive = false; - static EquipmentOperationalState fromJson(const QJsonObject &obj); QJsonObject toJson() const override; }; @@ -602,7 +567,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::BETRIEBSZUSTAND_AUSSTATTUNG; } }; - struct VulnerabilityModelBase { Header header; @@ -610,7 +574,6 @@ namespace TrainingAreaBase int vulnerabilityModelAreaFire = 0; int vulnerabilityModelOperatingResource = 0; int vulnerabilityModelAcWeaponry = 0; - static void fromJson(const QJsonObject &obj, VulnerabilityModelBase &ret); QJsonObject toJson() const; }; @@ -628,11 +591,9 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::KONFIGURATION_WIRKMODELL; } }; - struct DemandEquipmentConfigurationReport : TrainingAreaTelegramTmpl { Header header; - static DemandEquipmentConfigurationReport fromJson(const QJsonObject &obj); QJsonObject toJson() const override; }; @@ -642,7 +603,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::ANFORDERUNG_KONFIGURATIONSDATEN; } }; - struct EquipmentConfigurationReport : TrainingAreaTelegramTmpl , VulnerabilityModelBase @@ -650,13 +610,10 @@ namespace TrainingAreaBase int equipmentNumber = 0; int canStartUpTime = 0; int equipmentType = 0; - int loginWaittimeBitweenTrys = 0; int loginMaxRetryCnt = 0; bool loginMasteringFlag = false; - int canDeviceConfiguration; - bool displayDeviceVoiceOutput = false; Language displayDeviceLanguage = Language::NoChange; bool pyrotechnics = false; @@ -711,9 +668,7 @@ namespace TrainingAreaBase int displayTextMainGroup; int displayTextSubGroup; - int vulnerabilityModelAgdus; - static EquipmentConfigurationReport fromJson(const QJsonObject &obj); QJsonObject toJson() const override; }; @@ -754,7 +709,6 @@ namespace TrainingAreaBase Header header; Reason reason = Reason::Unknown; int originTelegramId = 0; - static CtaDataError fromJson(const QJsonObject &obj); QJsonObject toJson() const override; }; @@ -780,7 +734,6 @@ namespace TrainingAreaBase struct RestoreRadioReadiness : public TrainingAreaTelegramTmpl { Header header; - RelativePosition readinessLossPosition; int readinessLossTime; RelativePosition readinessRestorePosition; @@ -801,7 +754,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::WIEDERHERSTELLUNG_FUNKBEREITSCHAFT; } }; - struct PositionReport : public TrainingAreaTelegramTmpl , PositionReportBase @@ -815,13 +767,11 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::POSITIONS_MELDUNG; } }; - struct PositionReportWithMountedEquipments : TrainingAreaTelegramTmpl , PositionReportBase { std::vector mountedEquipments; - static PositionReportWithMountedEquipments fromJson(const QJsonObject &obj); QJsonObject toJson() const override; }; @@ -835,7 +785,6 @@ namespace TrainingAreaBase { Header header; int aesDdsId = 0; - std::string name; int partyId = 0; RelativePosition relEffectPosition; @@ -859,7 +808,6 @@ namespace TrainingAreaBase { Header header; int action = 0; - static OcCommand fromJson(const QJsonObject &obj); QJsonObject toJson() const override; }; @@ -869,7 +817,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::SCHIEDSRICHTERKOMMANDO; } }; - struct CreateSingleExplosion : TrainingAreaTelegramTmpl , CreateCombatAreaEffectSimulationBase @@ -885,7 +832,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::WIRKFELD_EINZELGESCHOSS; } }; - struct CreateAreaExplosion : TrainingAreaTelegramTmpl , CreateCombatAreaEffectSimulationBase @@ -912,12 +858,9 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::WIRKFELD_FLAECHENDECKENDES_FEUER; } }; - struct PauseEffectSimulation : TrainingAreaTelegramTmpl { int aesDdsId = 0; - - static PauseEffectSimulation fromJson(const QJsonObject &obj); QJsonObject toJson() const override; }; @@ -927,16 +870,13 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::WIRKFELD_FLAECHENDECKENDES_FEUER_STOP; } }; - struct ResumeEffectSimulation : TrainingAreaTelegramTmpl { int aesDdsId = 0; - int sequelNumber = 0; int nextImpact = 0; qint64 resumeTime; int remainDuration; - static ResumeEffectSimulation fromJson(const QJsonObject &obj); QJsonObject toJson() const override; }; @@ -946,12 +886,10 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::WIRKFELD_FLAECHENDECKENDES_FEUER_FORTSETZEN; } }; - struct MineAreaSegment { RelativePosition relStart; RelativePosition relEnd; - static MineAreaSegment fromJson(const QJsonObject &obj); QJsonObject toJson() const; }; @@ -960,12 +898,9 @@ namespace TrainingAreaBase : TrainingAreaTelegramTmpl , CreateCombatAreaEffectSimulationBase { - - double layingDepth = 0; double layingDensity = 0; std::vector segments; - static CreateMineArea fromJson(const QJsonObject &obj); QJsonObject toJson() const override; }; @@ -975,14 +910,11 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::WIRKFELD_MINENSPERRE; } }; - struct MineAreaSingleMineState : TrainingAreaTelegramTmpl { int aesDdsId = 0; - int mineCount = 0; std::vector mineState; - static MineAreaSingleMineState fromJson(const QJsonObject &obj); QJsonObject toJson() const override; }; @@ -992,7 +924,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::WIRKFELD_STATUS_MINENSPERRE; } }; - struct CreateNContamination : TrainingAreaTelegramTmpl , CreateCombatAreaEffectSimulationBase @@ -1002,7 +933,6 @@ namespace TrainingAreaBase int borderLengthOuter = 0; double spanAngle = 0; double rotationAngle = 0; - static CreateNContamination fromJson(const QJsonObject &obj); QJsonObject toJson() const override; }; @@ -1012,7 +942,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::WIRKFELD_A_KAMPFMITTEL; } }; - struct CreateCContamination : TrainingAreaTelegramTmpl , CreateCombatAreaEffectSimulationBase @@ -1038,13 +967,10 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::WIRKFELD_C_KAMPFMITTEL; } }; - struct DeactivateEffectSimulation : TrainingAreaTelegramTmpl { AreaEffectSimulationType aesType = AreaEffectSimulationType::Unknown; int aesDdsId = 0; - - static DeactivateEffectSimulation fromJson(const QJsonObject &obj); QJsonObject toJson() const override; }; @@ -1054,14 +980,11 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::DEAKTIVIERUNG_WIRKFELD; } }; - struct ModifyAreaEffectSimulationName : TrainingAreaTelegramTmpl { AreaEffectSimulationType aesType = AreaEffectSimulationType::Unknown; int aesDdsId = 0; - std::string name; - static ModifyAreaEffectSimulationName fromJson(const QJsonObject &obj); QJsonObject toJson() const override; }; @@ -1071,7 +994,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::WIRKFELD_AENDERUNG_BEZEICHNER; } }; - struct MineTriggered : TrainingAreaTelegramTmpl { Header header; @@ -1090,12 +1012,10 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::DEAKTIVIERUNG_EINZELMINE; } }; - struct DusMineReactivation : TrainingAreaTelegramTmpl { Header header; std::vector dusSerialNumbers; - static DusMineReactivation fromJson(const QJsonObject &obj); QJsonObject toJson() const override; }; @@ -1105,7 +1025,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::REAKTIVIERUNG_DUS_MINE; } }; - enum class IedType { SuicideIed = 1, @@ -1139,7 +1058,6 @@ namespace TrainingAreaBase int iedId = 0; IedTacticalState tacticalState = IedTacticalState::Unknown; bool statePyrotechnics = false; - static void fromJson(const QJsonObject &obj, IedBaseData &ret); QJsonObject toJson() const; }; @@ -1172,7 +1090,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::DEFINITION_IED; } }; - enum class IedError { NoError = 0, @@ -1198,7 +1115,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::ZUSTAND_IED; } }; - struct DusSingleMineState : TrainingAreaTelegramTmpl { Header header; @@ -1207,7 +1123,6 @@ namespace TrainingAreaBase RelativePosition relPosition; int chargeTypeId = 0; bool state = false; - static DusSingleMineState fromJson(const QJsonObject &obj); QJsonObject toJson() const override; }; @@ -1217,13 +1132,11 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::STATUS_EINZELMINENSIMULATOR; } }; - struct CreateDusSingleMine : TrainingAreaTelegramTmpl , CreateCombatAreaEffectSimulationBase { int mineId; - static CreateDusSingleMine fromJson(const QJsonObject &obj); QJsonObject toJson() const override; }; @@ -1244,12 +1157,10 @@ namespace TrainingAreaBase int tasVitality = 0; int vulnerabilityBits = 0; int originatorId = 0; - static void fromJson(const QJsonObject &obj, StateChangeBase &ret); QJsonObject toJson() const; }; - struct StateChangeDirect : TrainingAreaTelegramTmpl , StateChangeBase @@ -1265,13 +1176,11 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::TREFFER_EREIGNIS_DUS; } }; - struct StateChangeIndirect : TrainingAreaTelegramTmpl , StateChangeBase { bool isSecondaryEffect = false; - static StateChangeIndirect fromJson(const QJsonObject &obj); QJsonObject toJson() const override; }; @@ -1281,14 +1190,12 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::TREFFER_EREIGNIS_WIRKSIMULATION; } }; - struct DemandVulnerabilityStateChange : TrainingAreaTelegramTmpl { Header header; int workstationId = 0; VulnerabilityState reqestedState = VulnerabilityState::CombatReady; int vulnerabilityVitalityIndex = 0; - static DemandVulnerabilityStateChange fromJson(const QJsonObject &obj); QJsonObject toJson() const override; }; @@ -1298,7 +1205,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::TREFFER_AUSLOESUNG; } }; - struct OperatorAction : TrainingAreaTelegramTmpl { Header header; @@ -1315,7 +1221,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::SCHIEDSRICHTEREINGRIFF; } }; - struct Reammunition { int chargeTypeId = 0; @@ -1343,13 +1248,11 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::SELEKTIVE_AUFMUNITIONIERUNG; } }; - struct StateChange : TrainingAreaTelegramTmpl , StateChangeBase { OriginatorType originatorType = OriginatorType::Initialisation; - static StateChange fromJson(const QJsonObject &obj); QJsonObject toJson() const override; }; @@ -1359,7 +1262,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::TAKTISCHER_STATUS; } }; - struct CreateFunctionalArea : TrainingAreaTelegramTmpl , CreateAreaEffectSimulationBase @@ -1382,14 +1284,12 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::FUNKTIONSRAUM; } }; - struct FunctionalAreaEntry : TrainingAreaTelegramTmpl { Header header; RelativePosition relPosition; int aesDdsId = 0; - static FunctionalAreaEntry fromJson(const QJsonObject &obj); QJsonObject toJson() const override; }; @@ -1399,7 +1299,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::EINTRETEN_FUNKTIONSRAUM; } }; - struct RequestBroadcastTelegrams : TrainingAreaTelegramTmpl { Header header; @@ -1415,7 +1314,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::NACHFORDERUNG_BROADCAST_TELEGRAMME; } }; - struct SpecialSensorData : TrainingAreaTelegramTmpl { Header header; @@ -1437,13 +1335,10 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::SONDERSENSORIK_FAHRSPUR; } }; - struct MinelayerTrailerDataBase { Header header; RelativePosition relPosition; - - int barrierId = 0; int layingDensity = 0; qint64 effectStart = 0; @@ -1468,7 +1363,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::SONDERSENSORIK_MIVANH_VERLEGEDATEN; } }; - struct MinelayerThrowerData : TrainingAreaTelegramTmpl , MinelayerTrailerDataBase @@ -1493,7 +1387,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::SONDERSENSORIK_WMIV_VERLEGEDATEN; } }; - struct MinelayerTrailerPosition : public TrainingAreaTelegramTmpl { Header header; @@ -1510,7 +1403,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::SONDERSENSORIK_MIVANH_VERLEGEPOSITION; } }; - struct LanguageSelection : TrainingAreaTelegramTmpl { Header header; @@ -1525,7 +1417,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::SPRACHAUSWAHL; } }; - struct EquipmentMessage : TrainingAreaTelegramTmpl { Header header; @@ -1541,7 +1432,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::ALLGEMEINE_NACHRICHT; } }; - struct EquipmentMessageOC : TrainingAreaTelegramTmpl { Header header; @@ -1549,7 +1439,6 @@ namespace TrainingAreaBase std::string message; int senderId = 0; int receiverId = 0; - static EquipmentMessageOC fromJson(const QJsonObject &obj); QJsonObject toJson() const override; }; @@ -1575,7 +1464,6 @@ namespace TrainingAreaBase QJsonObject toJson() const; }; - struct OpaquePayloadDataOut : TrainingAreaTelegramTmpl , OpaquePayloadDataBase @@ -1589,7 +1477,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::DATENVERKEHR_TDS_SRT; } }; - struct OpaquePayloadDataIn : TrainingAreaTelegramTmpl , OpaquePayloadDataBase @@ -1606,7 +1493,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::DATENVERKEHR_SRT_TDS; } }; - struct EquipmentEvent : TrainingAreaTelegramTmpl { Header header; @@ -1626,7 +1512,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::GERAETEEREIGNIS; } }; - struct EquipmentGearAssignment : TrainingAreaTelegramTmpl { Header header; @@ -1641,12 +1526,10 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::WAFFENZUORDNUNG; } }; - struct EquipmentGearChargeState : TrainingAreaTelegramTmpl { Header header; std::vector charges; - static EquipmentGearChargeState fromJson(const QJsonObject &obj); QJsonObject toJson() const override; }; @@ -1656,13 +1539,11 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::MUNITIONSVORRAT_EINER_ZUGEORDNETEN_WAFFE; } }; - struct ExerciseEnvironmentData : TrainingAreaTelegramTmpl { Header header; int exerciseId = 0; int timeZone = 90; - int utmZone = 0; int utmBand = 0; std::string grid; @@ -1676,7 +1557,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::UMGEBUNGS_MELDUNG2; } }; - struct BiteError { int errorNumber = 0; @@ -1713,7 +1593,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::BITE_MELDUNG2; } }; - struct EquipmentGearEvent : TrainingAreaTelegramTmpl { Header header; @@ -1729,11 +1608,9 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::FEUEREREIGNIS_MIT_WAFFENZUORDNUNG; } }; - struct CesHitInformation : TrainingAreaTelegramTmpl { Header header; - int chargeTasCodeDirect = 0; int chargeTasCodeIndirect = 0; int originatorEquipmentNumber = 0; @@ -1750,7 +1627,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::AUSLOESUNG_DUS_TREFFER; } }; - struct ParticipantSwVersionsRequest : TrainingAreaTelegramTmpl { Header header; @@ -1776,7 +1652,6 @@ namespace TrainingAreaBase QJsonObject toJson() const; }; - struct ParticipantSwVersions : TrainingAreaTelegramTmpl { Header header; @@ -1791,7 +1666,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::SW_VERSIONSMELDUNG; } }; - struct CesHitRequest : TrainingAreaTelegramTmpl { Header header; @@ -1799,7 +1673,6 @@ namespace TrainingAreaBase int chargeTasCodeIndirect = 0; int originatorEquipmentNumber = 0; int aesDdsId = 0; - AreaEffectSimulationType aesType = AreaEffectSimulationType::Unknown; int mineId = 0; int remainEffectPercent = 0; @@ -1818,12 +1691,10 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::TREFFER_EREIGNIS_SEKUNDAERWIRKUNG; } }; - struct TechnicalArea : TrainingAreaTelegramTmpl { Header header; int aesDdsId = 0; - enum Type { Reserved = 0, @@ -1847,7 +1718,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::TECHNIK_FUNKTIONSRAUM; } }; - struct ParticipantModeBase { Header header; @@ -1910,7 +1780,6 @@ namespace TrainingAreaBase QJsonObject toJson() const; }; - struct ParticipantMode : TrainingAreaTelegramTmpl , ParticipantModeBase @@ -1924,7 +1793,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::TEILNEHMERMODE_SETZEN; } }; - struct ParticipantModeReport : TrainingAreaTelegramTmpl , ParticipantModeBase @@ -1938,7 +1806,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::TEILNEHMERMODE_MELDUNG; } }; - struct DemandParticipantMode : TrainingAreaTelegramTmpl { Header header; @@ -1952,7 +1819,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::TEILNEHMERMODE_ANFORDERN; } }; - struct ParticipantConfigurationBase { Header header; @@ -1993,7 +1859,6 @@ namespace TrainingAreaBase QJsonObject toJson() const; }; - struct ParticipantConfigurationReport : TrainingAreaTelegramTmpl , ParticipantConfigurationBase @@ -2007,7 +1872,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::TEILNEHMER_KONFIG_ANTWORT; } }; - struct ParticipantConfiguration : TrainingAreaTelegramTmpl , ParticipantConfigurationBase @@ -2021,7 +1885,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::TEILNEHMER_KONFIG_SETZEN; } }; - struct DemandParticipantConfiguration : TrainingAreaTelegramTmpl { Header header; @@ -2035,7 +1898,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::TEILNEHMER_KONFIG_ANFORDERN; } }; - struct SanitationRepair : TrainingAreaTelegramTmpl { Header header; @@ -2067,7 +1929,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::SANITAETSDIENST_INSTANDSETZUNG; } }; - struct SanitaryMaterialStockReport : TrainingAreaTelegramTmpl { Header header; @@ -2086,7 +1947,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::BESTANDSMELDUNG_SANITAETSMATERIAL; } }; - struct Sanitation : TrainingAreaTelegramTmpl { Header header; @@ -2105,7 +1965,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::SANITAETSDIENST_INSTANDSETZUNG_PVSAN; } }; - struct ExerciseStateData : TrainingAreaTelegramTmpl { Header header; @@ -2130,7 +1989,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::BETRIEBSZUSTANDSMELDUNG; } }; - struct EmergencyCall : TrainingAreaTelegramTmpl { int issi = 0; @@ -2146,7 +2004,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::NOTRUF; } }; - struct RequestBroadcastStatistics : TrainingAreaTelegramTmpl { Header header; @@ -2160,7 +2017,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::ANFORDERUNG_STATISTIK_BROADCAST_NACHFORDERUNGEN; } }; - struct BroadcastInformation { int equipmentNumber = 0; @@ -2184,7 +2040,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::STATISTIK_BROADCAST_NACHFORDERUNGEN; } }; - struct GroupIssiInformation { int exerciseId = 0; @@ -2196,7 +2051,6 @@ namespace TrainingAreaBase QJsonObject toJson() const; }; - struct ExerciseEquipmentAssignmentComplete : TrainingAreaTelegramTmpl { std::unordered_map> exerciseEquipmentAssignments; @@ -2211,7 +2065,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::EXERCISE_EQUIPMENT_ASSIGNMENT_COMPLETE; } }; - struct ProxyConnectionState : public TrainingAreaTelegramTmpl { bool connectedToSystem = false; @@ -2225,7 +2078,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::PROXY_CONNECTION_STATE; } }; - struct ParticipantLicenseChange : public TrainingAreaTelegramTmpl { int equipmentNumber = 0; @@ -2240,7 +2092,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::PARTICIPANT_LICENSE_CHANGE; } }; - struct WlsParticipantsStateRequest : public TrainingAreaTelegramTmpl { static WlsParticipantsStateRequest fromJson(const QJsonObject &obj); @@ -2252,7 +2103,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::WLS_PARTICIPANTS_STATE_REQUEST; } }; - struct WlsParticipantsStateReport : public TrainingAreaTelegramTmpl { std::vector participantStates; @@ -2266,7 +2116,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::WLS_PARTICIPANTS_STATE_REPORT; } }; - struct WlsBinarySfmData : public TrainingAreaTelegramTmpl { Header header; @@ -2281,7 +2130,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::WLS_BINARY_SFM_DATA; } }; - struct WlsParticipantsConnectionState : public TrainingAreaTelegramTmpl { int equipmentNumber = 0; @@ -2296,7 +2144,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::WLS_PARTICIPANT_CONNECTION_STATE; } }; - struct ApacheLaserDesignation : TrainingAreaTelegramTmpl { Header header; @@ -2314,7 +2161,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::APACHE_LASER_DESIGNATION; } }; - struct BatteryInfo : TrainingAreaTelegramTmpl { Header header; @@ -2329,7 +2175,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::BATTERY_INFO; } }; - struct BatteryAlarm : TrainingAreaTelegramTmpl { Header m_header; @@ -2356,7 +2201,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::BATTERY_ALARM; } }; - struct ServiceControl : TrainingAreaTelegramTmpl { Header header; @@ -2371,7 +2215,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::SERVICE_CONTROL; } }; - struct SetDevicePowerRequest : TrainingAreaTelegramTmpl { Header header; @@ -2387,7 +2230,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::DEVICE_POWER_SET_REQUEST; } }; - struct UAVPerformMission : TrainingAreaTelegramTmpl { Header header; @@ -2409,7 +2251,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::UAV_PERFORM_MISSION; } }; - struct UAVStatus : TrainingAreaTelegramTmpl { Header header; @@ -2427,7 +2268,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::UAV_STATUS; } }; - struct UAVRadioLinkConnectionStatus : TrainingAreaTelegramTmpl { Header header; @@ -2445,7 +2285,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::UAV_RADIO_LINK_CONNECTION_STATUS; } }; - struct UAVMissionStatus : TrainingAreaTelegramTmpl { Header header; @@ -2467,7 +2306,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::UAV_MISSION_STATUS; } }; - struct UAVChangeState : TrainingAreaTelegramTmpl { Header header; @@ -2485,17 +2323,13 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::UAV_CHANGE_STATE; } }; - struct ExFireReadiness : TrainingAreaTelegramTmpl { Header header; int partyId; QString reference; - - static ExFireReadiness fromJson(const QJsonObject &obj); QJsonObject toJson() const override; - static QString HEADER() { return QLatin1String("header"); } static QString PARTY_ID() { return QLatin1String("partyId"); } static QString REFERENCE() { return QLatin1String("reference"); } @@ -2507,7 +2341,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::EX_FIRE_READINESS; } }; - struct ExFiredReport : TrainingAreaTelegramTmpl { Header header; @@ -2515,10 +2348,8 @@ namespace TrainingAreaBase QString reference; QString unitIdentifier; QString identifier; - static ExFiredReport fromJson(const QJsonObject &obj); QJsonObject toJson() const override; - static QString HEADER() { return QLatin1String("header"); } static QString PARTY_ID() { return QLatin1String("partyId"); } static QString REFERENCE() { return QLatin1String("reference"); } @@ -2531,7 +2362,6 @@ namespace TrainingAreaBase static constexpr TelegramId id() { return TelegramId::EX_FIRED_REPORT; } }; - struct ExConfirmationReport : TrainingAreaTelegramTmpl { Header header; @@ -2539,7 +2369,6 @@ namespace TrainingAreaBase QString reference; QString unitIdentifier; QString identifier; - static ExConfirmationReport fromJson(const QJsonObject &obj); QJsonObject toJson() const override; @@ -2554,6 +2383,5 @@ namespace TrainingAreaBase static QString type() { return QStringLiteral("ExConfirmationReport"); } static constexpr TelegramId id() { return TelegramId::EX_CONFIRMATION_REPORT; } }; - } } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/CMakeLists.txt index 08781d614..cca307670 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/CMakeLists.txt @@ -20,15 +20,6 @@ SET(SRCS_common logger.h ) -# pdm_types.h was a migration-scaffolding stub with no qt5 counterpart and -# no consumer; the stub in include/ was removed and the copy with it. - -# pdm_translation.h and pdm_enums.hpp stub copies (OFF-variant fallbacks whose -# include/ sources were removed together with the other shadowing stubs): -# with BUILD_GRANTLEE=ON and BUILD_RTI=ON the codegen writes the real files to -# these build-dir paths, so the copies are gone rather than kept for forbidden -# OFF variants. - # Define target name early for use in subsequent macros SET(PDM_COMMON_TARGET svcPdmCommon) @@ -193,9 +184,7 @@ ENDIF() # # --- Executable svcProjectDataManagement (sPDM) ------------------------------------------------- # -# The executable links LtsWebSocketServer, which was pruned from the -# tree (prune commit 7fc6f6664), so the target is only created when the -# module is present. +# The executable links LtsWebSocketServer IF(EXISTS "${CMAKE_SOURCE_DIR}/Lts/Common/LtsWebSocket") LIST(APPEND SRCS_exe convert_db_to_dds.h diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/chargetype_rename.cpp b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/chargetype_rename.cpp index ec9a21156..2b8dc527f 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/chargetype_rename.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/chargetype_rename.cpp @@ -48,7 +48,6 @@ void ChargeTypeRename::onUpdateChargeNamesRequest(const rti::core::SampleIdentit } m_dds->fts()->updateChargeNamesReply(cookie, Core::FunctionReplyObject(ct.id)); - m_dds->dts()->publish(Database::convert(ct)); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/chargetype_rename.h b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/chargetype_rename.h index 896d3ac43..495f4dd8b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/chargetype_rename.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/chargetype_rename.h @@ -9,7 +9,6 @@ #include #include - #include "logger.h" namespace ProjectDataManagement diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/DdsView/rw/rwwidgets.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/DdsView/rw/rwwidgets.cpp index 47fe52c74..d7f93c263 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/DdsView/rw/rwwidgets.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/DdsView/rw/rwwidgets.cpp @@ -26,7 +26,6 @@ void MyLabel::mousePressEvent(QMouseEvent *ev) /****************************************************************/ - ResizableStackedWidget::ResizableStackedWidget(QWidget *parent) : QStackedWidget(parent) { @@ -58,7 +57,6 @@ void ResizableStackedWidget::onCurrentChanged(int index) /****************************************************************/ - RWWidget::RWWidget(QWidget *parent) : QWidget(parent) , m_label(new MyLabel(this)) @@ -95,8 +93,6 @@ void RWWidget::onSetWritablePrivate() } /****************************************************************/ - - RWSpinBox::RWSpinBox(RwMode readOnly, QWidget *parent) : RWWidget(parent) , m_spinBox(readOnly == RwMode::ReadOnly ? nullptr : new QSpinBox(this)) @@ -136,8 +132,6 @@ int RWSpinBox::value() const } /*****************************************************/ - - RWDoubleSpinBox::RWDoubleSpinBox(RwMode readOnly, QWidget *parent) : RWWidget(parent) , m_doubleSpinBox(readOnly == RwMode::ReadOnly ? nullptr : new QDoubleSpinBox(this)) @@ -188,7 +182,6 @@ double RWDoubleSpinBox::value() const /*****************************************************/ - RWCheckBox::RWCheckBox(RwMode readOnly, QWidget *parent) : RWWidget(parent) , m_checkBox(readOnly == RwMode::ReadOnly ? nullptr : new QCheckBox(this)) @@ -248,7 +241,6 @@ QString RWLineEdit::text() const /*****************************************************/ - RWComboBox::RWComboBox(RwMode readOnly, QWidget *parent) : RWWidget(parent) , m_comboBox(readOnly == RwMode::ReadOnly ? nullptr : new QComboBox(this)) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/AddLine.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/AddLine.cpp index 5044245c7..ce6c470ae 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/AddLine.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/AddLine.cpp @@ -1,18 +1,13 @@ #include "AddLine.h" - #include "ui_AddLinesUi.h" - #include - AddLines::AddLines(QWidget* parent) : QDialog(parent) , m_ui(new Ui::AddLines) { qRegisterMetaType("AddModel*"); - - m_ui->setupUi(this); - + m_ui->setupUi(this); m_ui->dataView->setModel(&addModel); connect(m_ui->pbDone, &QPushButton::clicked, @@ -28,21 +23,17 @@ AddLines::AddLines(QWidget* parent) this, &AddLines::slotClear); } - AddLines::~AddLines() { delete m_ui; } - void AddLines::slotDeleteLines() { - //qWarning() << "slotDeleteLines"; - + //qWarning() << "slotDeleteLines"; while (m_ui->dataView->selectionModel()->selectedRows().count()) { const QModelIndexList selectedRows = m_ui->dataView->selectionModel()->selectedRows(); - if (selectedRows.at(0).row() == addModel.rowCount()-1) // do not delete empty row! { return; // In hope that the selectedRows list is sorted..... @@ -52,27 +43,23 @@ void AddLines::slotDeleteLines() } } - void AddLines::slotClear() { //qWarning() << "slotClear"; addModel.clear(); } - void AddLines::reject() { emit signalAddLines(nullptr); } - void AddLines::copyDataFromModel(DataModel* dataModel) { addModel.setHeaderList(dataModel->getHeaderList()); addModel.setTablename(dataModel->getTableName()); } - void AddLines::slotAddLines() { this->hide(); // hide until in work.. diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/AddLine.h b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/AddLine.h index c64195e21..8f6a87c72 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/AddLine.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/AddLine.h @@ -1,7 +1,6 @@ #pragma once #include "AddModel.h" - #include namespace Ui @@ -9,7 +8,6 @@ namespace Ui class AddLines; } - class AddLines : public QDialog { Q_OBJECT @@ -17,7 +15,6 @@ class AddLines : public QDialog public: explicit AddLines(QWidget *parent = nullptr); ~AddLines(); - void copyDataFromModel(DataModel* dataModel); protected: diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/AddModel.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/AddModel.cpp index f97c718d6..2b5e189bc 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/AddModel.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/AddModel.cpp @@ -1,8 +1,6 @@ #include "AddModel.h" - #include - void AddModel::setHeaderList(const HeaderList& headerList) { m_headerList = headerList; @@ -10,17 +8,14 @@ void AddModel::setHeaderList(const HeaderList& headerList) endResetModel(); } - const HeaderList& AddModel::getHeaderList() const { return m_headerList; } - bool AddModel::removeRow(int row, const QModelIndex &parent) { //qWarning() << "removeRow"; - (void)parent; if (row >= m_dataList.count()) @@ -36,7 +31,6 @@ bool AddModel::removeRow(int row, const QModelIndex &parent) return true; } - void AddModel::clear() { beginResetModel(); @@ -44,7 +38,6 @@ void AddModel::clear() endResetModel(); } - QVariant AddModel::data(const QModelIndex &index, int role) const { switch (role) @@ -96,7 +89,6 @@ bool AddModel::setData(const QModelIndex &index, const QVariant &value, int role return true; } - QMetaType::Type AddModel::getColumnType(const int column) const { if (column < 0 || column >= m_headerList.size()) @@ -104,7 +96,6 @@ QMetaType::Type AddModel::getColumnType(const int column) const return m_headerList.at(column).second; } - QVariant AddModel::headerData(int section, Qt::Orientation orientation, int role) const { if (orientation != Qt::Horizontal) @@ -121,19 +112,16 @@ QVariant AddModel::headerData(int section, Qt::Orientation orientation, int role return QVariant(); } - int AddModel::rowCount(const QModelIndex &) const { return m_dataList.count() + 1 /* empty row for new data */; // yes, if the user wants to add more than 1 line! } - int AddModel::columnCount(const QModelIndex &) const { return m_headerList.count(); } - Qt::ItemFlags AddModel::flags(const QModelIndex &) const { return Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable; @@ -145,7 +133,6 @@ void AddModel::setTablename(const QString& tableName) m_tableName = tableName; } - const QString& AddModel::getTableName() const { return m_tableName; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/BrowserWnd.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/BrowserWnd.cpp index 36ef5ee70..654a3571d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/BrowserWnd.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/BrowserWnd.cpp @@ -13,7 +13,6 @@ #include #include - BrowserWnd::BrowserWnd() : QWidget(nullptr) , m_loginWnd(new LoginWnd(this)) @@ -49,13 +48,11 @@ BrowserWnd::~BrowserWnd() delete m_loginWnd; } - void BrowserWnd::slotAddNewQuery() { addNewQuery(); } - void BrowserWnd::slotConnectResult(const QString &result) { if (result.isEmpty()) // connection success! @@ -70,9 +67,7 @@ void BrowserWnd::slotConnectResult(const QString &result) m_ui->splitter->setStretchFactor(1, 1); // stretch the query widget this->show(); - addNewQuery(); - refreshTableList(); connect(m_ui->leFilter, &QLineEdit::textChanged, this, &BrowserWnd::slotFilterTableList); @@ -94,13 +89,11 @@ void BrowserWnd::slotConnectResult(const QString &result) m_waitWnd->hide(); } - void BrowserWnd::slotFilterTableList(const QString &) { refreshTableList(); } - void BrowserWnd::addNewQuery(const QString &tableName) // tableName only set when query from double clicking table list { Query *query = new Query(m_queryWorker); @@ -127,7 +120,6 @@ void BrowserWnd::addNewQuery(const QString &tableName) // tableName only set whe // m_waitWnd->setStatus(percent); //} - void BrowserWnd::endThread() { if (!m_queryThread) @@ -143,17 +135,13 @@ void BrowserWnd::endThread() m_queryWorker = nullptr; } - void BrowserWnd::refreshTableList() { m_ui->lwTables->clear(); - m_waitWnd->wait(QStringLiteral("Refreshing Table List ..")); - emit signalGetTableList(); } - void BrowserWnd::slotNewTableList(QStringList tables) { if (!m_ui->leFilter->text().isEmpty()) // filter when there is a filter @@ -163,15 +151,12 @@ void BrowserWnd::slotNewTableList(QStringList tables) } m_ui->lwTables->addItems(tables); - m_waitWnd->hide(); } - void BrowserWnd::startConnect() { //m_loginWnd->setDefaultLoginData(presetManager. defaultLoginData); - if (!m_loginWnd->exec()) // false = user reject { QCoreApplication::quit(); @@ -179,11 +164,9 @@ void BrowserWnd::startConnect() } m_waitWnd->wait(tr("Connecting ..")); - emit signalConnect(m_loginWnd->getLoginData()); } - bool BrowserWnd::test() { if (QSqlDatabase::drivers().isEmpty() || @@ -193,25 +176,20 @@ bool BrowserWnd::test() tr("Missing Qt PostgreSQL driver"), tr("There is no QPSQL driver." "\nDid you install the package 'libQt5Sql5-postgresql'?")); - return false; } - return true; } - void BrowserWnd::slotFilterTableItemChanged(QListWidgetItem *item) { QString tableName = item->text(); addNewQuery(tableName); } - void BrowserWnd::slotTabCloseRequested(int index) { Query *q = qobject_cast(m_ui->twQueries->widget(index)); - m_ui->twQueries->removeTab(index); if (!q) @@ -220,19 +198,16 @@ void BrowserWnd::slotTabCloseRequested(int index) delete q; // It´s safe to delete nullptr; } - void BrowserWnd::slotShowWait(const QString &msg) { m_waitWnd->wait(msg); } - void BrowserWnd::slotHideWait() { m_waitWnd->hide(); } - void BrowserWnd::slotHeart() { QWidget *w = new QWidget; @@ -246,6 +221,5 @@ void BrowserWnd::slotHeart() l->setGraphicsEffect(shadow); b->addWidget(l); w->setLayout(b); - w->show(); } diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/BrowserWnd.h b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/BrowserWnd.h index 3cff1f5f6..2b1cb9096 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/BrowserWnd.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/BrowserWnd.h @@ -6,7 +6,6 @@ #include - class QListWidgetItem; class Query; @@ -15,7 +14,6 @@ namespace Ui class BrowserWnd; } - class BrowserWnd: public QWidget { Q_OBJECT @@ -49,7 +47,6 @@ private slots: void slotConnectResult(const QString &); void slotNewTableList(QStringList); void slotHeart(); - /*void slotSelectQueryResult(QString errorMsg, DataModel* dataModel); void slotSelectQueryStatus(int percent); void slotQueryQuery(QString); // when the query widget starts a query....*/ @@ -57,8 +54,6 @@ private slots: /*void slotExecute(QString, QVariant, QModelIndex); void slotExecuteQueryResult(bool success, QString msg, QVariant val, QModelIndex onThisPosition);*/ void slotAddNewQuery(); - - void slotShowWait(const QString &msg); void slotHideWait(); diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/CMakeLists.txt index 658da5c1a..77d57fe7c 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/CMakeLists.txt @@ -14,7 +14,6 @@ else() set(Qt6_Widgets "") endif() - SET(my_SRCS main.cpp LoginWnd.cpp @@ -46,7 +45,6 @@ SET(my_UICS ) set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/ui) - NGL_ADD_TOOL_ICON(my_SRCS "sql") NGL_WRAP_UI(my_SRCS ${my_UICS}) NGL_ADD_EXECUTABLE(AAR SV WS NO_TRANSLATION sqlbrowser ${my_SRCS} ${my_UICS}) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/DataModel.cpp b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/DataModel.cpp index ebfe73739..9fcbcb2c2 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/DataModel.cpp +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/DataModel.cpp @@ -9,7 +9,6 @@ //#define WAIT_FOR_IDLE while (!m_idle) { QThread::msleep(50); } (void)m_idle - DataModel::DataModel(QObject *parent) // [M]VC : QAbstractTableModel(parent) , m_idle(true) @@ -28,19 +27,16 @@ DataModel::DataModel(QObject *parent) // [M]VC // endResetModel(); //} - void DataModel::dataListReserve(const int size) { m_newDataList.reserve(size); } - void DataModel::addLine(const Data& data) { m_newDataList.append(data); } - void DataModel::addColumn(const QString& columnName, QMetaType::Type type) { // QPair pair; @@ -49,7 +45,6 @@ void DataModel::addColumn(const QString& columnName, QMetaType::Type type) m_newHeaderList.append(QPair(columnName, type)); } - void DataModel::slotSwapLists() // for threading.. { m_dataList = m_newDataList; @@ -62,32 +57,27 @@ void DataModel::slotSwapLists() // for threading.. endResetModel(); } - void DataModel::setTableName(const QString &tableName) { m_tableName = tableName; setEditable(!m_tableName.isEmpty()); // editable items depend on wether it's a custom query, or a table list query } - QString DataModel::getTableName() const { return m_tableName; } - int DataModel::rowCount(const QModelIndex &parent) const { return parent.isValid() ? 0 : m_dataList.count(); } - int DataModel::columnCount(const QModelIndex &parent) const { return parent.isValid() ? 0 : m_headerList.count(); } - QVariant DataModel::data(const QModelIndex &index, int role) const { if (index.row() >= m_dataList.count()) @@ -127,7 +117,6 @@ QVariant DataModel::data(const QModelIndex &index, int role) const return QVariant(); } - QVariant DataModel::headerData(int section, Qt::Orientation orientation, int role) const { if (orientation == Qt::Horizontal && section >= 0 && section < m_headerList.size()) @@ -145,7 +134,6 @@ QVariant DataModel::headerData(int section, Qt::Orientation orientation, int rol return QAbstractTableModel::headerData(section, orientation, role); } - void DataModel::setEditable(bool editable) { resetFlags(); @@ -154,19 +142,16 @@ void DataModel::setEditable(bool editable) m_flags |= Qt::ItemIsEditable; } - const HeaderList& DataModel::getHeaderList() const { return m_headerList; } - void DataModel::resetFlags() { m_flags = Qt::ItemIsSelectable | Qt::ItemIsEnabled; } - Qt::ItemFlags DataModel::flags(const QModelIndex &index) const { Q_UNUSED(index); @@ -174,7 +159,6 @@ Qt::ItemFlags DataModel::flags(const QModelIndex &index) const return m_flags; } - void DataModel::slotSetData(const QModelIndex &index, const QVariant &value) { Data row = m_dataList.at(index.row()); // get row from data list @@ -197,7 +181,6 @@ bool DataModel::setData(const QModelIndex &index, const QVariant &value, int rol return false; // ALWAYS! as we need to wait for a result (which is async) } - void DataModel::deleteLines(const QList &affectedRowsList) { if (affectedRowsList.isEmpty()) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/WaitWnd.h b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/WaitWnd.h index af461a2c3..b41b1c206 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/WaitWnd.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Tools/SqlBrowser/WaitWnd.h @@ -2,13 +2,11 @@ #include - namespace Ui { class WaitWnd; } - class WaitWnd: public QDialog { Q_OBJECT