Qt Gui: Fix updating option dialog for rtkpost_qt and rtknavi_qt

- option dialog did not show the latest options

Author: JensReimann

app/qtapp/appcmn_qt/navi_post_opt.cpp

@@ -366,7 +366,7 @@ void OptDialog::showEvent(QShowEvent *event)
 
     ui->tWOptions->setCurrentIndex(0);
 
-    updateEnable();
+    updateUi(processingOptions, solutionOptions, fileOptions);
 }
 //---------------------------------------------------------------------------
 void OptDialog::loadSettings()
@@ -883,41 +883,22 @@ void OptDialog::updateOptions()
         baseList = ui->tEBaseList->toPlainText();
     }
 }
-
-//---------------------------------------------------------------------------
-void OptDialog::accept()
-{
-    updateOptions();
-
-    QDialog::accept();
-}
-//---------------------------------------------------------------------------
-void OptDialog::load(const QString &file)
+void OptDialog::updateUi(const prcopt_t &prcopt, const solopt_t &solopt, const filopt_t &filopt)
 {
     QLineEdit *editu[] = {ui->lERoverPosition1, ui->lERoverPosition2, ui->lERoverPosition3};
     QLineEdit *editr[] = {ui->lEReferencePosition1, ui->lEReferencePosition2, ui->lEReferencePosition3};
-    prcopt_t prcopt = prcopt_default;
-    solopt_t solopt = solopt_default;
-    filopt_t filopt;
-
-    memset(&filopt, 0, sizeof(filopt_t));
 
-	resetsysopts();
-    if (!loadopts(qPrintable(file), sysopts)) return;
-    if (appOptions && !loadopts(qPrintable(file), appOptions)) return;
-    if (!loadopts(qPrintable(file), naviopts)) return;
-    getsysopts(&prcopt, &solopt, &filopt);
     proxyAddress = proxyaddr;
 
     if (options == NaviOptions) {
-      ui->sBServerCycle->setValue(serverCycle);
-      ui->sBTimeoutTime->setValue(timeoutTime);
-      ui->sBReconnectTime->setValue(reconnectTime);
-      ui->sBNmeaCycle->setValue(nmeaCycle);
-      ui->sBServerBufferSize->setValue(serverBufferSize);
-      ui->cBNavSelect->setCurrentIndex(navSelect);
-      ui->lEProxyAddress->setText(proxyaddr);
-      ui->sBFileSwapMargin->setValue(fileSwapMargin);
+        ui->sBServerCycle->setValue(serverCycle);
+        ui->sBTimeoutTime->setValue(timeoutTime);
+        ui->sBReconnectTime->setValue(reconnectTime);
+        ui->sBNmeaCycle->setValue(nmeaCycle);
+        ui->sBServerBufferSize->setValue(serverBufferSize);
+        ui->cBNavSelect->setCurrentIndex(navSelect);
+        ui->lEProxyAddress->setText(proxyaddr);
+        ui->sBFileSwapMargin->setValue(fileSwapMargin);
     }
 
     ui->sBSbasSatellite->setValue(prcopt.sbassatsel);
@@ -1071,7 +1052,31 @@ void OptDialog::load(const QString &file)
     // filopt.trace
 
     readAntennaList();
-	updateEnable();
+    updateEnable();
+}
+//---------------------------------------------------------------------------
+void OptDialog::accept()
+{
+    updateOptions();
+
+    QDialog::accept();
+}
+//---------------------------------------------------------------------------
+void OptDialog::load(const QString &file)
+{
+    prcopt_t prcopt = prcopt_default;
+    solopt_t solopt = solopt_default;
+    filopt_t filopt;
+
+    memset(&filopt, 0, sizeof(filopt_t));
+
+	resetsysopts();
+    if (!loadopts(qPrintable(file), sysopts)) return;
+    if (appOptions && !loadopts(qPrintable(file), appOptions)) return;
+    if (!loadopts(qPrintable(file), naviopts)) return;
+    getsysopts(&prcopt, &solopt, &filopt);
+
+    updateUi(prcopt, solopt, filopt);
 }
 //---------------------------------------------------------------------------
 void OptDialog::save(const QString &file)
@@ -1875,7 +1880,7 @@ int OptDialog::getPosition(int type, QLineEdit **edit, double *pos)
     return ret;
 }
 //---------------------------------------------------------------------------
-void OptDialog::setPosition(int type, QLineEdit **edit, double *pos)
+void OptDialog::setPosition(int type, QLineEdit **edit, const double *pos)
 {
     double p[3], dms1[3], dms2[3], s1, s2;
 
@@ -1977,7 +1982,7 @@ void OptDialog::showFrequenciesDialog()
     delete freqDialog;
 }
 //---------------------------------------------------------------------------
-QString OptDialog::excludedSatellitesString(prcopt_t *prcopt)
+QString OptDialog::excludedSatellitesString(const prcopt_t *prcopt)
 {
     QString buff;
     char id[32];

app/qtapp/appcmn_qt/navi_post_opt.h

@@ -49,7 +49,7 @@ class OptDialog : public QDialog
 
 protected:
     void showEvent(QShowEvent*);
-    QString excludedSatellitesString(prcopt_t *prcopt);
+    QString excludedSatellitesString(const prcopt_t *prcopt);
     bool fillExcludedSatellites(prcopt_t *prcopt, const QString &excludedSatellites);
 
     char proxyaddr[1024];  // proxy address stores in naviopts
@@ -75,7 +75,7 @@ protected slots:
     void referencePositionTypeChanged(int);
     void roverPositionTypeChanged(int);
     int getPosition(int type, QLineEdit **edit, double *pos);
-    void setPosition(int type, QLineEdit **edit, double *pos);
+    void setPosition(int type, QLineEdit **edit, const double *pos);
     void selectPanelFont();
     void selectSolutionFont();
     void selectGeoidDataFile();
@@ -100,6 +100,7 @@ protected slots:
     void showFrequenciesDialog();
     void showKeyDialog();
     void updateOptions();
+    void updateUi(const prcopt_t &prcopt, const solopt_t &solopt, const filopt_t &filopt);
     QString stripped(const QString input, const QString suffix) const;
     int options;
     Ui::OptDialog *ui;