torstenandCopilot
7173785915
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>
94 lines
2.5 KiB
C++
94 lines
2.5 KiB
C++
/**
|
|
* Controller for managing converter threads
|
|
* $Id$
|
|
* $HeadURL$
|
|
* $Author$
|
|
* Created by Philipp Dassow, NLT, 30-11-2018
|
|
*/
|
|
#include "controller.h"
|
|
#include "settings.h"
|
|
|
|
#include <QSystemTrayIcon>
|
|
#include <QMenu>
|
|
|
|
namespace SerialToTcpConverter
|
|
{
|
|
|
|
Controller::Controller(QObject *parent)
|
|
: QObject(parent)
|
|
, m_converterData()
|
|
, m_icon(new QSystemTrayIcon(this))
|
|
, m_logger(getLogger("Controller"))
|
|
{
|
|
m_icon->setIcon(QIcon(QLatin1String(":/style/messages.svg")));
|
|
m_icon->show();
|
|
}
|
|
|
|
Controller::~Controller()
|
|
{
|
|
for (const ConverterData &data : qAsConst(m_converterData))
|
|
{
|
|
if (!data.thread)
|
|
continue;
|
|
data.thread->disconnect(this);
|
|
data.thread->quit();
|
|
}
|
|
for (const ConverterData &data : qAsConst(m_converterData))
|
|
{
|
|
if (!data.thread)
|
|
continue;
|
|
data.thread->wait();
|
|
}
|
|
}
|
|
|
|
bool Controller::init()
|
|
{
|
|
QMenu *menu = new QMenu;
|
|
const auto configs = Settings::configs();
|
|
for (const Settings::Config &config : configs)
|
|
{
|
|
INFO_LOG(m_logger) << "Creating converter-thread for " << config.serialPortName;
|
|
|
|
ConverterData data;
|
|
data.serialPortName = config.serialPortName;
|
|
ConverterThread *converterThread = new ConverterThread(config.serialPortName, config.serialBaudrate, config.tcpPort);
|
|
data.thread = converterThread;
|
|
QAction *action = new QAction(QIcon(QLatin1String(":/style/pu_yellow.svg")), tr("%1 <-> %2").arg(config.serialPortName, QString::number(config.tcpPort)), menu);
|
|
data.menuAction = action;
|
|
menu->addAction(action);
|
|
|
|
m_converterData.insert(data.serialPortName, data);
|
|
connect(converterThread, &ConverterThread::finished, this, &Controller::onThreadExit);
|
|
connect(converterThread, &ConverterThread::connected, this, &Controller::onThreadConnected);
|
|
converterThread->start();
|
|
}
|
|
m_icon->setContextMenu(menu);
|
|
|
|
return true;
|
|
}
|
|
|
|
void Controller::onThreadExit()
|
|
{
|
|
ConverterThread *t = qobject_cast<ConverterThread*>(sender());
|
|
if (!t)
|
|
return;
|
|
|
|
const QString name = t->portName();
|
|
auto &data = m_converterData[name];
|
|
|
|
INFO_LOG (m_logger) << "Exiting converter-thread for serial port: "<< data.serialPortName;
|
|
|
|
data.menuAction->setIcon(QIcon(QLatin1String(":/style/pu_red.svg")));
|
|
data.thread->deleteLater();
|
|
data.thread = nullptr;
|
|
}
|
|
|
|
void Controller::onThreadConnected(const QString &portName)
|
|
{
|
|
if (!m_converterData.contains(portName))
|
|
return;
|
|
m_converterData[portName].menuAction->setIcon(QIcon(QLatin1String(":/style/pu_green.svg")));
|
|
}
|
|
|
|
} //namespace SerialToTcpConverter
|