New option for RTKNAVI: allow Wide Lane Integer Ambiguity Resolution …

…(with optional Fix and Hold) to be selected
tomojitakasu · Mar 17, 2022 · f0ae60b · f0ae60b
1 parent c1f64f1
commit f0ae60b
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 10 deletions.
diff --git a/app/winapp/rtknavi/navimain.cpp b/app/winapp/rtknavi/navimain.cpp
@@ -2453,6 +2453,7 @@ void __fastcall TMainForm::LoadOpt(void)
     PrcOpt.dynamics =ini->ReadInteger("prcopt", "dynamics",        0);
     PrcOpt.tidecorr =ini->ReadInteger("prcopt", "tidecorr",        0);
     PrcOpt.modear   =ini->ReadInteger("prcopt", "modear",          1);
+    PrcOpt.wlmodear =ini->ReadInteger("prcopt", "wlmodear",        0);
     PrcOpt.glomodear=ini->ReadInteger("prcopt", "glomodear",       0);
     PrcOpt.bdsmodear=ini->ReadInteger("prcopt", "bdsmodear",       0);
     PrcOpt.maxout   =ini->ReadInteger("prcopt", "maxout",          5);
@@ -2701,6 +2702,7 @@ void __fastcall TMainForm::SaveOpt(void)
     ini->WriteInteger("prcopt", "dynamics",   PrcOpt.dynamics    );
     ini->WriteInteger("prcopt", "tidecorr",   PrcOpt.tidecorr    );
     ini->WriteInteger("prcopt", "modear",     PrcOpt.modear      );
+    ini->WriteInteger("prcopt", "wlmodear",   PrcOpt.wlmodear    );
     ini->WriteInteger("prcopt", "glomodear",  PrcOpt.glomodear   );
     ini->WriteInteger("prcopt", "bdsmodear",  PrcOpt.bdsmodear   );
     ini->WriteInteger("prcopt", "maxout",     PrcOpt.maxout      );

diff --git a/app/winapp/rtknavi/naviopt.cpp b/app/winapp/rtknavi/naviopt.cpp
@@ -405,7 +405,15 @@ void __fastcall TOptDialog::GetOpt(void)
 	IonoOpt		 ->ItemIndex=PrcOpt.ionoopt;
 	TropOpt		 ->ItemIndex=PrcOpt.tropopt;
 	SatEphem	 ->ItemIndex=PrcOpt.sateph;
-	AmbRes		 ->ItemIndex=PrcOpt.modear;
+	if(PrcOpt.modear>ARMODE_FIXHOLD) {
+		if(PrcOpt.wlmodear==0) {
+			AmbRes   ->ItemIndex    =4;
+		} else {
+			AmbRes   ->ItemIndex    =5;
+		}
+	} else {
+		AmbRes  ->ItemIndex	    =PrcOpt.modear;
+	}
 	GloAmbRes	 ->ItemIndex=PrcOpt.glomodear;
 	BdsAmbRes	 ->ItemIndex=PrcOpt.bdsmodear;
 	ValidThresAR ->Text     =s.sprintf("%.1f",PrcOpt.thresar[0]);
@@ -533,6 +541,11 @@ void __fastcall TOptDialog::SetOpt(void)
 	PrcOpt.tropopt   =TropOpt     ->ItemIndex;
 	PrcOpt.sateph    =SatEphem    ->ItemIndex;
 	PrcOpt.modear    =AmbRes      ->ItemIndex;
+	PrcOpt.wlmodear=0;
+	if(AmbRes->ItemIndex>3) {
+		PrcOpt.modear=ARMODE_WL;
+		if(AmbRes->ItemIndex==5) PrcOpt.wlmodear=1;
+	}
 	PrcOpt.glomodear =GloAmbRes   ->ItemIndex;
 	PrcOpt.bdsmodear =BdsAmbRes   ->ItemIndex;
 	PrcOpt.thresar[0]=str2dbl(ValidThresAR->Text);
@@ -722,6 +735,15 @@ void __fastcall TOptDialog::LoadOpt(AnsiString file)
 	PosOpt6		 ->Checked		=prcopt.posopt[5];
 
 	AmbRes		 ->ItemIndex	=prcopt.modear;
+	if(prcopt.modear>ARMODE_FIXHOLD) {
+		if(prcopt.wlmodear==0) {
+			AmbRes   ->ItemIndex    =4;
+		} else {
+			AmbRes   ->ItemIndex    =5;
+		}
+	} else {
+		AmbRes  ->ItemIndex	    =prcopt.modear;
+	}
 	GloAmbRes	 ->ItemIndex	=prcopt.glomodear;
 	BdsAmbRes	 ->ItemIndex	=prcopt.bdsmodear;
 	ValidThresAR ->Text			=s.sprintf("%.1f",prcopt.thresar[0]);
@@ -937,6 +959,11 @@ void __fastcall TOptDialog::SaveOpt(AnsiString file)
 	prcopt.posopt[5]=PosOpt6->Checked;
 
 	prcopt.modear	=AmbRes		->ItemIndex;
+	prcopt.wlmodear=0;
+	if(AmbRes->ItemIndex>3) {
+		prcopt.modear=ARMODE_WL;
+		if(AmbRes->ItemIndex==5) prcopt.wlmodear=1;
+	}
 	prcopt.glomodear=GloAmbRes	->ItemIndex;
 	prcopt.bdsmodear=BdsAmbRes	->ItemIndex;
 	prcopt.thresar[0]=str2dbl(ValidThresAR->Text);

diff --git a/app/winapp/rtknavi/naviopt.dfm b/app/winapp/rtknavi/naviopt.dfm
@@ -5,7 +5,7 @@ object OptDialog: TOptDialog
   BorderStyle = bsDialog
   Caption = 'Options'
   ClientHeight = 297
-  ClientWidth = 411
+  ClientWidth = 491
   Color = clWhite
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
@@ -55,7 +55,7 @@ object OptDialog: TOptDialog
   object Options: TPageControl
     Left = 0
     Top = 0
-    Width = 411
+    Width = 491
     Height = 263
     ActivePage = TabSheet1
     Align = alTop
@@ -481,7 +481,7 @@ object OptDialog: TOptDialog
       object AmbRes: TComboBox
         Left = 248
         Top = 4
-        Width = 61
+        Width = 141
         Height = 21
         Style = csDropDownList
         ItemIndex = 0
@@ -492,7 +492,9 @@ object OptDialog: TOptDialog
           'OFF'
           'Continuous'
           'Instantaneous'
-          'Fix and Hold')
+          'Fix and Hold'
+          'Wide Lane'
+          'Wide Lane with Fix and Hold')
       end
       object ValidThresAR: TEdit
         Left = 248
@@ -559,7 +561,7 @@ object OptDialog: TOptDialog
         Text = '1'
       end
       object GloAmbRes: TComboBox
-        Left = 311
+        Left = 391
         Top = 4
         Width = 43
         Height = 21
@@ -653,7 +655,7 @@ object OptDialog: TOptDialog
           'ON')
       end
       object BdsAmbRes: TComboBox
-        Left = 356
+        Left = 436
         Top = 4
         Width = 43
         Height = 21
@@ -1832,7 +1834,7 @@ object OptDialog: TOptDialog
       ExplicitWidth = 0
       ExplicitHeight = 0
       DesignSize = (
-        403
+        483
         235)
       object Label19: TLabel
         Left = 32
@@ -1849,7 +1851,7 @@ object OptDialog: TOptDialog
         Caption = 'Solution Font'
       end
       object FontLabel2: TLabel
-        Left = 265
+        Left = 345
         Top = 188
         Width = 80
         Height = 18
@@ -1921,7 +1923,7 @@ object OptDialog: TOptDialog
         Caption = 'Panel Font'
       end
       object FontLabel1: TLabel
-        Left = 265
+        Left = 345
         Top = 164
         Width = 80
         Height = 18