LtsUtilsCore: Alle Include-Pfade korrigiert (LtsUtils/ → LtsUtilsCore/)
- CMakeLists.txt: Include-Pfade von ../ zu . geändert, json.h hinzugefügt - ~95 Dateien: Include-Pfade systematisch korrigiert - LtsUtils/ → LtsUtilsCore/ für alle Core-Header - LtsUtilsGui/LtsUtils/LtsUtilsGui/ → LtsUtilsGui/LtsUtilsGuiDds/ - Logger-API: getLogger() mit const char* Parameter - DataModification: enum class global (nicht im Lts-Namespace) - Participant-Struct: Member mit m_-Präfix - Export-Macro: SVCALMCOMMON_EXPORT statt ALMCOMMON_EXPORT - Signal/Slot-Signaturen korrigiert für Qt6 template matching Build validiert: LtsUtilsCore, LtsUtilsDds, LtsSessionData erfolgreich
This commit is contained in:
95 files changed
+667
-177
No files matched your search
@@ -3,11 +3,92 @@
|
||||
// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
|
||||
// Für die Migration erstellen wir minimale Forward-Declarations
|
||||
|
||||
#include <cstdint>
|
||||
#include <functional>
|
||||
#include <optional>
|
||||
#include <string>
|
||||
|
||||
#include <QObject>
|
||||
|
||||
#include "LtsUtils/data_modification_enum.h"
|
||||
#include "ProjectDataManagement/pdm_types.h"
|
||||
|
||||
namespace AlarmManagement
|
||||
{
|
||||
|
||||
// Position-Struct (wird normalerweise von DDS generiert)
|
||||
struct Position
|
||||
{
|
||||
double longitude = 0.0;
|
||||
double latitude = 0.0;
|
||||
|
||||
double lon() const { return longitude; }
|
||||
double lat() const { return latitude; }
|
||||
};
|
||||
|
||||
// Notification-Struct (wird normalerweise von DDS generiert)
|
||||
struct Notification
|
||||
{
|
||||
int32_t id = 0;
|
||||
int64_t time() const { return timestamp; }
|
||||
int64_t timestamp = 0;
|
||||
int32_t type = 0;
|
||||
int32_t priority = 0;
|
||||
int32_t status = 0;
|
||||
std::string description;
|
||||
|
||||
// Zusätzliche Member für AlarmHistoryModel
|
||||
int32_t operatorId() const { return m_operatorId; }
|
||||
int32_t equipmentNumber() const { return m_equipmentNumber; }
|
||||
std::optional<int32_t> participantId() const { return m_participantId; }
|
||||
std::optional<int32_t> aesId() const { return m_aesId; }
|
||||
ProjectDataManagement::EventType eventType() const { return m_eventType; }
|
||||
Position position() const { return m_position; }
|
||||
const std::string& properties() const { return m_properties; }
|
||||
|
||||
int32_t m_operatorId = 0;
|
||||
int32_t m_equipmentNumber = 0;
|
||||
std::optional<int32_t> m_participantId;
|
||||
std::optional<int32_t> m_aesId;
|
||||
ProjectDataManagement::EventType m_eventType = ProjectDataManagement::EventType::Unknown;
|
||||
Position m_position;
|
||||
std::string m_properties;
|
||||
};
|
||||
|
||||
namespace Interface
|
||||
{
|
||||
class Dtc;
|
||||
|
||||
// Dtc interface class with signals for Qt6 migration STUB
|
||||
class Dtc : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit Dtc(QObject* parent = nullptr) : QObject(parent) {}
|
||||
~Dtc() override = default;
|
||||
|
||||
// Callback registration instead of enableNotification()
|
||||
void notifications(std::function<void(const Notification&)> callback)
|
||||
{
|
||||
m_notificationCallback = callback;
|
||||
}
|
||||
|
||||
// Trigger notification changed (for STUB testing)
|
||||
void triggerNotificationChanged(const Notification& notification, DataModification modType)
|
||||
{
|
||||
emit notificationChanged(notification, modType);
|
||||
if (m_notificationCallback)
|
||||
{
|
||||
m_notificationCallback(notification);
|
||||
}
|
||||
}
|
||||
|
||||
signals:
|
||||
void notificationChanged(const Notification& notification, DataModification modType);
|
||||
|
||||
private:
|
||||
std::function<void(const Notification&)> m_notificationCallback;
|
||||
};
|
||||
|
||||
class Ftc;
|
||||
} // namespace Interface
|
||||
} // namespace AlarmManagement
|
||||
@@ -32,6 +32,9 @@ public:
|
||||
|
||||
bool global() const { return m_global; }
|
||||
void setGlobal(bool value) { m_global = value; }
|
||||
|
||||
int vulnerabilityState() const { return m_vulnerabilityState; }
|
||||
void setVulnerabilityState(int value) { m_vulnerabilityState = value; }
|
||||
|
||||
private:
|
||||
int m_eventTypeId = 0;
|
||||
@@ -40,6 +43,7 @@ private:
|
||||
int m_participantId = 0;
|
||||
int m_id = 0;
|
||||
bool m_global = false;
|
||||
int m_vulnerabilityState = -1;
|
||||
};
|
||||
|
||||
} // namespace AlarmManagement
|
||||
Reference in new issue
Block a user