rtkconv_qt: add the sort satellites option

Author: ourairquality

app/qtapp/rtkconv_qt/convmain.cpp

@@ -916,6 +916,7 @@ void MainWindow::convertFile()
     conversionThread->rnxopt.autopos = convOptDialog->autoPosition;
     conversionThread->rnxopt.phshift = convOptDialog->phaseShift;
     conversionThread->rnxopt.halfcyc = convOptDialog->halfCycle;
+    conversionThread->rnxopt.sortsats = convOptDialog->sortSats;
     conversionThread->rnxopt.outiono = convOptDialog->outputIonoCorr;
     conversionThread->rnxopt.outtime = convOptDialog->outputTimeCorr;
     conversionThread->rnxopt.outleaps = convOptDialog->outputLeapSeconds;

app/qtapp/rtkconv_qt/convopt.cpp

@@ -67,6 +67,7 @@ void ConvOptDialog::updateUi()
     ui->cBAutoPosition->setChecked(autoPosition);
     ui->cBPhaseShift->setChecked(phaseShift);
     ui->cBHalfCycle->setChecked(halfCycle);
+    ui->cBSortSats->setChecked(sortSats);
     ui->cBOutputIonoCorr->setChecked(outputIonoCorr);
     ui->cBOutputTimeCorr->setChecked(outputTimeCorr);
     ui->cBOutputLeapSecs->setChecked(outputLeapSeconds);
@@ -132,6 +133,7 @@ void ConvOptDialog::accept()
     autoPosition = ui->cBAutoPosition->isChecked();
     phaseShift = ui->cBPhaseShift->isChecked();
     halfCycle = ui->cBHalfCycle->isChecked();
+    sortSats = ui->cBSortSats->isChecked();
     outputIonoCorr = ui->cBOutputIonoCorr->isChecked();
     outputTimeCorr = ui->cBOutputTimeCorr->isChecked();
     outputLeapSeconds = ui->cBOutputLeapSecs->isChecked();
@@ -286,6 +288,7 @@ void ConvOptDialog::loadOptions(QSettings &ini)
     autoPosition = ini.value("opt/autopos", 0).toInt();
     phaseShift = ini.value("opt/phaseShift", 0).toInt();
     halfCycle = ini.value("opt/halfcyc", 0).toInt();
+    sortSats = ini.value("opt/sortsats", 0).toInt();
     outputIonoCorr = ini.value("opt/outiono", 0).toInt();
     outputTimeCorr = ini.value("opt/outtime", 0).toInt();
     outputLeapSeconds = ini.value("opt/outleaps", 0).toInt();
@@ -340,6 +343,7 @@ void ConvOptDialog::saveOptions(QSettings &ini)
     ini.setValue("opt/autopos", autoPosition);
     ini.setValue("opt/phasewhift", phaseShift);
     ini.setValue("opt/halfcyc", halfCycle);
+    ini.setValue("opt/sortsats", sortSats);
     ini.setValue("opt/outiono", outputIonoCorr);
     ini.setValue("opt/outtime", outputTimeCorr);
     ini.setValue("opt/outleaps", outputLeapSeconds);

app/qtapp/rtkconv_qt/convopt.h

@@ -32,7 +32,7 @@ class ConvOptDialog : public QDialog
     QString codeMask[7];
     double approxPosition[3], antennaDelta[3], timeTolerance;
     int rinexVersion, rinexFile, navSys, observationType, frequencyType, traceLevel;
-    int autoPosition, phaseShift, halfCycle, outputIonoCorr, outputTimeCorr, outputLeapSeconds, separateNavigation;
+    int autoPosition, phaseShift, halfCycle, sortSats, outputIonoCorr, outputTimeCorr, outputLeapSeconds, separateNavigation;
     int enableGlonassFrequency, glonassFrequency[27];
 
 protected slots:

app/qtapp/rtkconv_qt/convopt.ui

@@ -489,6 +489,16 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QCheckBox" name="cBSortSats">
+        <property name="toolTip">
+         <string>Sort observations by their internal satellite number</string>
+        </property>
+        <property name="text">
+         <string>Sort Satellites</string>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="QCheckBox" name="cBPhaseShift">
         <property name="toolTip">