Merge branch '2.2' into 2.3

2018-07-08 21:01:01 -04:00
parent 3540015132 e916c6dc9a
commit e24a736fc9
5 changed files with 10 additions and 8 deletions
@@ -942,7 +942,7 @@ QString TelemetrySimulator::LogPlaybackController::convertGPS(QString input)
    lon = convertDegMin(lonLat[0]);
    lat = convertDegMin(lonLat[1]);
  }
-  return QString::number(lat) + ", " + QString::number(lon);
+  return QString::number(lat, 'f', 6) + ", " + QString::number(lon, 'f', 6);
 }

 void TelemetrySimulator::LogPlaybackController::updatePositionLabel(int32_t percentage)