Changeset 5120 in ntrip for trunk

Timestamp:

Apr 14, 2013, 6:26:22 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• GPSS/hassDecoder.cpp (modified) (4 diffs)
• GPSS/hassDecoder.h (modified) (1 diff)
• RTCM3/RTCM3coDecoder.cpp (modified) (3 diffs)
• RTCM3/RTCM3coDecoder.h (modified) (1 diff)
• bnccore.cpp (modified) (6 diffs)
• bnccore.h (modified) (3 diffs)

trunk/BNC/src/GPSS/hassDecoder.cpp

@@ -46 +46 @@
   _GPSweeks = -1.0;
 
-  connect(this, SIGNAL(newCorrLine(QString, QString, long)), 
-          BNC_CORE, SLOT(slotNewCorrLine(QString, QString, long)));
+  connect(this, SIGNAL(newCorrLine(QString, QString, bncTime)), 
+          BNC_CORE, SLOT(slotNewCorrLine(QString, QString, bncTime)));
 }
 
@@ -92 +92 @@
     // Correction Time
     // ---------------
-    bncTime tt; 
-    tt.setmjd(daySec, mjd);
+    bncTime coTime; coTime.setmjd(daySec, mjd);
 
-    _GPSweeks = tt.gpssec();
-    long coTime = tt.gpsw() * 7*24*3600 + long(floor(_GPSweeks+0.5));
+    _GPSweeks = coTime.gpssec();
 
     // Transform Correction
@@ -118 +116 @@
     ColumnVector xc(4);
     ColumnVector vv(3);
-    eph->position(tt.gpsw(), tt.gpssec(), xc.data(), vv.data());
+    eph->position(coTime.gpsw(), coTime.gpssec(), xc.data(), vv.data());
 
     ColumnVector rao(3);
@@ -146 +144 @@
                      "   %10.5f %10.5f %10.5f %10.5f"
                      "   %10.5f",
-                     messageType, updateInterval, tt.gpsw(), _GPSweeks,
+                     messageType, updateInterval, coTime.gpsw(), _GPSweeks,
                      prn.toAscii().data(), IOD, 
                      dClk, rao[0], rao[1], rao[2],

trunk/BNC/src/GPSS/hassDecoder.h

@@ -16 +16 @@
 
  signals:
-  void newCorrLine(QString line, QString staID, long coTime);
+  void newCorrLine(QString line, QString staID, bncTime coTime);
 
  private:

trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp

@@ -72 +72 @@
   _GPSweeks = -1.0;
 
-  connect(this, SIGNAL(newCorrLine(QString, QString, long)), 
-          BNC_CORE, SLOT(slotNewCorrLine(QString, QString, long)));
+  connect(this, SIGNAL(newCorrLine(QString, QString, bncTime)), 
+          BNC_CORE, SLOT(slotNewCorrLine(QString, QString, bncTime)));
 
   connect(this, SIGNAL(newMessage(QByteArray,bool)), 
@@ -254 +254 @@
   bncTime currTime(currWeek, currSec);
 
-  bncTime corrTime(GPSweek, GPSweeks);
-
-  double dt = currTime - corrTime;
+  bncTime coTime(GPSweek, GPSweeks);
+
+  double dt = currTime - coTime;
   const double MAXDT = 10 * 60.0;
   if (fabs(dt) > MAXDT) {
@@ -263 +263 @@
   }
   else {
-    long coTime = GPSweek * 7*24*3600 + long(floor(_GPSweeks+0.5));
     emit newCorrLine(line, _staID, coTime);
   }

trunk/BNC/src/RTCM3/RTCM3coDecoder.h

@@ -50 +50 @@
                      std::ofstream*& out);
  signals:
-  void newCorrLine(QString line, QString staID, long coTime);
+  void newCorrLine(QString line, QString staID, bncTime coTime);
   void newMessage(QByteArray msg, bool showOnScreen);
 

trunk/BNC/src/bnccore.cpp

@@ -115 +115 @@
   _userName = _userName.leftJustified(20, ' ', true);
 
-  _lastDumpCoSec = 0;
-
-  _corrs = new QMultiMap<long, QString>;
+  _corrs = new QMultiMap<bncTime, QString>;
 
   _currentDateAndTimeGPS = 0;
@@ -633 +631 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void t_bncCore::slotNewCorrLine(QString line, QString staID, long coTime) {
+void t_bncCore::slotNewCorrLine(QString line, QString staID, bncTime coTime) {
 
   QMutexLocker locker(&_mutex);
@@ -646 +644 @@
 
   bncSettings settings;
-  _waitCoTime = settings.value("corrTime").toInt();
-  if (_waitCoTime < 0) {
-    _waitCoTime = 0;
+  _waitCoTime = settings.value("corrTime").toDouble();
+  if (_waitCoTime < 0.0) {
+    _waitCoTime = 0.0;
   }
 
   // First time, set the _lastDumpSec immediately
   // --------------------------------------------
-  if (_lastDumpCoSec == 0) {
-    _lastDumpCoSec = coTime - 1;
+  if (!_lastDumpCoSec.valid()) {
+    _lastDumpCoSec = coTime - 1.0;
   }
 
   // An old correction - throw it away
   // ---------------------------------
-  if (_waitCoTime > 0 && coTime <= _lastDumpCoSec) {
-    if (!_bncComb) {
+  if (_waitCoTime > 0.0 && coTime <= _lastDumpCoSec) {
+    ///    if (!_bncComb) {
       QString line = staID + ": Correction for one sat neglected because overaged by " +
-                      QString().sprintf(" %ld sec",
+                      QString().sprintf(" %f sec",
                       _lastDumpCoSec - coTime + _waitCoTime);
       messagePrivate(line.toAscii());
       emit( newMessage(line.toAscii(), true) );
-    }
+      ///    }
     return;
   }
@@ -674 +672 @@
   // Dump Corrections
   // ----------------
-  if      (_waitCoTime == 0) {
+  if      (_waitCoTime == 0.0) {
     dumpCorrs();
   }
@@ -685 +683 @@
 // Dump Complete Correction Epochs
 ////////////////////////////////////////////////////////////////////////////
-void t_bncCore::dumpCorrs(long minTime, long maxTime) {
-  for (long sec = minTime; sec <= maxTime; sec++) {
+void t_bncCore::dumpCorrs(bncTime minTime, bncTime maxTime) {
+  for (bncTime sec = minTime; sec <= maxTime; sec = sec + 1.0) {
     QList<QString> allCorrs = _corrs->values(sec);
     dumpCorrs(allCorrs);
@@ -697 +695 @@
 void t_bncCore::dumpCorrs() {
   QList<QString> allCorrs;
-  QMutableMapIterator<long, QString> it(*_corrs);
+  QMutableMapIterator<bncTime, QString> it(*_corrs);
   while (it.hasNext()) {
     allCorrs << it.next().value();

trunk/BNC/src/bnccore.h

@@ -72 +72 @@
     void slotNewGlonassEph(glonassephemeris* glonasseph);
     void slotNewGalileoEph(galileoephemeris* galileoeph);
-    void slotNewCorrLine(QString line, QString staID, long coTime);
+    void slotNewCorrLine(QString line, QString staID, bncTime coTime);
     void slotQuit();
 
@@ -92 +92 @@
     void printOutput(bool printFile, QTextStream* stream, 
                      const QString& strV2, const QString& strV3);
-    void dumpCorrs(long minTime, long maxTime);
+    void dumpCorrs(bncTime minTime, bncTime maxTime);
     void dumpCorrs();
     void dumpCorrs(const QList<QString>& allCorrs);
@@ -127 +127 @@
     QList<QTcpSocket*>* _socketsNMEA;
     bncCaster*          _caster;
-    long                _lastDumpCoSec;
-    long                _waitCoTime;
-    QMultiMap<long, QString>* _corrs;
+    bncTime             _lastDumpCoSec;
+    double              _waitCoTime;
+    QMultiMap<bncTime, QString>* _corrs;
     QString             _confFileName;
     QDate               _fileDate;