Changeset 4013 in ntrip for trunk/BNC/rinex

Timestamp:

Apr 22, 2012, 2:19:43 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/rinex

Files:

• reqcedit.cpp (modified) (2 diffs)
• rnxnavfile.cpp (modified) (1 diff)
• rnxnavfile.h (modified) (1 diff)

trunk/BNC/rinex/reqcedit.cpp

@@ -100 +100 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_reqcEdit::editObservations() {
+
+  // Easy Exit
+  // ---------
+  if (_obsFileNames.isEmpty() || _outObsFileName.isEmpty()) {
+    return;
+  }
 
   // Initialize input observation files, sort them according to start time
@@ -230 +236 @@
 void t_reqcEdit::editEphemerides() {
 
+  // Easy Exit
+  // ---------
+  if (_navFileNames.isEmpty() || _outNavFileName.isEmpty()) {
+    return;
+  }
+
   // Read All Ephemerides
   // --------------------

trunk/BNC/rinex/rnxnavfile.cpp

@@ -271 +271 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_rnxNavFile::writeEph(const t_eph* eph) {
-  if (version() < 3.0) {
-    writeEphV2(eph);
-  }
-  else {
-    writeEphV3(eph);
-  }
-}
-
-// 
-////////////////////////////////////////////////////////////////////////////
-void t_rnxNavFile::writeEphV2(const t_eph* eph) {
-}
-
-// 
-////////////////////////////////////////////////////////////////////////////
-void t_rnxNavFile::writeEphV3(const t_eph* eph) {
-
-  bncTime tt(eph->GPSweek(), eph->GPSweeks());
-
-  unsigned year, month, day, hour, min;
-  double sec;
-  tt.civil_date(year, month, day);
-  tt.civil_time(hour, min, sec);
-
-  QString dateStr;
-  QTextStream(&dateStr) << QString(" %1 %2 %3 %4 %5 %6")
-    .arg(year,     4)
-    .arg(month,    2, 10, QChar('0'))
-    .arg(day,      2, 10, QChar('0'))
-    .arg(hour,     2, 10, QChar('0'))
-    .arg(min,      2, 10, QChar('0'))
-    .arg(int(sec), 2, 10, QChar('0'));
-
-  *_stream << eph->prn() << dateStr << endl;
-}
+  *_stream << eph->toString(version());
+}

trunk/BNC/rinex/rnxnavfile.h

@@ -69 +69 @@
  private:
   void read(QTextStream* stream);
-  void writeEphV2(const t_eph* eph);
-  void writeEphV3(const t_eph* eph);
 
   e_inpOut            _inpOut;