Merge pull request tomojitakasu#681 from ourairquality/rtkconv-sort-sats

rtkconv: add sort satellites option

Author: JensReimann

app/winapp/rtkconv/convmain.cpp

@@ -962,6 +962,7 @@ void __fastcall TMainWindow::ConvertFile(void)
 	rnxopt.autopos=AutoPos;
 	rnxopt.phshift=PhaseShift;
 	rnxopt.halfcyc=HalfCyc;
+	rnxopt.sortsats=SortSats;
 	rnxopt.outiono=OutIono;
 	rnxopt.outtime=OutTime;
 	rnxopt.outleaps=OutLeaps;
@@ -1083,6 +1084,7 @@ void __fastcall TMainWindow::LoadOpt(void)
 	AutoPos				=ini->ReadInteger("opt","autopos",	   0);
 	PhaseShift			=ini->ReadInteger("opt","phaseshift",  0);
 	HalfCyc				=ini->ReadInteger("opt","halfcyc",	   0);
+	SortSats			=ini->ReadInteger("opt","sortsats",	   0);
 	OutIono				=ini->ReadInteger("opt","outiono",	   0);
 	OutTime				=ini->ReadInteger("opt","outtime",	   0);
 	OutLeaps			=ini->ReadInteger("opt","outleaps",    0);
@@ -1187,6 +1189,7 @@ void __fastcall TMainWindow::SaveOpt(void)
 	ini->WriteInteger("opt","autopos",	  AutoPos);
 	ini->WriteInteger("opt","phaseshift", PhaseShift);
 	ini->WriteInteger("opt","halfcyc",	  HalfCyc);
+	ini->WriteInteger("opt","sortsats",	  SortSats);
 	ini->WriteInteger("opt","outiono",	  OutIono);
 	ini->WriteInteger("opt","outtime",	  OutTime);
 	ini->WriteInteger("opt","outleaps",   OutLeaps);

app/winapp/rtkconv/convmain.h

@@ -205,7 +205,7 @@ class TMainWindow : public TForm
 	AnsiString CodeMask[7];
 	double AppPos[3],AntDel[3],TimeTol;
 	int RnxVer,RnxFile,NavSys,ObsType,FreqType,TraceLevel,EventEna;
-	int AutoPos,PhaseShift,HalfCyc,OutIono,OutTime,OutLeaps,SepNav;
+	int AutoPos,PhaseShift,HalfCyc,SortSats,OutIono,OutTime,OutLeaps,SepNav;
 	int EnaGloFcn,GloFcn[27];
 
 	__fastcall TMainWindow(TComponent* Owner);

app/winapp/rtkconv/convopt.cpp

@@ -63,6 +63,7 @@ void __fastcall TConvOptDialog::FormShow(TObject *Sender)
 	AutoPos->Checked=MainWindow->AutoPos;
 	PhaseShift->Checked=MainWindow->PhaseShift;
 	HalfCyc->Checked=MainWindow->HalfCyc;
+	SortSats->Checked=MainWindow->SortSats;
 	OutIono->Checked=MainWindow->OutIono;
 	OutTime->Checked=MainWindow->OutTime;
 	OutLeaps->Checked=MainWindow->OutLeaps;
@@ -124,6 +125,7 @@ void __fastcall TConvOptDialog::BtnOkClick(TObject *Sender)
 	MainWindow->AutoPos=AutoPos->Checked;
 	MainWindow->PhaseShift=PhaseShift->Checked;
 	MainWindow->HalfCyc=HalfCyc->Checked;
+	MainWindow->SortSats=SortSats->Checked;
 	MainWindow->OutIono=OutIono->Checked;
 	MainWindow->OutTime=OutTime->Checked;
 	MainWindow->OutLeaps=OutLeaps->Checked;

app/winapp/rtkconv/convopt.dfm

@@ -67,7 +67,7 @@ object ConvOptDialog: TConvOptDialog
     OnClick = BtnOkClick
   end
   object BtnCancel: TButton
-    Left = 339
+    Left = 342
     Top = 350
     Width = 80
     Height = 36
@@ -79,7 +79,7 @@ object ConvOptDialog: TConvOptDialog
   object GroupBox1: TGroupBox
     Left = 1
     Top = 24
-    Width = 417
+    Width = 433
     Height = 204
     TabOrder = 6
     object Label1: TLabel
@@ -270,30 +270,6 @@ object ConvOptDialog: TConvOptDialog
       Height = 21
       TabOrder = 6
     end
-    object OutIono: TCheckBox
-      Left = 187
-      Top = 182
-      Width = 68
-      Height = 18
-      Caption = 'Iono Corr'
-      TabOrder = 22
-    end
-    object OutTime: TCheckBox
-      Left = 263
-      Top = 182
-      Width = 65
-      Height = 18
-      Caption = 'Time Corr'
-      TabOrder = 23
-    end
-    object OutLeaps: TCheckBox
-      Left = 341
-      Top = 182
-      Width = 62
-      Height = 18
-      Caption = 'Leap Sec'
-      TabOrder = 24
-    end
     object AutoPos: TCheckBox
       Left = 109
       Top = 137
@@ -302,21 +278,53 @@ object ConvOptDialog: TConvOptDialog
       TabOrder = 19
       OnClick = AutoPosClick
     end
+    object PhaseShift: TCheckBox
+      Left = 5
+      Top = 182
+      Width = 78
+      Height = 18
+      Caption = 'Phase Shift'
+      TabOrder = 20
+    end
     object HalfCyc: TCheckBox
-      Left = 96
-      Top = 183
-      Width = 82
+      Left = 86
+      Top = 182
+      Width = 85
       Height = 18
       Caption = 'Half Cyc Corr'
       TabOrder = 21
     end
-    object PhaseShift: TCheckBox
-      Left = 10
+    object SortSats: TCheckBox
+      Left = 175
       Top = 182
-      Width = 76
+      Width = 44
       Height = 18
-      Caption = 'Phase Shift'
-      TabOrder = 20
+      Caption = 'Sort'
+      TabOrder = 22
+    end
+    object OutIono: TCheckBox
+      Left = 222
+      Top = 182
+      Width = 71
+      Height = 18
+      Caption = 'Iono Corr'
+      TabOrder = 23
+    end
+    object OutTime: TCheckBox
+      Left = 293
+      Top = 182
+      Width = 68
+      Height = 18
+      Caption = 'Time Corr'
+      TabOrder = 24
+    end
+    object OutLeaps: TCheckBox
+      Left = 364
+      Top = 182
+      Width = 72
+      Height = 18
+      Caption = 'Leap Sec'
+      TabOrder = 25
     end
   end
   object GroupBox3: TGroupBox

app/winapp/rtkconv/convopt.h

@@ -78,6 +78,7 @@ class TConvOptDialog : public TForm
 	TButton *BtnMask;
 	TCheckBox *Nav7;
 	TCheckBox *HalfCyc;
+	TCheckBox *SortSats;
 	TCheckBox *ChkSepNav;
 	TLabel *Label13;
 	TEdit *TimeTol;