Fix FileManagement Build-Fehler (BUILD_RTI=OFF)
- flm_db.h: Stub-Header mit Folder/FileContent Klassen erstellt - flm_enums.hpp: MainFolder Enum hinzugefügt (None=0) - flm_translation.h: toInt() entfernt, trFolderName() angepasst - Plugin-Interfaces erstellt (flm, opm, exm) - Viewer-Dialogs: QString-Konvertierungen behoben - AdvancedSymbology CMakeLists.txt: Ungültige Pfade entfernt - ism_mounting_point.cpp: Redundante Definitionen entfernt Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
CopilotandCopilot authored and twi-devel committed
1 parent
c21083700a
commit
e5d8bfa432
15 files changed
+815
-91
No files matched your search
@@ -0,0 +1,36 @@
|
||||
# Stub CMakeLists.txt für FileManagement Headers
|
||||
# Diese Datei stellt eine leere Library bereit damit andere Module linken können
|
||||
# ohne die vollständigen DDS-basierten Services zu benötigen
|
||||
|
||||
# FileManagement Stub Library mit Dtc-Implementierung
|
||||
add_library(FileManagement_Stub STATIC
|
||||
flm_dtc.cpp
|
||||
)
|
||||
target_include_directories(FileManagement_Stub
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
)
|
||||
target_link_libraries(FileManagement_Stub
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
)
|
||||
set_target_properties(FileManagement_Stub PROPERTIES
|
||||
AUTOMOC ON
|
||||
)
|
||||
|
||||
# svcFlmCommon als ALIAS zu FileManagement_Stub für Kompatibilität
|
||||
add_library(svcFlmCommon ALIAS FileManagement_Stub)
|
||||
|
||||
# Leere Header-Only Library als Platzhalter für svcOpmCommon
|
||||
add_library(svcOpmCommon INTERFACE)
|
||||
target_include_directories(svcOpmCommon
|
||||
INTERFACE
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../OperatorManagement/
|
||||
)
|
||||
|
||||
# Leere Header-Only Library als Platzhalter für svcExmCommon
|
||||
add_library(svcExmCommon INTERFACE)
|
||||
target_include_directories(svcExmCommon
|
||||
INTERFACE
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../ExerciseManagement/
|
||||
)
|
||||
+30
@@ -0,0 +1,30 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* FileManagement Explorer Interface for access from other Plugins
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
* Created by Mike Wille, SLSE, 2017-03-31
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <PluginInterfaces/data_plugin_interface.h>
|
||||
#include <FileManagement/flm_dtc.h>
|
||||
#include <FileManagement/flm_ftc.h>
|
||||
|
||||
namespace FileManagement
|
||||
{
|
||||
/**
|
||||
* @brief The DataInterface class provides the Topics Clients only for the GUI Plugins
|
||||
*/
|
||||
class DataInterface : public DataPluginBase::Interface
|
||||
{
|
||||
public:
|
||||
using DataPluginBase::Interface::Interface;
|
||||
|
||||
virtual std::shared_ptr<FileManagement::Interface::Dtc> getDtc() = 0;
|
||||
virtual std::shared_ptr<FileManagement::Interface::Ftc> getFtc() = 0;
|
||||
};
|
||||
|
||||
} // namespace FileManagement
|
||||
@@ -0,0 +1,181 @@
|
||||
#pragma once
|
||||
|
||||
// STUB-HEADER: Diese Datei wird normalerweise von DDS/RTI Codegen generiert
|
||||
// Für die Migration mit BUILD_RTI=OFF erstellen wir minimale Implementierungen
|
||||
|
||||
#include "flm_enums.hpp"
|
||||
#include <QString>
|
||||
#include <QDateTime>
|
||||
#include <QByteArray>
|
||||
#include <vector>
|
||||
#include <cstdint>
|
||||
#include <memory>
|
||||
#include <optional>
|
||||
|
||||
namespace FileManagement
|
||||
{
|
||||
|
||||
// Forward declarations
|
||||
class Folder;
|
||||
class FileContent;
|
||||
|
||||
/**
|
||||
* @brief Folder class - Stub für DDS-generierten Code
|
||||
*
|
||||
* Diese Klasse wird normalerweise von DDS aus flm_service.xml generiert.
|
||||
* Für BUILD_RTI=OFF verwenden wir diese minimale Implementierung.
|
||||
*/
|
||||
class Folder
|
||||
{
|
||||
public:
|
||||
Folder() : m_id(0), m_parentId(0), m_mainFolder(MainFolder::None), m_operatorId(0) {}
|
||||
|
||||
// Getter
|
||||
int32_t id() const { return m_id; }
|
||||
std::string name() const { return m_name.toStdString(); }
|
||||
int32_t parentId() const { return m_parentId; }
|
||||
std::vector<int32_t> path() const { return m_path; }
|
||||
QDateTime created() const { return m_created; }
|
||||
QDateTime modified() const { return m_modified; }
|
||||
MainFolder mainFolder() const { return m_mainFolder; }
|
||||
int32_t operatorId() const { return m_operatorId; }
|
||||
bool isHidden() const { return m_hidden; }
|
||||
bool isEditable() const { return m_editable; }
|
||||
bool isDeleted() const { return m_deleted; }
|
||||
|
||||
// Setter
|
||||
void setId(int32_t id) { m_id = id; }
|
||||
void setName(const QString& name) { m_name = name; }
|
||||
void setName(const std::string& name) { m_name = QString::fromStdString(name); }
|
||||
void setParentId(int32_t parentId) { m_parentId = parentId; }
|
||||
void setPath(const std::vector<int32_t>& path) { m_path = path; }
|
||||
void setCreated(const QDateTime& created) { m_created = created; }
|
||||
void setModified(const QDateTime& modified) { m_modified = modified; }
|
||||
void setMainFolder(MainFolder mainFolder) { m_mainFolder = mainFolder; }
|
||||
void setOperatorId(int32_t operatorId) { m_operatorId = operatorId; }
|
||||
void setHidden(bool hidden) { m_hidden = hidden; }
|
||||
void setEditable(bool editable) { m_editable = editable; }
|
||||
void setDeleted(bool deleted) { m_deleted = deleted; }
|
||||
|
||||
// Utility
|
||||
bool isValid() const { return m_id > 0; }
|
||||
|
||||
private:
|
||||
int32_t m_id;
|
||||
QString m_name;
|
||||
int32_t m_parentId;
|
||||
std::vector<int32_t> m_path;
|
||||
QDateTime m_created;
|
||||
QDateTime m_modified;
|
||||
MainFolder m_mainFolder;
|
||||
int32_t m_operatorId;
|
||||
bool m_hidden = false;
|
||||
bool m_editable = true;
|
||||
bool m_deleted = false;
|
||||
};
|
||||
|
||||
/**
|
||||
* @brief FileContent class - Stub für DDS-generierten Code
|
||||
*
|
||||
* Diese Klasse wird normalerweise von DDS aus flm_service.xml generiert.
|
||||
* Für BUILD_RTI=OFF verwenden wir diese minimale Implementierung.
|
||||
*/
|
||||
class FileContent
|
||||
{
|
||||
public:
|
||||
FileContent()
|
||||
: m_id(0)
|
||||
, m_fileId(0)
|
||||
, m_folderId(0)
|
||||
, m_operatorId(0)
|
||||
, m_exerciseId(std::nullopt)
|
||||
, m_phaseId(std::nullopt)
|
||||
, m_size(0)
|
||||
, m_fileStatus(FileStatus::Valid)
|
||||
, m_fileCategory(FileCategory::Global)
|
||||
, m_fileType(FileType::Unknown)
|
||||
, m_isTemplate(false)
|
||||
, m_mainFolder(MainFolder::None)
|
||||
, m_hidden(false)
|
||||
, m_used(false)
|
||||
{
|
||||
}
|
||||
|
||||
// Getter
|
||||
int32_t id() const { return m_id; }
|
||||
int32_t fileId() const { return m_fileId; }
|
||||
int32_t folderId() const { return m_folderId; }
|
||||
int32_t operatorId() const { return m_operatorId; }
|
||||
std::optional<int32_t> exerciseId() const { return m_exerciseId; }
|
||||
std::optional<int32_t> phaseId() const { return m_phaseId; }
|
||||
QString name() const { return m_fileName; }
|
||||
QString fileName() const { return m_fileName; }
|
||||
QString mimeType() const { return m_mimeType; }
|
||||
int64_t size() const { return m_size; }
|
||||
QByteArray content() const { return m_content; }
|
||||
std::string properties() const { return m_properties; }
|
||||
QDateTime created() const { return m_created; }
|
||||
QDateTime modified() const { return m_modified; }
|
||||
QDateTime lastModified() const { return m_modified; }
|
||||
FileStatus fileStatus() const { return m_fileStatus; }
|
||||
FileCategory fileCategory() const { return m_fileCategory; }
|
||||
FileType fileType() const { return m_fileType; }
|
||||
bool isTemplate() const { return m_isTemplate; }
|
||||
bool isDeleted() const { return m_fileStatus == FileStatus::Deleted; }
|
||||
bool isHidden() const { return m_hidden; }
|
||||
bool isUsedBy() const { return m_used; }
|
||||
std::string usedBy() const { return m_usedBy; }
|
||||
MainFolder mainFolder() const { return m_mainFolder; }
|
||||
|
||||
// Setter
|
||||
void setId(int32_t id) { m_id = id; }
|
||||
void setFileId(int32_t fileId) { m_fileId = fileId; }
|
||||
void setFolderId(int32_t folderId) { m_folderId = folderId; }
|
||||
void setOperatorId(int32_t operatorId) { m_operatorId = operatorId; }
|
||||
void setExerciseId(std::optional<int32_t> exerciseId) { m_exerciseId = exerciseId; }
|
||||
void setPhaseId(std::optional<int32_t> phaseId) { m_phaseId = phaseId; }
|
||||
void setName(const QString& fileName) { m_fileName = fileName; }
|
||||
void setFileName(const QString& fileName) { m_fileName = fileName; }
|
||||
void setMimeType(const QString& mimeType) { m_mimeType = mimeType; }
|
||||
void setSize(int64_t size) { m_size = size; }
|
||||
void setContent(const QByteArray& content) { m_content = content; }
|
||||
void setProperties(const std::string& properties) { m_properties = properties; }
|
||||
void setCreated(const QDateTime& created) { m_created = created; }
|
||||
void setModified(const QDateTime& modified) { m_modified = modified; }
|
||||
void setFileStatus(FileStatus status) { m_fileStatus = status; }
|
||||
void setFileCategory(FileCategory category) { m_fileCategory = category; }
|
||||
void setFileType(FileType type) { m_fileType = type; }
|
||||
void setTemplate(bool isTemplate) { m_isTemplate = isTemplate; }
|
||||
void setHidden(bool hidden) { m_hidden = hidden; }
|
||||
void setUsedBy(bool used) { m_used = used; }
|
||||
void setUsedBy(const std::string& usedBy) { m_usedBy = usedBy; m_used = !usedBy.empty(); }
|
||||
void setMainFolder(MainFolder mainFolder) { m_mainFolder = mainFolder; }
|
||||
|
||||
// Utility
|
||||
bool isValid() const { return m_id > 0; }
|
||||
|
||||
private:
|
||||
int32_t m_id;
|
||||
int32_t m_fileId;
|
||||
int32_t m_folderId;
|
||||
int32_t m_operatorId;
|
||||
std::optional<int32_t> m_exerciseId;
|
||||
std::optional<int32_t> m_phaseId;
|
||||
QString m_fileName;
|
||||
QString m_mimeType;
|
||||
int64_t m_size;
|
||||
QByteArray m_content;
|
||||
std::string m_properties;
|
||||
QDateTime m_created;
|
||||
QDateTime m_modified;
|
||||
FileStatus m_fileStatus;
|
||||
FileCategory m_fileCategory;
|
||||
FileType m_fileType;
|
||||
bool m_isTemplate;
|
||||
MainFolder m_mainFolder;
|
||||
bool m_hidden;
|
||||
bool m_used;
|
||||
std::string m_usedBy;
|
||||
};
|
||||
|
||||
} // namespace FileManagement
|
||||
@@ -1,34 +1,152 @@
|
||||
#pragma once
|
||||
|
||||
// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
|
||||
// Für die Migration erstellen wir minimale Typ-Definitionen
|
||||
// Für die Migration erstellen wir minimale Typ-Definitionen basierend auf flm_service.xml
|
||||
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace FileManagement
|
||||
{
|
||||
// Placeholder enums - werden durch echte DDS-Typen ersetzt
|
||||
enum class SymbolAppearance : int { Solid = 0, Dashed = 1, Dotted = 2 };
|
||||
// Enums aus flm_service.xml
|
||||
enum class FileStatus : int { Valid = 0, Deleted = 1 };
|
||||
|
||||
enum class SymbolVisibility : int { Visible = 0, Hidden = 1 };
|
||||
enum class FileCategory : int { Global = 1, Exercise = 2, User = 3 };
|
||||
|
||||
// STUB: FileType enum
|
||||
enum class FileType : int { Unknown = 0, Image = 1, Video = 2, Audio = 3, Document = 4 };
|
||||
|
||||
// STUB: FileContent struct
|
||||
struct FileContent
|
||||
{
|
||||
int id = 0;
|
||||
int fileId = 0;
|
||||
FileType type = FileType::Unknown;
|
||||
QString fileName;
|
||||
QByteArray data;
|
||||
enum class FileType : int {
|
||||
Unknown = 0,
|
||||
Text = 1,
|
||||
Xml = 2,
|
||||
Pdf = 3,
|
||||
Jpg = 4,
|
||||
Png = 5,
|
||||
TacticalPlan = 6,
|
||||
OperatorFavourite = 7,
|
||||
OperatorDefinedSymbol = 8,
|
||||
OpenOfficeDocument = 9,
|
||||
OpenOfficeSpreadsheet = 10,
|
||||
OpenOfficePresentation = 11,
|
||||
MSOfficeDocument = 12,
|
||||
MSOfficeDocument97 = 13,
|
||||
MSOfficeSpreadsheet = 14,
|
||||
MSOfficeSpreadsheet97 = 15,
|
||||
MSOfficePresentation = 16,
|
||||
MSOfficePresentation97 = 17,
|
||||
Zip = 18,
|
||||
Gif = 19,
|
||||
Bmp = 20,
|
||||
Tiff = 21,
|
||||
Wmf = 22,
|
||||
Emf = 23,
|
||||
Rtf = 24,
|
||||
Html = 25,
|
||||
Hlp = 26,
|
||||
Wps = 27,
|
||||
Wpd = 28,
|
||||
Wk3 = 29,
|
||||
Wk4 = 30,
|
||||
Wks = 31,
|
||||
Wr1 = 32,
|
||||
Wr3 = 33,
|
||||
Wq1 = 34,
|
||||
Wq2 = 35,
|
||||
Dif = 36,
|
||||
Dbf = 37,
|
||||
Slk = 38,
|
||||
Xlk = 39,
|
||||
Doc = 40,
|
||||
Dot = 41,
|
||||
Xls = 42,
|
||||
Xlt = 43,
|
||||
Ppt = 44,
|
||||
Pps = 45,
|
||||
Pot = 46,
|
||||
Accdb = 47,
|
||||
Accde = 48,
|
||||
Mwcd = 49,
|
||||
Mwct = 50,
|
||||
Mwcz = 51,
|
||||
Mwcu = 52,
|
||||
Ods = 53,
|
||||
Odt = 54,
|
||||
Odp = 55,
|
||||
Odg = 56,
|
||||
Odf = 57,
|
||||
Odc = 58,
|
||||
Odi = 59,
|
||||
Odm = 60,
|
||||
Otg = 61,
|
||||
Oth = 62,
|
||||
Ots = 63,
|
||||
Ott = 64,
|
||||
Oxt = 65,
|
||||
Six = 66,
|
||||
Msg = 67,
|
||||
Vsd = 68,
|
||||
Vdx = 69,
|
||||
Vsx = 70,
|
||||
Vtx = 71,
|
||||
Vss = 72,
|
||||
Vst = 73,
|
||||
Vsw = 74,
|
||||
VsdX = 75,
|
||||
VssX = 76,
|
||||
VstX = 77,
|
||||
VdxX = 78,
|
||||
VsxX = 79,
|
||||
VtxX = 80,
|
||||
Dwg = 81,
|
||||
Dxf = 82,
|
||||
Dgn = 83,
|
||||
Cgm = 84,
|
||||
Cal = 85,
|
||||
Mil = 86,
|
||||
Img = 87,
|
||||
Grib = 88,
|
||||
Grb2 = 89,
|
||||
Wkt = 90,
|
||||
Shp = 91,
|
||||
Tab = 92,
|
||||
Mif = 93,
|
||||
E00 = 94,
|
||||
Aml = 95,
|
||||
Coverage = 96,
|
||||
Tin = 97,
|
||||
Grid = 98,
|
||||
Lyr = 99,
|
||||
Lrx = 100,
|
||||
Pmf = 101,
|
||||
Pmz = 102,
|
||||
Sxd = 103,
|
||||
Sxm = 104,
|
||||
Sxg = 105,
|
||||
Sxi = 106,
|
||||
Sxc = 107,
|
||||
Sxw = 108,
|
||||
Stw = 109,
|
||||
Sxv = 110,
|
||||
Sxd2 = 111,
|
||||
Sxm2 = 112,
|
||||
Sxg2 = 113,
|
||||
Sxi2 = 114,
|
||||
Sxc2 = 115,
|
||||
Sxw2 = 116,
|
||||
Stw2 = 117,
|
||||
Sxv2 = 118,
|
||||
Video = 119,
|
||||
Audio = 120,
|
||||
Flash = 121,
|
||||
Svg = 122,
|
||||
Svgz = 123
|
||||
};
|
||||
|
||||
struct UnitSymbolPosition
|
||||
{
|
||||
double x = 0.0;
|
||||
double y = 0.0;
|
||||
double z = 0.0;
|
||||
};
|
||||
// MainFolder Enum
|
||||
enum class MainFolder : int { None = 0, GlobalDocuments = 1, UserDocuments = 2, ExerciseDocuments = 3 };
|
||||
|
||||
// Helper-Funktion
|
||||
inline int toInt(MainFolder folder) { return static_cast<int>(folder); }
|
||||
|
||||
// Forward declarations
|
||||
class Folder;
|
||||
class FileContent;
|
||||
class Ftc;
|
||||
} // namespace FileManagement
|
||||
@@ -0,0 +1,20 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* FileManagement Topic Client Stub (BUILD_RTI=OFF)
|
||||
* Normally generated from flm_service.xml by DDS Code Generator
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <memory>
|
||||
|
||||
namespace FileManagement
|
||||
{
|
||||
namespace Interface
|
||||
{
|
||||
|
||||
// Forward declaration - actual implementation provided by DDS when BUILD_RTI=ON
|
||||
class Ftc;
|
||||
|
||||
} // namespace Interface
|
||||
} // namespace FileManagement
|
||||
@@ -0,0 +1,73 @@
|
||||
/**
|
||||
* @RDE_HEADER@
|
||||
* Convert DSS enumerations to translatable strings
|
||||
* $Id$
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
// filename: flm_translation.h
|
||||
|
||||
#include "flm_enums.hpp"
|
||||
#include <QString>
|
||||
|
||||
namespace FileManagement
|
||||
{
|
||||
// Translatable enumerations:
|
||||
inline QString toString(FileType state)
|
||||
{
|
||||
switch (state) {
|
||||
case FileType::Unknown: return QStringLiteral("Unknown");
|
||||
case FileType::Text: return QStringLiteral("Text");
|
||||
case FileType::Xml: return QStringLiteral("XML");
|
||||
case FileType::Pdf: return QStringLiteral("PDF");
|
||||
case FileType::Jpg: return QStringLiteral("Image");
|
||||
case FileType::Png: return QStringLiteral("Image");
|
||||
case FileType::Gif: return QStringLiteral("Image");
|
||||
case FileType::Bmp: return QStringLiteral("Image");
|
||||
case FileType::Tiff: return QStringLiteral("Image");
|
||||
case FileType::Video: return QStringLiteral("Video");
|
||||
case FileType::Audio: return QStringLiteral("Audio");
|
||||
case FileType::MSOfficeDocument:
|
||||
case FileType::MSOfficeDocument97:
|
||||
case FileType::OpenOfficeDocument:
|
||||
case FileType::Doc:
|
||||
case FileType::Odt:
|
||||
case FileType::Ods:
|
||||
case FileType::Odp:
|
||||
return QStringLiteral("Document");
|
||||
case FileType::TacticalPlan: return QStringLiteral("TacticalPlan");
|
||||
case FileType::OperatorFavourite: return QStringLiteral("OperatorFavourite");
|
||||
case FileType::OperatorDefinedSymbol: return QStringLiteral("OperatorDefinedSymbol");
|
||||
default: return QStringLiteral("Unknown");
|
||||
}
|
||||
}
|
||||
|
||||
inline QString toString(FileCategory state)
|
||||
{
|
||||
switch (state) {
|
||||
case FileCategory::Global: return QStringLiteral("Global");
|
||||
case FileCategory::Exercise: return QStringLiteral("Exercise");
|
||||
case FileCategory::User: return QStringLiteral("User");
|
||||
default: return QStringLiteral("Unknown");
|
||||
}
|
||||
}
|
||||
|
||||
inline QString toString(FileStatus state)
|
||||
{
|
||||
switch (state) {
|
||||
case FileStatus::Valid: return QStringLiteral("Valid");
|
||||
case FileStatus::Deleted: return QStringLiteral("Deleted");
|
||||
default: return QStringLiteral("Unknown");
|
||||
}
|
||||
}
|
||||
|
||||
// Translatable struct members:
|
||||
inline QString trFolderName(const QString &text)
|
||||
{
|
||||
return text;
|
||||
}
|
||||
|
||||
} // namespace FileManagement
|
||||
Reference in new issue
Block a user