From 269f96a56b28c35df67d29847b6e0c0b30e91b91 Mon Sep 17 00:00:00 2001 From: T'JAMPENS QUENTIN p2406187 Date: Wed, 18 Jun 2025 15:26:37 +0200 Subject: [PATCH 1/6] Add path class --- mainwindow.ui | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++ sae201.pro | 6 +- 2 files changed, 167 insertions(+), 2 deletions(-) diff --git a/mainwindow.ui b/mainwindow.ui index c6854ca..8cd275b 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -23,8 +23,171 @@ 23 + + + File + + + + + + + + Edit + + + + + + + toolBar + + + TopToolBarArea + + + false + + + + + + + + + + + + + + + + + Open + + + + + Save + + + + + Save as + + + + + + + + NewFile + + + QAction::MenuRole::NoRole + + + + + + + + SaveFile + + + QAction::MenuRole::NoRole + + + + + + + + SaveAsFile + + + QAction::MenuRole::NoRole + + + + + + + + PrintFile + + + QAction::MenuRole::NoRole + + + + + + + + EditCopy + + + QAction::MenuRole::NoRole + + + + + + + + EditPaste + + + QAction::MenuRole::NoRole + + + + + + + + EditCut + + + QAction::MenuRole::NoRole + + + + + + + + EditDelete + + + QAction::MenuRole::NoRole + + + + + + + + EditUndo + + + QAction::MenuRole::NoRole + + + + + + + + EditRedo + + + QAction::MenuRole::NoRole + + diff --git a/sae201.pro b/sae201.pro index b915c09..027fe54 100644 --- a/sae201.pro +++ b/sae201.pro @@ -10,10 +10,12 @@ CONFIG += c++17 SOURCES += \ main.cpp \ - mainwindow.cpp + mainwindow.cpp \ + path.cpp HEADERS += \ - mainwindow.h + mainwindow.h \ + path.h FORMS += \ mainwindow.ui From fa52281d2be058bcd167ff362b2ff70bc45a99fb Mon Sep 17 00:00:00 2001 From: T'JAMPENS QUENTIN p2406187 Date: Wed, 18 Jun 2025 16:49:40 +0200 Subject: [PATCH 2/6] Add path information --- mainwindow.ui | 272 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 270 insertions(+), 2 deletions(-) diff --git a/mainwindow.ui b/mainwindow.ui index 8cd275b..b4ff5e1 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -7,13 +7,281 @@ 0 0 800 - 600 + 626 MainWindow - + + + + 800 + 521 + + + + + + + + 0 + 0 + + + + + 16777215 + 20 + + + + Path information + + + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop + + + + + + + + 16777215 + 16777215 + + + + QFrame::Shape::StyledPanel + + + QFrame::Shadow::Raised + + + + + 10 + 20 + 45 + 27 + + + + + + + 60 + 20 + 391 + 26 + + + + + + + 10 + 60 + 441 + 45 + + + + + 0 + + + 0 + + + + + Localisation + + + + + + + + + + + + + + + 470 + 20 + 281 + 191 + + + + + + + + + + 0 + 110 + 451 + 63 + + + + + 0 + + + 0 + + + + + + + + Difficulty + + + + + + + /5 + + + 5 + + + + + + + + + + + + + Duration + + + + + + + h + + + 1 + + + 0.100000000000000 + + + + + + + + + + + + + Lenght + + + + + + + Km + + + 1 + + + 500.000000000000000 + + + 0.100000000000000 + + + + + + + + + + + + 0 + 180 + 451 + 44 + + + + + 9 + + + 0 + + + + + Image + + + + + + + + + + Select Image File + + + + + + + + + + + + 16777215 + 20 + + + + Step information + + + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop + + + + + + + QFrame::Shape::StyledPanel + + + QFrame::Shadow::Raised + + + + + From 30489206665077084b14fc3193dae5c8a07ed912 Mon Sep 17 00:00:00 2001 From: T'JAMPENS QUENTIN p2406187 Date: Wed, 18 Jun 2025 17:08:29 +0200 Subject: [PATCH 3/6] Add image --- mainwindow.ui | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/mainwindow.ui b/mainwindow.ui index b4ff5e1..bd25946 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -108,7 +108,7 @@ - + 470 @@ -192,7 +192,7 @@ - Lenght + Length @@ -241,7 +241,7 @@ - + @@ -335,16 +335,25 @@ Open + + Ctrl+O + Save + + Ctrl+S + Save as + + Ctrl+Shift+S + From 332fa2bc0b3cb7f5a1db444b727c49918874cdc4 Mon Sep 17 00:00:00 2001 From: T'JAMPENS QUENTIN p2406187 Date: Wed, 18 Jun 2025 23:13:05 +0200 Subject: [PATCH 4/6] Create function, add path data and interaction --- mainwindow.cpp | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++ mainwindow.h | 7 +++++ 2 files changed, 88 insertions(+) diff --git a/mainwindow.cpp b/mainwindow.cpp index 2740a6e..d6e2882 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,6 +1,9 @@ #include "mainwindow.h" #include "ui_mainwindow.h" +#include +#include + MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) , ui(new Ui::MainWindow) @@ -11,4 +14,82 @@ MainWindow::MainWindow(QWidget *parent) MainWindow::~MainWindow() { delete ui; + delete currentPath; + + for(Path* p : path) { + delete p; + } } + +void MainWindow::updatePathView() +{ + +} + +void MainWindow::updateStepView(size_t num) +{ + +} + +void MainWindow::onTextChanged() +{ + textChanged = true; +} + +void MainWindow::loadPath(QTextStream &in) +{ + +} + +void MainWindow::addNewPath() +{ + +} + +void MainWindow::addNewStep() +{ + +} + +void MainWindow::exportHTMLMap() +{ + +} + +void MainWindow::on_pushButton_clicked() +{ + + QString ext[] = {"png", "jpeg", "jpg"}; + QString fileName = QFileDialog::getOpenFileName(this, "Open the file"); + if (fileName.isEmpty()) return; + QFile file(fileName); + if (!file.open(QIODevice::ReadOnly | QFile::Text)) { + QMessageBox::warning(this, "Warning", "Cannot open file: " + + file.errorString()); + return; + } + QString text = file.fileName(); + + bool acceptedExt = false; + for(QString e : ext) { + if(text.endsWith(e)) acceptedExt = true; + } + + if(!acceptedExt) { + QMessageBox::warning(this, "Warning", "Format de fichier incorrect"); + return; + } + + + ui->imagePath->setText(text); + + + QPixmap px(fileName); + + ui->imageLbl->setPixmap(px); + + file.close(); + + +} + diff --git a/mainwindow.h b/mainwindow.h index d622c71..1146f46 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -3,6 +3,8 @@ #include +#include "path.h" + QT_BEGIN_NAMESPACE namespace Ui { class MainWindow; @@ -24,9 +26,14 @@ public: void addNewStep(); void exportHTMLMap(); +private slots: + void on_pushButton_clicked(); + private: Ui::MainWindow *ui; QString currentFile; bool textChanged; + QList path; + Path* currentPath; }; #endif // MAINWINDOW_H From 81b420911832732ddc1967ccd04b5aeb8b0ea982 Mon Sep 17 00:00:00 2001 From: T'JAMPENS QUENTIN p2406187 Date: Thu, 19 Jun 2025 09:35:28 +0200 Subject: [PATCH 5/6] Create open btn --- mainwindow.cpp | 16 ++++++++++++++++ mainwindow.h | 2 ++ mainwindow.ui | 12 ++++++++++++ 3 files changed, 30 insertions(+) diff --git a/mainwindow.cpp b/mainwindow.cpp index d6e2882..69a8d9e 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -60,6 +60,7 @@ void MainWindow::on_pushButton_clicked() { QString ext[] = {"png", "jpeg", "jpg"}; + QString fileName = QFileDialog::getOpenFileName(this, "Open the file"); if (fileName.isEmpty()) return; QFile file(fileName); @@ -93,3 +94,18 @@ void MainWindow::on_pushButton_clicked() } + +void MainWindow::on_actionOpen_triggered() +{ + + QString fileName = QFileDialog::getOpenFileName(this, "Open the file"); + if(fileName.isEmpty()) return; + QFile file(fileName); + if(!file.open(QIODevice::ReadOnly | QFile::Text)) { + QMessageBox::warning(this, "Warning", "Fichier non valide" + file.errorString()); + return; + } + + +} + diff --git a/mainwindow.h b/mainwindow.h index 1146f46..38e219a 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -29,6 +29,8 @@ public: private slots: void on_pushButton_clicked(); + void on_actionOpen_triggered(); + private: Ui::MainWindow *ui; QString currentFile; diff --git a/mainwindow.ui b/mainwindow.ui index bd25946..8c3b28b 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -319,6 +319,7 @@ false + @@ -465,6 +466,17 @@ QAction::MenuRole::NoRole + + + + + + New + + + QAction::MenuRole::NoRole + + From 1f1181e565ee29bd03d42e9d8506958103c6d108 Mon Sep 17 00:00:00 2001 From: T'JAMPENS QUENTIN p2406187 Date: Thu, 19 Jun 2025 09:35:57 +0200 Subject: [PATCH 6/6] Add build to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e19bf19..76265f9 100644 --- a/.gitignore +++ b/.gitignore @@ -454,3 +454,4 @@ compile_commands.json *creator.user* *_qmlcache.qrc +build