Qt6 Migration: Complete migration with DDS/RTI support and build validation
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
@@ -0,0 +1,128 @@
|
||||
/**
|
||||
* FrequencySetHandler - reads CnrChannel and CnrConfig data from the database and publishes the data to dds,
|
||||
* reacts to CnrConfig related Function topics
|
||||
* $Id: combat_net_radio_handler.cpp 34946 2017-08-21 14:13:32Z baeuerle_h $
|
||||
* $HeadURL: svn://slssvn/TDS/branches/product/devel/trunk/Lts/Services/AudioVideoManagement/combat_net_radio_handler.cpp $
|
||||
* $Author: baeuerle_h $
|
||||
* Created by Hannes Baeuerle, SLSE, 2017-08-15
|
||||
*/
|
||||
|
||||
#include "frequency_set_handler.h"
|
||||
#include "dds_handler.h"
|
||||
#include "main_handler.h"
|
||||
#include <AudioVideoManagement/avm_dts.h>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
{
|
||||
|
||||
FrequencySetHandler::FrequencySetHandler(Interface::Dts *dts, DatabaseInterface *db)
|
||||
: m_dts(dts)
|
||||
, m_db(db)
|
||||
, m_logger(getLogger("FrequencySetHandler"))
|
||||
{
|
||||
Q_ASSERT(dts);
|
||||
Q_ASSERT(db);
|
||||
}
|
||||
|
||||
bool FrequencySetHandler::init()
|
||||
{
|
||||
DEBUG_LOG(m_logger) << LOGFUNCTION;
|
||||
QVector<Database::AvmFrequencySet> frequencySets;
|
||||
|
||||
// Don't use select() with callback here as the callback (body of for-loop below) would use the DB, too.
|
||||
if (!m_db->select(frequencySets))
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Error while selecting frequency sets from db";
|
||||
return false;
|
||||
}
|
||||
DEBUG_LOG(m_logger) << "Found " << frequencySets.size() << " Frequency Sets";
|
||||
|
||||
for (const Database::AvmFrequencySet ¤tfrequencySet : qAsConst(frequencySets))
|
||||
addFrequencySet(toDdsFrequencySet(currentfrequencySet));
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool FrequencySetHandler::isValid(int32_t setId, int32_t entryId)
|
||||
{
|
||||
auto found = m_frequencySetDatas.constFind(setId);
|
||||
if (found == m_frequencySetDatas.cend())
|
||||
return false;
|
||||
|
||||
return found->contains(entryId);
|
||||
}
|
||||
|
||||
FrequencySet FrequencySetHandler::toDdsFrequencySet(const Database::AvmFrequencySet &dbData) const
|
||||
{
|
||||
FrequencySet result;
|
||||
|
||||
result.id(dbData.id);
|
||||
result.name(dbData.name.toStdString());
|
||||
result.lastChange(dbData.lastChange);
|
||||
|
||||
auto cb = [&result] (const Database::AvmFrequencySetData ¤tData)
|
||||
{
|
||||
result.data().push_back(toDdsFrequencySetDataWithId(currentData));
|
||||
};
|
||||
m_db->selectByFrequencySetId(cb, result.id());
|
||||
|
||||
DEBUG_LOG(m_logger) << "Frequency Set with ID " << dbData.id << " has " << result.data().size() << " data entries";
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
FrequencyBand FrequencySetHandler::getFrequencyBand(const QString &deviceString)
|
||||
{
|
||||
QString intermediate = deviceString.left(3);
|
||||
if (QString::compare(intermediate, QStringLiteral("VHF"), Qt::CaseInsensitive) == 0)
|
||||
return FrequencyBand_def::VHF;
|
||||
else if (QString::compare(intermediate, QStringLiteral("UHF"), Qt::CaseInsensitive) == 0)
|
||||
return FrequencyBand_def::UHF;
|
||||
else if (QString::compare(intermediate, QStringLiteral("HF"), Qt::CaseInsensitive) == 0)
|
||||
return FrequencyBand_def::HF;
|
||||
else //if (QString::compare(intermediate.left(1), QStringLiteral("R"), Qt::CaseInsensitive) == 0)
|
||||
return FrequencyBand_def::REL;
|
||||
}
|
||||
|
||||
FrequencySetDataWithId FrequencySetHandler::toDdsFrequencySetDataWithId(const Database::AvmFrequencySetData &dbData)
|
||||
{
|
||||
FrequencySetDataWithId result;
|
||||
|
||||
result.id(dbData.id);
|
||||
result.function(dbData.function.toStdString());
|
||||
result.frequency(dbData.frequency);
|
||||
|
||||
// Todo: Put this into the database as well...
|
||||
result.frequencyBand(getFrequencyBand(dbData.device));
|
||||
|
||||
if (dbData.akwBundle >= 0)
|
||||
result.akwBundle().set(dbData.akwBundle);
|
||||
|
||||
if (dbData.fsbBundle >= 0)
|
||||
result.fsbBundle().set(dbData.fsbBundle);
|
||||
|
||||
if (dbData.akwRadioCircuit >= 0)
|
||||
result.akwRadioCircuit().set(dbData.akwRadioCircuit);
|
||||
|
||||
if (dbData.comsec >= 0)
|
||||
result.comsec().set(dbData.comsec);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
void FrequencySetHandler::addFrequencySet(const FrequencySet &frequencySet)
|
||||
{
|
||||
QVector<int32_t> dataIds;
|
||||
|
||||
dataIds.reserve(frequencySet.data().size());
|
||||
|
||||
for (const FrequencySetDataWithId ¤tData : frequencySet.data())
|
||||
dataIds << currentData.id();
|
||||
|
||||
m_frequencySetDatas.insert(frequencySet.id(), dataIds);
|
||||
|
||||
if (!m_dts->publish(frequencySet))
|
||||
ERROR_LOG(m_logger) << "Error while publishing Frequency Set with id " << frequencySet.id();
|
||||
}
|
||||
|
||||
} // namespace AudioVideoManagement
|
||||
Reference in new issue
Block a user