Merge pull request #691 from ourairquality/winapp-time-order

rtkconv, rtkpost: keep the start and end time in order

Author: rtklibexplorer

app/winapp/rtkconv/convmain.cpp

@@ -590,11 +590,33 @@ void __fastcall TMainWindow::BtnAboutClick(TObject *Sender)
 // callback on button-time-start --------------------------------------------
 void __fastcall TMainWindow::TimeStartFClick(TObject *Sender)
 {
+	if (TimeStartF->Checked && TimeEndF->Checked) {
+          // Initialize the start time to the end time if the start
+          // time has just been enabled and is out of order.
+          gtime_t ts={0},te={0};
+          double tint=0.0,tunit=0.0;
+          GetTime(&ts,&te,&tint,&tunit);
+          if (timediff(te, ts) < 0.0) {
+            TimeY1->Text = TimeY2->Text;
+            TimeH1->Text = TimeH2->Text;
+          }
+        }
 	UpdateEnable();
 }
 // callback on button-time-end ----------------------------------------------
 void __fastcall TMainWindow::TimeEndFClick(TObject *Sender)
 {
+	if (TimeStartF->Checked && TimeEndF->Checked) {
+          // Initialize the end time to the start time if the end time
+          // has just been enabled and is out of order.
+          gtime_t ts={0},te={0};
+          double tint=0.0,tunit=0.0;
+          GetTime(&ts,&te,&tint,&tunit);
+          if (timediff(te, ts) < 0.0) {
+            TimeY2->Text = TimeY1->Text;
+            TimeH2->Text = TimeH1->Text;
+          }
+        }
 	UpdateEnable();
 }
 // callback on button-time-interval -----------------------------------------

app/winapp/rtkpost/postmain.cpp

@@ -680,6 +680,28 @@ void __fastcall TMainForm::BtnKeywordClick(TObject *Sender)
 // callback on time-start/end check -----------------------------------------
 void __fastcall TMainForm::TimeStartClick(TObject *Sender)
 {
+    if (TimeStart->Checked && TimeEnd->Checked) {
+      // Initialize the start time to the end time if the start time
+      // has just been enabled and is out of order.
+      gtime_t ts=GetTime1(), te=GetTime2();
+      if (timediff(te, ts) < 0.0) {
+        TimeY1->Text = TimeY2->Text;
+        TimeH1->Text = TimeH2->Text;
+      }
+    }
+    UpdateEnable();
+}
+void __fastcall TMainForm::TimeEndClick(TObject *Sender)
+{
+    if (TimeStart->Checked && TimeEnd->Checked) {
+      // Initialize the end time to the start time if the end time has
+      // just been enabled and is out of order.
+      gtime_t ts=GetTime1(), te=GetTime2();
+      if (timediff(te, ts) < 0.0) {
+        TimeY2->Text = TimeY1->Text;
+        TimeH2->Text = TimeH1->Text;
+      }
+    }
     UpdateEnable();
 }
 // callback on time-interval check ------------------------------------------

app/winapp/rtkpost/postmain.dfm

@@ -225,7 +225,7 @@ object MainForm: TMainForm
         Height = 17
         Caption = 'Time End (GPST)'
         TabOrder = 5
-        OnClick = TimeStartClick
+        OnClick = TimeEndClick
       end
       object BtnTime2: TSpeedButton
         Left = 298

app/winapp/rtkpost/postmain.h

@@ -141,6 +141,7 @@ class TMainForm : public TForm
 	void __fastcall BtnKeywordClick    (TObject *Sender);
 
 	void __fastcall TimeStartClick     (TObject *Sender);
+	void __fastcall TimeEndClick       (TObject *Sender);
 	void __fastcall TimeIntFClick      (TObject *Sender);
 	void __fastcall TimeUnitFClick     (TObject *Sender);
 	void __fastcall InputFile1Change   (TObject *Sender);