Merge branch 'fix/localistation' into 'dev'
Save loc on validation and stop validation when stepNumber value is changed See merge request p2406187/sae201!34
This commit is contained in:
commit
10695d0190
@ -675,6 +675,8 @@ void MainWindow::on_validateBtn_clicked()
|
|||||||
this->currentPath->setDuration(ui->durationSpin->value());
|
this->currentPath->setDuration(ui->durationSpin->value());
|
||||||
this->currentPath->getStep()[ui->stepNumber->value()-1].setTitle(ui->stepTitle->text());
|
this->currentPath->getStep()[ui->stepNumber->value()-1].setTitle(ui->stepTitle->text());
|
||||||
this->currentPath->getStep()[ui->stepNumber->value()-1].setResponse(ui->responseSpin->value());
|
this->currentPath->getStep()[ui->stepNumber->value()-1].setResponse(ui->responseSpin->value());
|
||||||
|
this->currentPath->getStep()[ui->stepNumber->value()-1].setLongitude(ui->longitudeSpin->value());
|
||||||
|
this->currentPath->getStep()[ui->stepNumber->value()-1].setLatitude(ui->LatitudeSpin->value());
|
||||||
this->currentPath->getStep()[ui->stepNumber->value()-1].clearPersonnages();
|
this->currentPath->getStep()[ui->stepNumber->value()-1].clearPersonnages();
|
||||||
this->currentPath->getStep()[ui->stepNumber->value()-1].clearTextes();
|
this->currentPath->getStep()[ui->stepNumber->value()-1].clearTextes();
|
||||||
extractDialogue();
|
extractDialogue();
|
||||||
|
|||||||
8
step.cpp
8
step.cpp
@ -106,11 +106,15 @@ Step::Step( QJsonObject &in)
|
|||||||
texte.append(textes);
|
texte.append(textes);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Step::setLatitude(float lat) {
|
||||||
|
latitude = lat;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Step::setLongitude(float lon) {
|
||||||
|
longitude = lon;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void Step::setLatitude(int degree, float minute, QChar NS)
|
void Step::setLatitude(int degree, float minute, QChar NS)
|
||||||
|
|||||||
2
step.h
2
step.h
@ -22,6 +22,8 @@ public:
|
|||||||
Step(QJsonObject &in);
|
Step(QJsonObject &in);
|
||||||
void setLatitude(int degree,float minute,QChar NS);
|
void setLatitude(int degree,float minute,QChar NS);
|
||||||
void setLongitude(int degree,float minute,QChar EW);
|
void setLongitude(int degree,float minute,QChar EW);
|
||||||
|
void setLatitude(float lat);
|
||||||
|
void setLongitude(float lon);
|
||||||
QString getTitle() const;
|
QString getTitle() const;
|
||||||
float getLatitude() const;
|
float getLatitude() const;
|
||||||
float getLongitude() const;
|
float getLongitude() const;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user