Merge branch 'main' into 'feature/save'

# Conflicts:
#   mainwindow.cpp
#   mainwindow.h
#   mainwindow.ui
#   step.h
This commit is contained in:
JOSSERAND GIOVANNI p2405212
2025-06-20 12:20:12 +00:00
8 changed files with 444 additions and 28 deletions
+19 -2
View File
@@ -2,7 +2,8 @@
#define MAINWINDOW_H
#include <QMainWindow>
#include <QUndoStack>
#include <QClipboard>
#include "path.h"
QT_BEGIN_NAMESPACE
@@ -21,7 +22,9 @@ public:
void updatePathView();
void updateStepView(size_t num);
void onTextChanged();
void loadPath();
void loadNewPath();
void loadPath(Path* p);
void loadStep(Step s);
void addNewPath();
void addNewStep();
void exportHTMLMap();
@@ -36,6 +39,18 @@ private slots:
void on_actionSave_triggered();
void on_actionopenFile_triggered();
void on_actionEditCopy_triggered();
void on_actionEditPaste_triggered();
void on_actionEditCut_triggered();
void on_pathNumber_valueChanged(int arg1);
void on_stepNumber_valueChanged(int arg1);
private:
Ui::MainWindow *ui;
QString currentFile;
@@ -43,5 +58,7 @@ private:
QList<Path*> path;
Path* currentPath;
void loadImage(QString fileName);
QUndoStack *undoStack;
QClipboard* Clipboard;
};
#endif // MAINWINDOW_H