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
@@ -1,6 +1,4 @@
|
||||
|
||||
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QObject>
|
||||
@@ -60,8 +58,6 @@ private:
|
||||
int m_exerciseId;
|
||||
};
|
||||
|
||||
|
||||
|
||||
class RecvFromDdsAes : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
@@ -95,21 +91,15 @@ public:
|
||||
}
|
||||
|
||||
void resetAllDusMines();
|
||||
|
||||
|
||||
std::shared_ptr<AreaEffectSimulation::Interface::Dtc> dtcAes() const { return m_dtcAes;}
|
||||
|
||||
private:
|
||||
|
||||
template<typename T>
|
||||
void handleEffectSimulation(const T &data, DataModification modType, TetraIcd::AreaEffectSimulationType aesType);
|
||||
|
||||
|
||||
template<typename T>
|
||||
void fillCentralChangesTable(const T &data);
|
||||
template <typename T>
|
||||
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<AreaEffectSimulation::AesItem, T>::value, "Given type for sendResumeEffectSimulation is not an aes item!");
|
||||
}
|
||||
|
||||
|
||||
void doSpecialization(const AreaEffectSimulation::ExplosionArea &data, std::unordered_map<int, AreaEffectSimulation::ExplosionArea> &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<PdmHandler> pdm();
|
||||
|
||||
template<typename T>
|
||||
void txData(const T &tele)
|
||||
{
|
||||
@@ -348,19 +330,12 @@ private:
|
||||
std::unordered_map<int, AreaEffectSimulation::TechnicalArea> m_currentTechnicalArea;
|
||||
std::unordered_map<int, AreaEffectSimulation::DusSingleMine> m_currentDusSingleMine;
|
||||
std::unordered_map<int, AreaEffectSimulation::GasPipe> m_currentGasPipes;
|
||||
|
||||
|
||||
std::unordered_map<int, AreaEffectSimulation::BoobyTrap> m_currentBoobyTraps;
|
||||
|
||||
|
||||
std::unordered_map<int, AreaEffectSimulation::OffRouteMine> m_currentOffRouteMines;
|
||||
|
||||
|
||||
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
|
||||
std::shared_ptr<SendToTab> m_txCallback;
|
||||
std::shared_ptr<AreaEffectSimulation::Interface::Dtc> m_dtcAes;
|
||||
std::shared_ptr<AesStateHandler> m_aesStateHandler;
|
||||
|
||||
QMap<int, AreaEffectSimulation::AesEffectState> m_currentEffectState;
|
||||
QMap<int, AreaEffectSimulation::DusMine> m_allReactivatableDusMines;
|
||||
QVector<int> m_minesToSend;
|
||||
@@ -368,7 +343,6 @@ private:
|
||||
MainHandler *m_mainHandler;
|
||||
QTimer *m_checkOutdatedTelegramsTimer;
|
||||
QTimer *m_sendDusMineReactivtionTimer;
|
||||
|
||||
QVector<TetraIcd::TrainingAreaTelegram*> m_sentAesTelegrams;
|
||||
QVector<int> m_sentAesTelegramsAesIds;
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user