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,76 @@
|
||||
/**
|
||||
* Handle one wind sensor
|
||||
* Requests for wind sensor data in an given interval.
|
||||
* All data will be send by signal/slot connection in case of data change.
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by hjl, SLSE, 2016-09-22
|
||||
*/
|
||||
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QTimer>
|
||||
|
||||
#include "tcpsocket.h"
|
||||
|
||||
namespace MeteoDataManagement
|
||||
{
|
||||
class TcpWind final : public TcpSocket
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit TcpWind(QObject *parent = nullptr);
|
||||
|
||||
/**
|
||||
* Connect to converter and starts reading sensor data
|
||||
* @param[in] converterIp IP address of the RS232-LAN Converter
|
||||
* @param[in] windPort Port number of wind sensor on the RS232-LAN Converter
|
||||
*/
|
||||
void start(const QString &converterIp, quint16 windPort);
|
||||
|
||||
|
||||
Q_SIGNALS:
|
||||
/**
|
||||
* Emits signal if data were changed
|
||||
*/
|
||||
void sigWindDataChanged(float direction, float speed, bool windOk);
|
||||
|
||||
protected Q_SLOTS:
|
||||
/**
|
||||
* Requests of new sensor data
|
||||
*/
|
||||
void onSensorDataRequest();
|
||||
|
||||
/**
|
||||
* Timeout for new sensor data request
|
||||
*/
|
||||
void onRequestTimeout();
|
||||
|
||||
|
||||
protected:
|
||||
/**
|
||||
* pure virtual function from TcpSocket to initialize the especially sensor device
|
||||
*/
|
||||
void init() override;
|
||||
/**
|
||||
* pure virtual function from TcpSocket to handle the especially sensor device data
|
||||
*/
|
||||
void dataAvailable(const QByteArray &line) override;
|
||||
|
||||
/**
|
||||
* Extract sensor data from given data line
|
||||
* @param[in] line data line to be extacted
|
||||
* @return False if an error occurded, otherwise true;
|
||||
*/
|
||||
bool extractDataFromLine(const QByteArray &line);
|
||||
|
||||
QTimer *m_requestTimer; ///< Request Interval in msec
|
||||
QTimer *m_requestTimeoutTimer; ///< Request Timeout in msec
|
||||
float m_direction; ///< wind FROM direction in degree (north=0°, east=90°, south= 180°, west=270°)
|
||||
float m_speed; ///< wind speed in m/s
|
||||
char m_speedUnit; ///< M = m/s, K = Km/h, N = Knoten
|
||||
bool m_dataChanged; ///< if true, sensor data were changed
|
||||
};
|
||||
} // namespace MeteoDataManagement
|
||||
Reference in new issue
Block a user