Update RTKNAVI for new code outlier threshold config parameter

rtklibexplorer · Aug 15, 2022 · 1223e4b · 1223e4b
1 parent f74b092
commit 1223e4b
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 24 deletions.
diff --git a/app/winapp/rtknavi/navimain.cpp b/app/winapp/rtknavi/navimain.cpp
@@ -2493,8 +2493,8 @@ void __fastcall TMainForm::LoadOpt(void)
     PrcOpt.thresdop=ini->ReadFloat    ("prcopt", "thresdop",      0.00);
     PrcOpt.thresslip=ini->ReadFloat  ("prcopt", "thresslip",     0.05);
     PrcOpt.maxtdiff =ini->ReadFloat  ("prcopt", "maxtdiff",      30.0);
-    PrcOpt.maxgdop  =ini->ReadFloat  ("prcopt", "maxgdop",       30.0);
-    PrcOpt.maxinno  =ini->ReadFloat  ("prcopt", "maxinno",       30.0);
+    PrcOpt.maxinno[0]=ini->ReadFloat  ("prcopt", "maxphase",      5.0);
+    PrcOpt.maxinno[1]=ini->ReadFloat  ("prcopt", "maxcode",      30.0);
     PrcOpt.varholdamb=ini->ReadFloat ("prcopt", "varholdamb",     0.1);
     PrcOpt.gainholdamb=ini->ReadFloat("prcopt", "gainholdamb",   0.01);
     PrcOpt.syncsol  =ini->ReadInteger("prcopt", "syncsol",          0);
@@ -2754,8 +2754,8 @@ void __fastcall TMainForm::SaveOpt(void)
     ini->WriteFloat  ("prcopt", "thresslip",  PrcOpt.thresslip   );
     ini->WriteFloat  ("prcopt", "thresdop",   PrcOpt.thresdop    );
     ini->WriteFloat  ("prcopt", "maxtdiff",   PrcOpt.maxtdiff    );
-    ini->WriteFloat  ("prcopt", "maxgdop",    PrcOpt.maxgdop     );
-    ini->WriteFloat  ("prcopt", "maxinno",    PrcOpt.maxinno     );
+    ini->WriteFloat  ("prcopt", "maxphase",   PrcOpt.maxinno[0]  );
+    ini->WriteFloat  ("prcopt", "maxcode",    PrcOpt.maxinno[1]  );
     ini->WriteFloat  ("prcopt", "varholdamb", PrcOpt.varholdamb  );
     ini->WriteFloat  ("prcopt", "gainholdamb",PrcOpt.gainholdamb );
     ini->WriteInteger("prcopt", "syncsol",    PrcOpt.syncsol     );

diff --git a/app/winapp/rtknavi/naviopt.cpp b/app/winapp/rtknavi/naviopt.cpp
@@ -416,8 +416,8 @@ void __fastcall TOptDialog::GetOpt(void)
 	ElMaskAR	 ->Text     =s.sprintf("%.0f",PrcOpt.elmaskar*R2D);
 	ElMaskHold	 ->Text     =s.sprintf("%.0f",PrcOpt.elmaskhold*R2D);
 	MaxAgeDiff	 ->Text     =s.sprintf("%.1f",PrcOpt.maxtdiff);
-	RejectGdop   ->Text     =s.sprintf("%.1f",PrcOpt.maxgdop);
-	RejectThres  ->Text     =s.sprintf("%.1f",PrcOpt.maxinno);
+	RejectCode   ->Text     =s.sprintf("%.1f",PrcOpt.maxinno[1]);
+	RejectPhase  ->Text     =s.sprintf("%.1f",PrcOpt.maxinno[0]);
 	VarHoldAmb   ->Text     =s.sprintf("%.4f",PrcOpt.varholdamb);
 	GainHoldAmb  ->Text     =s.sprintf("%.4f",PrcOpt.gainholdamb);
 	SlipThres	 ->Text     =s.sprintf("%.3f",PrcOpt.thresslip);
@@ -558,8 +558,8 @@ void __fastcall TOptDialog::SetOpt(void)
 	PrcOpt.elmaskar  =str2dbl(ElMaskAR   ->Text)*D2R;
 	PrcOpt.elmaskhold=str2dbl(ElMaskHold ->Text)*D2R;
 	PrcOpt.maxtdiff  =str2dbl(MaxAgeDiff ->Text);
-	PrcOpt.maxgdop   =str2dbl(RejectGdop ->Text);
-	PrcOpt.maxinno   =str2dbl(RejectThres->Text);
+	PrcOpt.maxinno[1]=str2dbl(RejectCode ->Text);
+	PrcOpt.maxinno[0]=str2dbl(RejectPhase->Text);
 	PrcOpt.varholdamb=str2dbl(VarHoldAmb->Text);
 	PrcOpt.gainholdamb=str2dbl(GainHoldAmb->Text);
 	PrcOpt.thresslip  =str2dbl(SlipThres  ->Text);
@@ -764,8 +764,8 @@ void __fastcall TOptDialog::LoadOpt(AnsiString file)
 	ElMaskAR	 ->Text			=s.sprintf("%.0f",prcopt.elmaskar*R2D);
 	ElMaskHold	 ->Text			=s.sprintf("%.0f",prcopt.elmaskhold*R2D);
 	MaxAgeDiff	 ->Text			=s.sprintf("%.1f",prcopt.maxtdiff );
-	RejectGdop   ->Text			=s.sprintf("%.1f",prcopt.maxgdop  );
-	RejectThres  ->Text			=s.sprintf("%.1f",prcopt.maxinno  );
+	RejectCode   ->Text			=s.sprintf("%.1f",prcopt.maxinno[1]);
+	RejectPhase  ->Text			=s.sprintf("%.1f",prcopt.maxinno[0]);
 	VarHoldAmb   ->Text			=s.sprintf("%.4f",prcopt.varholdamb);
 	GainHoldAmb  ->Text			=s.sprintf("%.4f",prcopt.gainholdamb);
 	SlipThres	 ->Text			=s.sprintf("%.3f",prcopt.thresslip);
@@ -995,8 +995,8 @@ void __fastcall TOptDialog::SaveOpt(AnsiString file)
 	prcopt.elmaskar	=str2dbl(ElMaskAR	->Text)*D2R;
 	prcopt.elmaskhold=str2dbl(ElMaskHold->Text)*D2R;
 	prcopt.maxtdiff	=str2dbl(MaxAgeDiff	->Text);
-	prcopt.maxgdop	=str2dbl(RejectGdop ->Text);
-	prcopt.maxinno	=str2dbl(RejectThres->Text);
+	prcopt.maxinno[1]	=str2dbl(RejectCode ->Text);
+	prcopt.maxinno[0]	=str2dbl(RejectPhase->Text);
 	prcopt.varholdamb=str2dbl(VarHoldAmb->Text);
 	prcopt.gainholdamb=str2dbl(GainHoldAmb->Text);
 	prcopt.thresslip=str2dbl(SlipThres	->Text);
@@ -1114,7 +1114,8 @@ void __fastcall TOptDialog::UpdateEnable(void)
 	SlipThres      ->Enabled=ar||ppp;
 	DopThres       ->Enabled=ar||ppp;
 	MaxAgeDiff     ->Enabled=rel;
-	RejectThres    ->Enabled=rel||ppp;
+	RejectPhase    ->Enabled=rel||ppp;
+	RejectCode     ->Enabled=rel||ppp;
 	VarHoldAmb     ->Enabled=ar&&AmbRes->ItemIndex==3;
 	GainHoldAmb    ->Enabled=ar&&AmbRes->ItemIndex==3;
 	ARIter         ->Enabled=ppp;

diff --git a/app/winapp/rtknavi/naviopt.dfm b/app/winapp/rtknavi/naviopt.dfm
@@ -57,15 +57,11 @@ object OptDialog: TOptDialog
     Top = 0
     Width = 413
     Height = 353
-    ActivePage = TabSheet1
+    ActivePage = TabSheet2
     Align = alTop
     TabOrder = 4
     object TabSheet1: TTabSheet
       Caption = 'Setting&1'
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object Label3: TLabel
         Left = 24
         Top = 137
@@ -461,9 +457,9 @@ object OptDialog: TOptDialog
       object Label11: TLabel
         Left = 24
         Top = 169
-        Width = 176
+        Width = 179
         Height = 13
-        Caption = 'Reject Threshold of GDOP/Innov (m)'
+        Caption = 'Outlier Threshold for Code/Phase (m)'
       end
       object Label37: TLabel
         Left = 24
@@ -571,7 +567,7 @@ object OptDialog: TOptDialog
         TabOrder = 7
         Text = '30'
       end
-      object RejectThres: TEdit
+      object RejectPhase: TEdit
         Left = 325
         Top = 166
         Width = 75
@@ -644,7 +640,7 @@ object OptDialog: TOptDialog
         TabOrder = 16
         Text = '10'
       end
-      object RejectGdop: TEdit
+      object RejectCode: TEdit
         Left = 248
         Top = 166
         Width = 75

diff --git a/app/winapp/rtknavi/naviopt.h b/app/winapp/rtknavi/naviopt.h
@@ -55,7 +55,7 @@ class TOptDialog : public TForm
 	TEdit *ElMaskAR;
 	TEdit *SlipThres;
 	TEdit *MaxAgeDiff;
-	TEdit *RejectThres;
+	TEdit *RejectPhase;
 	TEdit *NumIter;
 	TTabSheet *TabSheet3;
 	TLabel *LabelSolFormat;
@@ -194,7 +194,7 @@ class TOptDialog : public TForm
 	TEdit *MeasErrR2;
 	TEdit *ElMaskHold;
 	TEdit *FileSwapMarginE;
-	TEdit *RejectGdop;
+	TEdit *RejectCode;
 	TLabel *Label45;
 	TEdit *ProxyAddrE;
 	TLabel *Label23;