Apply clang-format to Lts/Common and DTC/enum headers
- Formatted all CodeGen module files (9 files) - Formatted LtsAppDescriptor module files - Formatted LtsAppManager/AppChooser files - Applied clang-format to all DTC and enum headers across modules - Removed coordTransTests from CommonUnitTestsPlaceholder (moved to tests/) Cosmetic changes only, no functional modifications. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
848 files changed
+89305
-100020
No files matched your search
Executable → Regular
+13
-17
@@ -1,10 +1,9 @@
|
||||
|
||||
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QVariant>
|
||||
#include <LtsWidgets/lts_frameless_dialog.h>
|
||||
#include <QVariant>
|
||||
|
||||
class Ui_SelectTextDialog;
|
||||
|
||||
@@ -13,24 +12,21 @@ namespace AdvancedSymbology
|
||||
|
||||
class SelectTextDialog final : public LtsWidgets::LtsFramelessDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
SelectTextDialog(QVariant &returnData, QWidget *parent);
|
||||
~SelectTextDialog();
|
||||
public:
|
||||
SelectTextDialog(QVariant& returnData, QWidget* parent);
|
||||
~SelectTextDialog();
|
||||
|
||||
protected:
|
||||
protected:
|
||||
NGL::INGLLogger& m_logger;
|
||||
Ui_SelectTextDialog* ui;
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
Ui_SelectTextDialog *ui;
|
||||
private:
|
||||
QVariant& m_returnData;
|
||||
|
||||
private:
|
||||
|
||||
QVariant &m_returnData;
|
||||
|
||||
|
||||
public slots:
|
||||
void accept() override final;
|
||||
public slots:
|
||||
void accept() override final;
|
||||
};
|
||||
|
||||
}
|
||||
} // namespace AdvancedSymbology
|
||||
Executable → Regular
+2329
-2604
File diff suppressed because it is too large.
Load diff
Executable → Regular
+158
-163
@@ -1,25 +1,33 @@
|
||||
|
||||
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <LtsWidgets/lts_dialog.h>
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
|
||||
#include <ParticipantManagement/ppm_data_plugin_interface.h>
|
||||
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
|
||||
#include <Plugins/FileManagement/flm_explorer_gui_plugin_interface.h>
|
||||
#include <ParticipantManagement/ppm_data_plugin_interface.h>
|
||||
#include <Plugins/FileManagement/flm_explorer_gui_plugin_interface.h>
|
||||
|
||||
#include <Viewer/SituationMap/SymbologyXML/symbol_types.h>
|
||||
#include <LtsSession/lts_session.h>
|
||||
|
||||
class QGraphicsScene;
|
||||
class QComboBox;
|
||||
|
||||
namespace Ui { class SymbolEditor; }
|
||||
namespace FileManagement { class ForeignGuiInterface; }
|
||||
namespace SymbologyXML { class Symbol; class Primitive;}
|
||||
namespace Ui
|
||||
{
|
||||
class SymbolEditor;
|
||||
}
|
||||
|
||||
namespace FileManagement
|
||||
{
|
||||
class ForeignGuiInterface;
|
||||
}
|
||||
|
||||
namespace SymbologyXML
|
||||
{
|
||||
class Symbol;
|
||||
class Primitive;
|
||||
} // namespace SymbologyXML
|
||||
|
||||
namespace AdvancedSymbology
|
||||
{
|
||||
@@ -28,203 +36,190 @@ class SymbolEditorPrivate;
|
||||
|
||||
class SymbolEditor final : public LtsWidgets::LtsDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
public:
|
||||
explicit SymbolEditor(LtsSession::LtsSession* session, QWidget* parent = nullptr);
|
||||
|
||||
explicit SymbolEditor(LtsSession::LtsSession *session, QWidget *parent = nullptr);
|
||||
~SymbolEditor();
|
||||
|
||||
~SymbolEditor();
|
||||
bool init(const std::shared_ptr<FileManagement::Interface::Ftc>& flmFtc,
|
||||
const std::shared_ptr<FileManagement::Interface::Dtc>& flmDtc,
|
||||
const std::shared_ptr<FileManagement::ForeignGuiInterface>& flmGui,
|
||||
const std::shared_ptr<ParticipantManagement::Interface::Dtc>& ppmDtc, bool asApp = false);
|
||||
|
||||
bool init(const std::shared_ptr<FileManagement::Interface::Ftc> &flmFtc,
|
||||
const std::shared_ptr<FileManagement::Interface::Dtc> &flmDtc,
|
||||
const std::shared_ptr<FileManagement::ForeignGuiInterface> &flmGui,
|
||||
const std::shared_ptr<ParticipantManagement::Interface::Dtc> &ppmDtc,
|
||||
bool asApp = false);
|
||||
void keyPressEvent(QKeyEvent* keyEvent) override final;
|
||||
void retranslate() override final;
|
||||
bool apply() override final;
|
||||
|
||||
void keyPressEvent(QKeyEvent *keyEvent) override final;
|
||||
void retranslate() override final;
|
||||
bool apply() override final;
|
||||
bool writeFile(bool saveAsNew);
|
||||
|
||||
bool writeFile(bool saveAsNew);
|
||||
enum e_category {
|
||||
CATEGORY_UNDEFINED = 0,
|
||||
CATEGORY_HEADQUARTER,
|
||||
CATEGORY_DIMENSION,
|
||||
CATEGORY_AFFILIATION,
|
||||
CATEGORY_BCDAB,
|
||||
CATEGORY_COMMANDLEVEL,
|
||||
CATEGORY_MOBILITY,
|
||||
CATEGORY_BRANCH,
|
||||
CATEGORY_ICON_TYPE
|
||||
};
|
||||
|
||||
enum e_category
|
||||
{
|
||||
CATEGORY_UNDEFINED = 0,
|
||||
CATEGORY_HEADQUARTER,
|
||||
CATEGORY_DIMENSION,
|
||||
CATEGORY_AFFILIATION,
|
||||
CATEGORY_BCDAB,
|
||||
CATEGORY_COMMANDLEVEL,
|
||||
CATEGORY_MOBILITY,
|
||||
CATEGORY_BRANCH,
|
||||
CATEGORY_ICON_TYPE
|
||||
};
|
||||
enum t_editMode {
|
||||
EDIT_NONE,
|
||||
EDIT_PICK,
|
||||
EDIT_MOVE,
|
||||
EDIT_ROTATE,
|
||||
EDIT_SCALE,
|
||||
EDIT_COPY,
|
||||
EDIT_PASTE,
|
||||
EDIT_DELETE,
|
||||
EDIT_EDIT
|
||||
};
|
||||
|
||||
enum t_editMode
|
||||
{
|
||||
EDIT_NONE,
|
||||
EDIT_PICK,
|
||||
EDIT_MOVE,
|
||||
EDIT_ROTATE,
|
||||
EDIT_SCALE,
|
||||
EDIT_COPY,
|
||||
EDIT_PASTE,
|
||||
EDIT_DELETE,
|
||||
EDIT_EDIT
|
||||
};
|
||||
public slots:
|
||||
|
||||
public slots:
|
||||
void movePrimitive(QPointF diff);
|
||||
bool createNewSymbol(const QString& symbolname);
|
||||
void setChanged(bool changed);
|
||||
void updateGraphicViews(bool editview = true, bool preview = true);
|
||||
void reset();
|
||||
void slotSaveAs();
|
||||
void slotSave();
|
||||
void slotSaveFinished();
|
||||
void slotImportTemplate();
|
||||
|
||||
void movePrimitive(QPointF diff);
|
||||
bool createNewSymbol(const QString &symbolname);
|
||||
void setChanged(bool changed);
|
||||
void updateGraphicViews(bool editview = true, bool preview = true);
|
||||
void reset();
|
||||
void slotSaveAs();
|
||||
void slotSave();
|
||||
void slotSaveFinished();
|
||||
void slotImportTemplate();
|
||||
signals:
|
||||
|
||||
signals:
|
||||
void documentChanged(bool changed);
|
||||
void symbolSaved(bool saveToLib, bool saveToCurrent, bool saveToAll);
|
||||
void canceled();
|
||||
void helpRequested();
|
||||
void invokeHelp(const QString& context);
|
||||
void saveFinished();
|
||||
|
||||
void documentChanged(bool changed);
|
||||
void symbolSaved(bool saveToLib, bool saveToCurrent, bool saveToAll);
|
||||
void canceled();
|
||||
void helpRequested();
|
||||
void invokeHelp(const QString &context);
|
||||
void saveFinished();
|
||||
private slots:
|
||||
|
||||
private slots:
|
||||
void transformSelection(int key, Qt::KeyboardModifiers modifiers);
|
||||
|
||||
void transformSelection(int key, Qt::KeyboardModifiers modifiers);
|
||||
void onToolButtonSelectClicked();
|
||||
void onToolButtonRotateClicked();
|
||||
void onToolButtonScaleClicked();
|
||||
void onToolButtonDeleteClicked();
|
||||
void onToolButtonClearClicked();
|
||||
void onToolButtonUndoClicked();
|
||||
void onToolButtonCopyClicked();
|
||||
void onToolButtonPasteClicked();
|
||||
void onToolButtonEllipseClicked();
|
||||
void onToolButtonLineClicked();
|
||||
void onToolButtonPolylineClicked();
|
||||
void onToolButtonPolygonClicked();
|
||||
void onToolButtonRectClicked();
|
||||
void onToolButtonTextClicked();
|
||||
|
||||
void onToolButtonSelectClicked();
|
||||
void onToolButtonRotateClicked();
|
||||
void onToolButtonScaleClicked();
|
||||
void onToolButtonDeleteClicked();
|
||||
void onToolButtonClearClicked();
|
||||
void onToolButtonUndoClicked();
|
||||
void onToolButtonCopyClicked();
|
||||
void onToolButtonPasteClicked();
|
||||
void onToolButtonEllipseClicked();
|
||||
void onToolButtonLineClicked();
|
||||
void onToolButtonPolylineClicked();
|
||||
void onToolButtonPolygonClicked();
|
||||
void onToolButtonRectClicked();
|
||||
void onToolButtonTextClicked();
|
||||
void onPushButtonFillColorClicked();
|
||||
|
||||
void onPushButtonFillColorClicked();
|
||||
void onComboBoxDimenCurrentIndexChanged(int index);
|
||||
void onComboBoxAffilCurrentIndexChanged(int index);
|
||||
void onComboBoxBCDABCurrentIndexChanged(int index);
|
||||
void onComboBoxHeadquarterCurrentIndexChanged(int index);
|
||||
void onComboBoxCommandLevelCurrentIndexChanged(int index);
|
||||
void onComboBoxMobCurrentIndexChanged(int index);
|
||||
void onComboBoxVehicleCurrentIndexChanged(int index);
|
||||
void onComboBoxIntrinsicMobCurrentIndexChanged(int index);
|
||||
void onComboBoxIntrinsicMob2CurrentIndexChanged(int index);
|
||||
void onComboBoxArmingCurrentIndexChanged(int index);
|
||||
|
||||
void onComboBoxDimenCurrentIndexChanged(int index);
|
||||
void onComboBoxAffilCurrentIndexChanged(int index);
|
||||
void onComboBoxBCDABCurrentIndexChanged(int index);
|
||||
void onComboBoxHeadquarterCurrentIndexChanged(int index);
|
||||
void onComboBoxCommandLevelCurrentIndexChanged(int index);
|
||||
void onComboBoxMobCurrentIndexChanged(int index);
|
||||
void onComboBoxVehicleCurrentIndexChanged(int index);
|
||||
void onComboBoxIntrinsicMobCurrentIndexChanged(int index);
|
||||
void onComboBoxIntrinsicMob2CurrentIndexChanged(int index);
|
||||
void onComboBoxArmingCurrentIndexChanged(int index);
|
||||
void onListViewMiscItemSelectionChanged();
|
||||
|
||||
void onListViewMiscItemSelectionChanged();
|
||||
void onCheckBoxVehicleStateChanged(int state);
|
||||
void onCheckBoxArmingStateChanged(int state);
|
||||
void onCheckBoxMainStateChanged(int state);
|
||||
|
||||
void onCheckBoxVehicleStateChanged(int state);
|
||||
void onCheckBoxArmingStateChanged(int state);
|
||||
void onCheckBoxMainStateChanged(int state);
|
||||
void onComboBoxSector1CurrentIndexChanged(int index);
|
||||
void onComboBoxSectorMainCurrentIndexChanged(int index);
|
||||
|
||||
void onComboBoxSector1CurrentIndexChanged(int index);
|
||||
void onComboBoxSectorMainCurrentIndexChanged(int index);
|
||||
void onListViewSectorMainItemSelectionChanged();
|
||||
|
||||
void onListViewSectorMainItemSelectionChanged();
|
||||
void onComboBoxSector2CurrentIndexChanged(int index);
|
||||
|
||||
void onComboBoxSector2CurrentIndexChanged(int index);
|
||||
void help_on_ComboBoxIndexChanged(
|
||||
QComboBox* comboBox, int index, const QMap<int, QString>& contv,
|
||||
SymbologyXML::SymbolTypes::t_icon_type iconType, SymbologyXML::SymbolTypes::t_sector_position pos,
|
||||
SymbologyXML::SymbolTypes::t_sector_rectpos rectpos = SymbologyXML::SymbolTypes::SECTOR_RECTPOS_DEFAULT);
|
||||
|
||||
void help_on_ComboBoxIndexChanged(QComboBox *comboBox,
|
||||
int index, const QMap<int, QString> &contv,
|
||||
SymbologyXML::SymbolTypes::t_icon_type iconType,
|
||||
SymbologyXML::SymbolTypes::t_sector_position pos,
|
||||
SymbologyXML::SymbolTypes::t_sector_rectpos rectpos = SymbologyXML::SymbolTypes::SECTOR_RECTPOS_DEFAULT);
|
||||
void onComboBoxAlign1CurrentIndexChanged(int index);
|
||||
void onComboBoxAlign2CurrentIndexChanged(int index);
|
||||
void onComboBoxAlign3CurrentIndexChanged(int index);
|
||||
|
||||
void onComboBoxColorCurrentIndexChanged(int index);
|
||||
void onComboBoxLineStyleCurrentIndexChanged(int index);
|
||||
|
||||
void onComboBoxAlign1CurrentIndexChanged(int index);
|
||||
void onComboBoxAlign2CurrentIndexChanged(int index);
|
||||
void onComboBoxAlign3CurrentIndexChanged(int index);
|
||||
void onLineEdit1TextChanged(const QString& text);
|
||||
void onLineEdit2TextChanged(const QString& text);
|
||||
void onLineEdit3TextChanged(const QString& text);
|
||||
|
||||
void onComboBoxColorCurrentIndexChanged(int index);
|
||||
void onComboBoxLineStyleCurrentIndexChanged(int index);
|
||||
void onListViewTruppengattungItemSelectionChanged();
|
||||
|
||||
void onLineEdit1TextChanged(const QString &text);
|
||||
void onLineEdit2TextChanged(const QString &text);
|
||||
void onLineEdit3TextChanged(const QString &text);
|
||||
void onCheckBoxBackgroundStateChanged(int state);
|
||||
void onCheckBoxCopyValuesStateChanged(int state);
|
||||
void onCheckBoxFillStateChanged(int state);
|
||||
void onCheckBoxPlannedStateChanged(int state);
|
||||
void onCheckBoxDrawAreaStateChanged(int state);
|
||||
|
||||
void onListViewTruppengattungItemSelectionChanged();
|
||||
void onSpinBoxRasterValueChanged(double d);
|
||||
void onSpinBoxLineWidthValueChanged(double d);
|
||||
void onSpinBoxScaleValueChanged(double d);
|
||||
|
||||
void onCheckBoxBackgroundStateChanged(int state);
|
||||
void onCheckBoxCopyValuesStateChanged(int state);
|
||||
void onCheckBoxFillStateChanged(int state);
|
||||
void onCheckBoxPlannedStateChanged(int state);
|
||||
void onCheckBoxDrawAreaStateChanged(int state);
|
||||
void onSliderTransparencyValueChanged(int value);
|
||||
|
||||
void onSpinBoxRasterValueChanged(double d);
|
||||
void onSpinBoxLineWidthValueChanged(double d);
|
||||
void onSpinBoxScaleValueChanged(double d);
|
||||
void setZoom(double zoom);
|
||||
|
||||
void onSliderTransparencyValueChanged(int value);
|
||||
void addItem(SymbologyXML::Primitive* prim);
|
||||
|
||||
void setZoom(double zoom);
|
||||
void selectionChanged();
|
||||
|
||||
void addItem(SymbologyXML::Primitive *prim);
|
||||
private:
|
||||
NGL::INGLLogger& m_logger;
|
||||
void resetGUI();
|
||||
void updateGUI();
|
||||
void updateSymbolAttributesWidgets();
|
||||
void updateTextProperties();
|
||||
void resetToolButtonGroupState();
|
||||
|
||||
void selectionChanged();
|
||||
void pushUndo();
|
||||
void popUndo();
|
||||
void clearUndo();
|
||||
|
||||
private:
|
||||
void restoreSelection(SymbologyXML::Primitive* prim);
|
||||
void copyFromSelectedPrimitive();
|
||||
void enableSelectMove(bool enable);
|
||||
|
||||
void setPushButtonFillColorBackground(QColor color);
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void resetGUI();
|
||||
void updateGUI();
|
||||
void updateSymbolAttributesWidgets();
|
||||
void updateTextProperties();
|
||||
void resetToolButtonGroupState();
|
||||
QIcon getIcon(e_category category, SymbologyXML::SymbolTypes::t_icon_type iconType, int iconId, QSize iconSize);
|
||||
|
||||
void pushUndo();
|
||||
void popUndo();
|
||||
void clearUndo();
|
||||
int getFrameSymbolID(SymbologyXML::SymbolTypes::t_dimen dimen, SymbologyXML::SymbolTypes::t_affil affil);
|
||||
|
||||
void restoreSelection(SymbologyXML::Primitive *prim);
|
||||
void copyFromSelectedPrimitive();
|
||||
void enableSelectMove(bool enable);
|
||||
void fillListWidget(const QMap<int, QString>& container, QWidget* widget, e_category category,
|
||||
SymbologyXML::SymbolTypes::t_icon_type iconType, bool withIcons = true, bool sort = true);
|
||||
|
||||
void setPushButtonFillColorBackground(QColor color);
|
||||
void widgetInsertItem(QWidget* widget, int index, const QString& text, int key, e_category category,
|
||||
SymbologyXML::SymbolTypes::t_icon_type iconType, bool withIcons);
|
||||
|
||||
QIcon getIcon(e_category category, SymbologyXML::SymbolTypes::t_icon_type iconType,
|
||||
int iconId, QSize iconSize);
|
||||
void drawSymbol(const SymbologyXML::Symbol* symbol, QGraphicsScene* scene, const QColor& color,
|
||||
const QColor& fillColor, double z, bool isAttrib = false, bool updateMap = false,
|
||||
bool drawBoundRect = false);
|
||||
|
||||
int getFrameSymbolID(SymbologyXML::SymbolTypes::t_dimen dimen,
|
||||
SymbologyXML::SymbolTypes::t_affil affil);
|
||||
void drawSymbolPrimitive(SymbologyXML::Primitive* primitive, QGraphicsScene* scene, const QColor& color,
|
||||
const QColor& fillColor, double z, bool isAttrib = false, bool drawBoundRect = false);
|
||||
|
||||
void fillListWidget(const QMap<int, QString> &container, QWidget *widget,
|
||||
e_category category, SymbologyXML::SymbolTypes::t_icon_type iconType,
|
||||
bool withIcons = true, bool sort = true);
|
||||
void copyElementsFromSymbol(const SymbologyXML::Symbol& tmpSymbol) const;
|
||||
|
||||
void widgetInsertItem(QWidget *widget, int index, const QString &text, int key,
|
||||
e_category category, SymbologyXML::SymbolTypes::t_icon_type iconType,
|
||||
bool withIcons);
|
||||
|
||||
void drawSymbol(const SymbologyXML::Symbol *symbol, QGraphicsScene *scene,
|
||||
const QColor &color, const QColor &fillColor,
|
||||
double z, bool isAttrib = false, bool updateMap = false, bool drawBoundRect = false);
|
||||
|
||||
void drawSymbolPrimitive(SymbologyXML::Primitive *primitive, QGraphicsScene *scene,
|
||||
const QColor &color, const QColor &fillColor,
|
||||
double z, bool isAttrib = false, bool drawBoundRect = false);
|
||||
|
||||
void copyElementsFromSymbol(const SymbologyXML::Symbol &tmpSymbol) const;
|
||||
|
||||
Ui::SymbolEditor *m_ui;
|
||||
SymbolEditorPrivate *m_internal;
|
||||
LtsSession::LtsSession *m_session;
|
||||
Ui::SymbolEditor* m_ui;
|
||||
SymbolEditorPrivate* m_internal;
|
||||
LtsSession::LtsSession* m_session;
|
||||
};
|
||||
|
||||
}
|
||||
} // namespace AdvancedSymbology
|
||||
Reference in new issue
Block a user