chore: clean up now-unused code from telemetry log replayer

The code to check for the old (pre-OpenTX 2.1.9, Sep 2016) format of GPS coordinates in log CSVs is no longer used since EdgeTX#5410 so remove it. Also, drive by spelling fix.
nrw505 · Aug 23, 2024 · 2bc7073 · 2bc7073
1 parent 005bd19
commit 2bc7073
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 37 deletions.
diff --git a/companion/src/simulation/telemetrysimu.cpp b/companion/src/simulation/telemetrysimu.cpp
@@ -296,8 +296,6 @@ TelemetrySimulator::LogPlaybackController::LogPlaybackController(Ui::TelemetrySi
   TelemetrySimulator::LogPlaybackController::sim = sim;
   TelemetrySimulator::LogPlaybackController::ui = ui;
   stepping = false;
-  logFileGpsCordsInDecimalFormat = false;
-
 }
 
 QString convertFeetToMeters(QString input)
@@ -402,7 +400,7 @@ QString convertItemValue(QString sourceUnit, QString destUnit, QString value)
   return value;
 }
 
-QDateTime TelemetrySimulator::LogPlaybackController::parseTransmittterTimestamp(QString row)
+QDateTime TelemetrySimulator::LogPlaybackController::parseTransmitterTimestamp(QString row)
 {
   QStringList rowParts = row.simplified().split(',');
   if (rowParts.size() < 2) {
@@ -422,31 +420,6 @@ QDateTime TelemetrySimulator::LogPlaybackController::parseTransmittterTimestamp(
   return QDateTime::fromString(datePart + " " + timePart, format);
 }
 
-void TelemetrySimulator::LogPlaybackController::checkGpsFormat()
-{
-  // sample the first record to check if cords are in decimal format
-  logFileGpsCordsInDecimalFormat = false;
-  if(csvRecords.count() > 1) {
-    QStringList keys = csvRecords[0].split(',');
-    if(keys.contains("GPS")) {
-      int gpsColIndex = keys.indexOf("GPS");
-      QStringList firstRowVlues = csvRecords[1].split(',');
-      QString gpsSample = firstRowVlues[gpsColIndex];
-      QStringList cords = gpsSample.simplified().split(' ');
-      if (cords.count() == 2) {
-        // frsky and TBS crossfire GPS sensor logs cords in decimal format with a precision of 6 places
-        // if this format is met there is no need to call convertDegMin later on when processing the file
-        QRegularExpression decimalCoordinateFormatRegex("^[-+]?\\d{1,2}[.]\\d{6}$");
-        QRegularExpressionMatch latFormatMatch = decimalCoordinateFormatRegex.match(cords[0]);
-        QRegularExpressionMatch lonFormatMatch = decimalCoordinateFormatRegex.match(cords[1]);
-        if (lonFormatMatch.hasMatch() && latFormatMatch.hasMatch()) {
-          logFileGpsCordsInDecimalFormat = true;
-        }
-      }
-    }
-  }
-}
-
 void TelemetrySimulator::LogPlaybackController::calcLogFrequency()
 {
   // examine up to 20 rows to determine log frequency in seconds
@@ -455,7 +428,7 @@ void TelemetrySimulator::LogPlaybackController::calcLogFrequency()
   QDateTime lastTime;
   for (int i = 2; (i < 21) && (i < csvRecords.count()); i++)
   {
-    QDateTime logTime = parseTransmittterTimestamp(csvRecords[i]);
+    QDateTime logTime = parseTransmitterTimestamp(csvRecords[i]);
     // ugh - no timespan in this Qt version
     double timeDiff = (logTime.toMSecsSinceEpoch() - lastTime.toMSecsSinceEpoch()) / 1000.0;
     if ((timeDiff > 0.09) && (timeDiff < logFrequency)) {
@@ -519,7 +492,6 @@ void TelemetrySimulator::LogPlaybackController::loadLogFile()
     ui->replayRate->setEnabled(true);
     recordIndex = 1;
     calcLogFrequency();
-    checkGpsFormat();
   }
   ui->logFileLabel->setText(QFileInfo(logFileNameAndPath).fileName());
   rewind();
@@ -582,7 +554,7 @@ void TelemetrySimulator::LogPlaybackController::updatePositionLabel(int32_t perc
     }
   }
   // format the transmitter date info
-  QDateTime transmitterTimestamp = parseTransmittterTimestamp(csvRecords[recordIndex]);
+  QDateTime transmitterTimestamp = parseTransmitterTimestamp(csvRecords[recordIndex]);
   QString format("yyyy-MM-dd hh:mm:ss.z");
   ui->positionLabel->setText("Row " + QString::number(recordIndex) + " of " + QString::number(csvRecords.count() - 1)
               + "\n" + transmitterTimestamp.toString(format));

diff --git a/companion/src/simulation/telemetrysimu.h b/companion/src/simulation/telemetrysimu.h
@@ -106,15 +106,10 @@ class TelemetrySimulator : public QWidget
         void updatePositionLabel(int32_t percentage);
         void setUiDataValues();
         double logFrequency; // in seconds
-        bool logFileGpsCordsInDecimalFormat;
 
       private:
-        QString convertGPSDate(QString input);
-        QString convertGPS(QString input);
-        double convertDegMin(QString input);
-        QDateTime parseTransmittterTimestamp(QString row);
+        QDateTime parseTransmitterTimestamp(QString row);
         void calcLogFrequency();
-        void checkGpsFormat();
 
         Ui::TelemetrySimulator * ui;
         TelemetrySimulator * sim;