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.
This commit is contained in:
1 parent
e60a860283
commit
84f8cfb41f
45 files changed
+30
-724
No files matched your search
@@ -19,10 +19,8 @@
|
||||
#include <LtsPluginManager/lts_plugin_loader.h>
|
||||
#include <TrainingAreaBase/tab_record_replay_plugin.h>
|
||||
#include <TrainingAreaBase/tab_record_replay_plugin_custom.h>
|
||||
|
||||
#include <nglsettings/nglsettings_connections.h>
|
||||
#include <ngldb/nsqlquery.h>
|
||||
|
||||
#include <QUuid>
|
||||
#include <QJsonDocument>
|
||||
#include <QSqlDatabase>
|
||||
@@ -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<Plugin::Interface> &ifc : m_interfaces)
|
||||
m_txHandler->addTxHandler(ifc->sendToTab());
|
||||
|
||||
|
||||
|
||||
// WebSocketServer
|
||||
m_handlerWebSocket = std::make_shared<WebSocketInterface::WebSocketInterfaceHandler>(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)
|
||||
|
||||
Reference in new issue
Block a user