Merge pull request #668 from ourairquality/rtknavi-emit-refpos-rel

rtknavi: emit the base reference position in all relative modes

Author: JensReimann

app/qtapp/rtknavi_qt/navimain.cpp

@@ -2305,8 +2305,7 @@ void MainWindow::saveLogs()
 
         data = tr("%% program : %1 ver. %2 %3\n").arg(PRGNAME, VER_RTKLIB, PATCH_LEVEL);
         str << data;
-        if (optDialog->processingOptions.mode == PMODE_DGPS || optDialog->processingOptions.mode == PMODE_KINEMA ||
-            optDialog->processingOptions.mode == PMODE_STATIC) {
+        if (optDialog->processingOptions.mode >= PMODE_DGPS && optDialog->processingOptions.mode <= PMODE_FIXED) {
             ecef2pos(optDialog->processingOptions.rb, pos);
             data = QStringLiteral("%% ref pos   :%1 %2 %3\n").arg(pos[0] * R2D, 13, 'f', 9)
                    .arg(pos[1] * R2D, 14, 'f', 9).arg(pos[2], 10, 'f', 4);

app/winapp/rtknavi/navimain.cpp

@@ -2251,8 +2251,7 @@ void __fastcall TMainForm::SaveLog(void)
     opt.posf=posf[SolType];
     if (SolOpt.outhead) {
         fprintf(fp,"%% program   : %s ver.%s %s\n",PRGNAME,VER_RTKLIB,PATCH_LEVEL);
-        if (PrcOpt.mode==PMODE_DGPS||PrcOpt.mode==PMODE_KINEMA||
-            PrcOpt.mode==PMODE_STATIC) {
+        if (PrcOpt.mode>=PMODE_DGPS && PrcOpt.mode<=PMODE_FIXED) {
             ecef2pos(PrcOpt.rb,pos);
             fprintf(fp,"%% ref pos   :%13.9f %14.9f %10.4f\n",pos[0]*R2D,
                     pos[1]*R2D,pos[2]);