Changeset 4029 in ntrip for trunk

Timestamp:

Apr 22, 2012, 9:02:03 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/RTCM3

Files:

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

trunk/BNC/RTCM3/ephemeris.cpp

@@ -993 +993 @@
 // 
 //////////////////////////////////////////////////////////////////////////////
-QString t_eph::rinexDateStr(double version, double gps_utc) const {
+QString t_eph::rinexDateStr(const bncTime& tt, const QString& prn,
+                            double version) {
 
   QString datStr;
@@ -999 +1000 @@
   unsigned year, month, day, hour, min;
   double   sec;
-
-  bncTime hlp = _TOC - gps_utc;
-  hlp.civil_date(year, month, day);
-  hlp.civil_time(hour, min, sec);
+  tt.civil_date(year, month, day);
+  tt.civil_time(hour, min, sec);
   
   QTextStream out(&datStr);
 
   if (version < 3.0) {
-    QString prnHlp = _prn.mid(1,2); if (prnHlp[0] == '0') prnHlp[0] = ' ';
+    QString prnHlp = prn.mid(1,2); if (prnHlp[0] == '0') prnHlp[0] = ' ';
     out << prnHlp << QString(" %1 %2 %3 %4 %5%6")
       .arg(year % 100, 2, 10, QChar('0'))
@@ -1017 +1016 @@
   }
   else {
-    out << _prn << QString(" %1 %2 %3 %4 %5 %6")
+    out << prn << QString(" %1 %2 %3 %4 %5 %6")
       .arg(year,     4)
       .arg(month,    2, 10, QChar('0'))
@@ -1033 +1032 @@
 QString t_ephGPS::toString(double version) const {
 
-  QString rnxStr = rinexDateStr(version, 0.0);
+  QString rnxStr = rinexDateStr(_TOC, _prn, version);
   
   QTextStream out(&rnxStr);
@@ -1093 +1092 @@
 QString t_ephGlo::toString(double version) const {
 
-  QString rnxStr = rinexDateStr(version, _gps_utc);
+  QString rnxStr = rinexDateStr(_TOC-_gps_utc, _prn, version);
 
   QTextStream out(&rnxStr);
@@ -1129 +1128 @@
 QString t_ephGal::toString(double version) const {
 
-  QString rnxStr = rinexDateStr(version, 0.0);
+  QString rnxStr = rinexDateStr(_TOC, _prn, version);
 
   QTextStream out(&rnxStr);

trunk/BNC/RTCM3/ephemeris.h

@@ -53 +53 @@
   }
 
+  static QString rinexDateStr(const bncTime& tt, const QString& prn,
+                              double version);
+
  protected:  
-  QString rinexDateStr(double version, double gps_utc) const;
-
   QString   _prn;
   bncTime   _TOC;