Merge branch 'main' into 'feature/save'
# Conflicts: # mainwindow.cpp # mainwindow.h # mainwindow.ui # step.h
This commit is contained in:
@@ -34,6 +34,16 @@ Step::Step() {
|
||||
}
|
||||
|
||||
|
||||
QList<QString> Step::getPersonnage() const
|
||||
{
|
||||
return personnage;
|
||||
}
|
||||
|
||||
QList<QString> Step::getTexte() const
|
||||
{
|
||||
return texte;
|
||||
}
|
||||
|
||||
Step::Step( QJsonObject &in)
|
||||
{
|
||||
title = in["title"].toString();
|
||||
@@ -41,7 +51,7 @@ Step::Step( QJsonObject &in)
|
||||
QString gps = in["GPS"].toString();
|
||||
QStringList parts = gps.split(" ", Qt::SkipEmptyParts);
|
||||
|
||||
QChar latDir = parts[0][0]; // c'est le premier QChar du QString t'as capté
|
||||
QChar latDir = parts[0][0];
|
||||
int latDeg = parts[1].toInt();
|
||||
float latMin = parts[2].toFloat();
|
||||
setLatitude(latDeg, latMin, latDir);
|
||||
|
||||
Reference in New Issue
Block a user