Changeset 4021 in ntrip

Timestamp:

Apr 22, 2012, 7:37:26 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/RTCM3

Files:

• ephemeris.cpp (modified) (3 diffs)
• ephemeris.h (modified) (1 diff)

trunk/BNC/RTCM3/ephemeris.cpp

@@ -986 +986 @@
 }
 
-// RINEX Format String
+// 
 //////////////////////////////////////////////////////////////////////////////
-QString t_ephGlo::toString(double /* version */) const {
-  return "";
-}
-
-// RINEX Format String
-//////////////////////////////////////////////////////////////////////////////
-QString t_ephGal::toString(double /* version */) const {
-  return "";
-}
-
-// RINEX Format String
-//////////////////////////////////////////////////////////////////////////////
-QString t_ephGPS::toString(double version) const {
-
-  QString rnxStr;
+QString t_eph::rinexDateStr(double version) const {
+
+  QString datStr;
   
   unsigned year, month, day, hour, min;
@@ -1009 +997 @@
   _TOC.civil_time(hour, min, sec);
   
-  QTextStream out(&rnxStr);
+  QTextStream out(&datStr);
 
   if (version < 3.0) {
@@ -1030 +1018 @@
       .arg(int(sec), 2, 10, QChar('0'));
   }
+
+  return datStr;
+}
+
+// RINEX Format String
+//////////////////////////////////////////////////////////////////////////////
+QString t_ephGlo::toString(double version) const {
+  QString rnxStr = rinexDateStr(version);
+  return rnxStr + "\n";
+}
+
+// RINEX Format String
+//////////////////////////////////////////////////////////////////////////////
+QString t_ephGal::toString(double version) const {
+  QString rnxStr = rinexDateStr(version);
+  return rnxStr + "\n";
+}
+
+// RINEX Format String
+//////////////////////////////////////////////////////////////////////////////
+QString t_ephGPS::toString(double version) const {
+
+  QString rnxStr = rinexDateStr(version);
+  
+  QTextStream out(&rnxStr);
   
   out << QString("%1%2%3\n")

trunk/BNC/RTCM3/ephemeris.h

@@ -53 +53 @@
   }
 
+  QString rinexDateStr(double version) const;
+
  protected:  
   QString   _prn;