Giovanni-Josserand/SAE-terra-aventura
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/validateBtn' into 'main'

Browse Source 
Feature/validate btn

See merge request p2406187/sae201!17
This commit is contained in:
T'JAMPENS QUENTIN p2406187 2025-06-20 14:25:05 +00:00
commit 1a0b373e8e
7 changed files with 452 additions and 355 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mainwindow.cpp
View File

@ -141,6 +141,7 @@ void MainWindow::loadStep(Step s) {
ui->stepTitle->setText(s.getTitle()); ui->stepTitle->setText(s.getTitle());
ui->LatitudeSpin->setValue(s.getLatitude()); ui->LatitudeSpin->setValue(s.getLatitude());
ui->longitudeSpin->setValue(s.getLongitude()); ui->longitudeSpin->setValue(s.getLongitude());
ui->responseSpin->setValue(s.getResponse());
for(int i = 0; i < s.getTexte().length(); i++) { for(int i = 0; i < s.getTexte().length(); i++) {
QString q = s.getPersonnage().at(i) + ": " + s.getTexte().at(i); QString q = s.getPersonnage().at(i) + ": " + s.getTexte().at(i);
@ -320,6 +321,7 @@ void MainWindow::on_actionEditCut_triggered()
void MainWindow::on_pathNumber_valueChanged(int arg1) void MainWindow::on_pathNumber_valueChanged(int arg1)
{ {
this->loadPath(path.at(ui->pathNumber->value()-1)); this->loadPath(path.at(ui->pathNumber->value()-1));
currentPath = path.at(arg1-1);
} }
@ -328,3 +330,18 @@ void MainWindow::on_stepNumber_valueChanged(int arg1)
this->loadStep(currentPath->getStep().at(arg1-1)); this->loadStep(currentPath->getStep().at(arg1-1));
} }
void MainWindow::on_validateBtn_clicked()
{
currentPath->setName(ui->titleEdit->text());
currentPath->setCity(ui->locEdit->text());
currentPath->setImage(ui->imagePath->text());
currentPath->setLength(ui->lengthSpin->value());
currentPath->setDifficulty(ui->diffSpin->value());
currentPath->setDuration(ui->durationSpin->value());
currentPath->getStep()[ui->stepNumber->value()-1].setTitle(ui->stepTitle->text());
currentPath->getStep()[ui->stepNumber->value()-1].setResponse(ui->responseSpin->value());
}

2
mainwindow.h
View File

@ -51,6 +51,8 @@ private slots:
void on_stepNumber_valueChanged(int arg1); void on_stepNumber_valueChanged(int arg1);
void on_validateBtn_clicked();
private: private:
Ui::MainWindow *ui; Ui::MainWindow *ui;
QString currentFile; QString currentFile;

216
mainwindow.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>800</width> <width>800</width>
<height>598</height> <height>868</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -26,10 +26,22 @@
<string>MainWindow</string> <string>MainWindow</string>
</property> </property>
<widget class="QWidget" name="centralwidget"> <widget class="QWidget" name="centralwidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>30</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>800</width> <width>800</width>
<height>521</height> <height>1000</height>
</size> </size>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
@ -54,6 +66,12 @@
</item> </item>
<item> <item>
<widget class="QFrame" name="frame"> <widget class="QFrame" name="frame">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>16777215</width> <width>16777215</width>
@ -63,15 +81,15 @@
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::NoFrame</enum> <enum>QFrame::NoFrame</enum>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_13">
<item>
<widget class="QWidget" name="widget_8" native="true">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QWidget" name="widget_7" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_12">
<item>
<widget class="QSpinBox" name="pathNumber"> <widget class="QSpinBox" name="pathNumber">
<property name="geometry">
<rect>
<x>10</x>
<y>20</y>
<width>45</width>
<height>27</height>
</rect>
</property>
<property name="minimum"> <property name="minimum">
<number>1</number> <number>1</number>
</property> </property>
@ -79,25 +97,15 @@
<number>1</number> <number>1</number>
</property> </property>
</widget> </widget>
<widget class="QLineEdit" name="titleEdit"> </item>
<property name="geometry"> <item>
<rect> <widget class="QLineEdit" name="titleEdit"/>
<x>60</x> </item>
<y>20</y> </layout>
<width>391</width>
<height>26</height>
</rect>
</property>
</widget> </widget>
</item>
<item>
<widget class="QWidget" name="widget" native="true"> <widget class="QWidget" name="widget" native="true">
<property name="geometry">
<rect>
<x>10</x>
<y>60</y>
<width>441</width>
<height>45</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
@ -116,39 +124,13 @@
<widget class="QLineEdit" name="locEdit"/> <widget class="QLineEdit" name="locEdit"/>
</item> </item>
<item> <item>
<widget class="QSpinBox" name="depSpin"> <widget class="QSpinBox" name="spinBox_2"/>
<property name="minimum">
<number>1</number>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QLabel" name="imageLbl"> </item>
<property name="geometry"> <item>
<rect>
<x>470</x>
<y>20</y>
<width>281</width>
<height>191</height>
</rect>
</property>
<property name="text">
<string/>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget>
<widget class="QWidget" name="widget_5" native="true"> <widget class="QWidget" name="widget_5" native="true">
<property name="geometry">
<rect>
<x>0</x>
<y>110</y>
<width>451</width>
<height>63</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_5"> <layout class="QHBoxLayout" name="horizontalLayout_5">
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>0</number>
@ -159,6 +141,12 @@
<item> <item>
<widget class="QWidget" name="widget_2" native="true"> <widget class="QWidget" name="widget_2" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="topMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
<property name="text"> <property name="text">
@ -182,6 +170,12 @@
<item> <item>
<widget class="QWidget" name="widget_3" native="true"> <widget class="QWidget" name="widget_3" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_3"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="topMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
<property name="text"> <property name="text">
@ -208,6 +202,12 @@
<item> <item>
<widget class="QWidget" name="widget_4" native="true"> <widget class="QWidget" name="widget_4" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_4"> <layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="topMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
<property name="text"> <property name="text">
@ -236,15 +236,9 @@
</item> </item>
</layout> </layout>
</widget> </widget>
</item>
<item>
<widget class="QWidget" name="widget_6" native="true"> <widget class="QWidget" name="widget_6" native="true">
<property name="geometry">
<rect>
<x>0</x>
<y>180</y>
<width>451</width>
<height>44</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_6"> <layout class="QHBoxLayout" name="horizontalLayout_6">
<property name="leftMargin"> <property name="leftMargin">
<number>9</number> <number>9</number>
@ -282,6 +276,33 @@
</item> </item>
</layout> </layout>
</widget> </widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QLabel" name="imageLbl">
<property name="minimumSize">
<size>
<width>300</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>200</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget> </widget>
</item> </item>
<item> <item>
@ -300,23 +321,23 @@
<item> <item>
<widget class="QFrame" name="stepInformationFrame"> <widget class="QFrame" name="stepInformationFrame">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::NoFrame</enum> <enum>QFrame::NoFrame</enum>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QWidget" name="steptitleFrame" native="true"> <widget class="QWidget" name="steptitleFrame" native="true">
<property name="geometry">
<rect>
<x>0</x>
<y>10</y>
<width>781</width>
<height>45</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_7"> <layout class="QHBoxLayout" name="horizontalLayout_7">
<item> <item>
<widget class="QSpinBox" name="stepNumber"> <widget class="QSpinBox" name="stepNumber">
@ -341,15 +362,9 @@
</item> </item>
</layout> </layout>
</widget> </widget>
</item>
<item>
<widget class="QWidget" name="stepCoordinatesFrame" native="true"> <widget class="QWidget" name="stepCoordinatesFrame" native="true">
<property name="geometry">
<rect>
<x>0</x>
<y>60</y>
<width>781</width>
<height>63</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_11"> <layout class="QHBoxLayout" name="horizontalLayout_11">
<item> <item>
<widget class="QWidget" name="latFrame" native="true"> <widget class="QWidget" name="latFrame" native="true">
@ -427,16 +442,34 @@
</item> </item>
</layout> </layout>
</widget> </widget>
</item>
<item>
<widget class="QPlainTextEdit" name="dialogEdit"> <widget class="QPlainTextEdit" name="dialogEdit">
<property name="geometry"> <property name="sizePolicy">
<rect> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<x>10</x> <horstretch>0</horstretch>
<y>130</y> <verstretch>255</verstretch>
<width>761</width> </sizepolicy>
<height>81</height> </property>
</rect> <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="backgroundVisible">
<bool>false</bool>
</property> </property>
</widget> </widget>
</item>
<item>
<widget class="QPushButton" name="validateBtn">
<property name="text">
<string>Valider</string>
</property>
</widget>
</item>
</layout>
</widget> </widget>
</item> </item>
</layout> </layout>
@ -458,15 +491,8 @@
<addaction name="actionSave"/> <addaction name="actionSave"/>
<addaction name="actionSave_as"/> <addaction name="actionSave_as"/>
</widget> </widget>
<widget class="QMenu" name="menuEdit">
<property name="title">
<string>Edit</string>
</property>
</widget>
<addaction name="menuFile"/> <addaction name="menuFile"/>
<addaction name="menuEdit"/>
</widget> </widget>
<widget class="QStatusBar" name="statusbar"/>
<widget class="QToolBar" name="toolBar"> <widget class="QToolBar" name="toolBar">
<property name="windowTitle"> <property name="windowTitle">
<string>toolBar</string> <string>toolBar</string>

37
path.cpp
View File

@ -45,12 +45,45 @@ QString Path::getImage() const
return image; return image;
} }
QList<Step> Path::getStep() const QList<Step>& Path::getStep()
{ {
return step; return step;
} }
Path::Path(){} void Path::setCity(const QString &newCity)
{
city = newCity;
}
void Path::setDepartement(int newDepartement)
{
departement = newDepartement;
}
void Path::setName(const QString &newName)
{
name = newName;
}
void Path::setDifficulty(unsigned int newDifficulty)
{
difficulty = newDifficulty;
}
void Path::setDuration(float newDuration)
{
duration = newDuration;
}
void Path::setLength(float newLength)
{
length = newLength;
}
void Path::setImage(const QString &newImage)
{
image = newImage;
}
Path::Path(QFile *file){ Path::Path(QFile *file){
if (!file->open(QIODevice::ReadOnly)) { if (!file->open(QIODevice::ReadOnly)) {

9
path.h
View File

@ -28,7 +28,14 @@ public:
float getDuration() const; float getDuration() const;
float getLength() const; float getLength() const;
QString getImage() const; QString getImage() const;
QList<Step> getStep() const; QList<Step>& getStep();
void setCity(const QString &newCity);
void setDepartement(int newDepartement);
void setName(const QString &newName);
void setDifficulty(unsigned int newDifficulty);
void setDuration(float newDuration);
void setLength(float newLength);
void setImage(const QString &newImage);
}; };
#endif // PATH_H #endif // PATH_H

10
step.cpp
View File

@ -27,6 +27,16 @@ int Step::getResponse() const
return response; return response;
} }
void Step::setTitle(const QString &newTitle)
{
title = newTitle;
}
void Step::setResponse(int newResponse)
{
response = newResponse;
}
Step::Step() { Step::Step() {
latitude = 0.0; latitude = 0.0;
longitude = 0.0; longitude = 0.0;

2
step.h
View File

@ -29,6 +29,8 @@ public:
QString toGPSFormat(); QString toGPSFormat();
QList<QString> getPersonnage() const; QList<QString> getPersonnage() const;
QList<QString> getTexte() const; QList<QString> getTexte() const;
void setTitle(const QString &newTitle);
void setResponse(int newResponse);
}; };
#endif // STEP_H #endif // STEP_H