Changeset 3186 in ntrip

Timestamp:

Mar 29, 2011, 8:52:57 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/upload

Files:

• bncrtnetdecoder.cpp (modified) (4 diffs)
• bncrtnetdecoder.h (modified) (2 diffs)
• bncuploadcaster.cpp (modified) (3 diffs)
• bncuploadcaster.h (modified) (2 diffs)

trunk/BNC/upload/bncrtnetdecoder.cpp

@@ -52 +52 @@
   bncSettings settings;
 
-  _year = 0;
-
   // List of upload casters
   // ----------------------
@@ -69 +67 @@
   QTextStream in(line.toAscii());
   QString hlp;
-  in >> hlp >> _year >> _month >> _day >> _hour >> _min >> _sec;
-  GPSweekFromYMDhms(_year, _month, _day, _hour, _min, _sec, _GPSweek, _GPSweeks);
+  int     year, month, day, hour, min;
+  double  sec;
+  in >> hlp >> year >> month >> day >> hour >> min >> sec;
+  _epoTime.set( year, month, day, hour, min, sec);
 }
 
@@ -91 +91 @@
         readEpochTime(hlpLines[ii]);
       }
-      else if (_year != 0) {
+      else if (_epoTime.valid()) {
         lines << hlpLines[ii];
       }
@@ -101 +101 @@
   if (lines.size() > 0) {
     for (int ic = 0; ic < _caster.size(); ic++) {
-      _caster.at(ic)->uploadClockOrbitBias(lines, _eph, _year, _month, _day,
-                                           _GPSweek, _GPSweeks);
+      _caster.at(ic)->uploadClockOrbitBias(_epoTime, _eph, lines);
     }
   }

trunk/BNC/upload/bncrtnetdecoder.h

@@ -29 +29 @@
 #include <QtCore>
 #include "bncephuser.h"
+#include "bnctime.h"
 #include "bncuploadcaster.h"
 #include "RTCM/GPSDecoder.h"
@@ -41 +42 @@
   QList<bncUploadCaster*> _caster;
   QString                 _buffer;
-  int                     _GPSweek;
-  double                  _GPSweeks;
-  int                     _year;
-  int                     _month;
-  int                     _day;
-  int                     _hour;
-  int                     _min;
-  double                  _sec;
+  bncTime                 _epoTime;
 };
 

trunk/BNC/upload/bncuploadcaster.cpp

@@ -262 +262 @@
 // Encode and Upload Clocks, Orbits, and Biases
 ////////////////////////////////////////////////////////////////////////////
-void bncUploadCaster::uploadClockOrbitBias(const QStringList& lines,
-                           const QMap<QString, bncEphUser::t_ephPair*>& ephMap,
-                           int year, int month, int day,
-                           int GPSweek, double GPSweeks) {
-
+void bncUploadCaster::uploadClockOrbitBias(const bncTime& epoTime, 
+                            const QMap<QString, bncEphUser::t_ephPair*>& ephMap,
+                            const QStringList& lines) {
   this->open();
+
+  unsigned year, month, day;
+  epoTime.civil_date(year, month, day);
   
   struct ClockOrbit co;
   memset(&co, 0, sizeof(co));
-  co.GPSEpochTime      = (int)GPSweeks;
-  co.GLONASSEpochTime  = (int)fmod(GPSweeks, 86400.0) 
+  co.GPSEpochTime      = static_cast<int>(epoTime.gpssec());
+  co.GLONASSEpochTime  = static_cast<int>(fmod(epoTime.gpssec(), 86400.0))
                        + 3 * 3600 - gnumleap(year, month, day);
   co.ClockDataSupplied = 1;
@@ -280 +281 @@
   struct Bias bias;
   memset(&bias, 0, sizeof(bias));
-  bias.GPSEpochTime      = (int)GPSweeks;
-  bias.GLONASSEpochTime  = (int)fmod(GPSweeks, 86400.0) 
-                         + 3 * 3600 - gnumleap(year, month, day);
+  bias.GPSEpochTime      = co.GPSEpochTime;
+  bias.GLONASSEpochTime  = co.GLONASSEpochTime;
   
   for (int ii = 0; ii < lines.size(); ii++) {
@@ -335 +335 @@
       if (sd) {
         QString outLine;
-        processSatellite(ep, GPSweek, GPSweeks, prn, xx, sd, outLine);
+        processSatellite(ep, epoTime.gpsw(), epoTime.gpssec(), prn, xx, sd, outLine);
         if (_outFile) {
-          _outFile->write(GPSweek, GPSweeks, outLine);
+          _outFile->write(epoTime.gpsw(), epoTime.gpssec(), outLine);
         }
       }

trunk/BNC/upload/bncuploadcaster.h

@@ -4 +4 @@
 #include <QtNetwork>
 #include "bncephuser.h"
+#include "bnctime.h"
 
 class bncoutf;
@@ -24 +25 @@
   void printAscii(const QString& line);
   bool usedSocket() const {return _outSocket;}
-  void uploadClockOrbitBias(const QStringList& lines,
+  void uploadClockOrbitBias(const bncTime& epoTime, 
                             const QMap<QString, bncEphUser::t_ephPair*>& ephMap,
-                            int year, int month, int day,
-                            int GPSweek, double GPSweeks);
+                            const QStringList& lines);
 
  signals: