Changeset 2311 in ntrip

Timestamp:

Feb 19, 2010, 3:55:19 PM (14 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bnccaster.cpp (modified) (4 diffs)
• bnccaster.h (modified) (1 diff)

trunk/BNC/bnccaster.cpp

@@ -49 +49 @@
 #include "RTCM/GPSDecoder.h"
 
-static const int MAXRATE = 20; // Hz
-
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
@@ -161 +159 @@
   obs->_status = t_obs::received;
 
-  long iSecXrate    = long(floor(obs->_o.GPSWeeks * MAXRATE + 0.5));
-  long newTimeXrate = obs->_o.GPSWeek * 7*24*3600 * MAXRATE + iSecXrate;
+  long iSecXrate    = long(floor(obs->_o.GPSWeeks * _maxRate + 0.5));
+  long newTimeXrate = obs->_o.GPSWeek * 7*24*3600 * _maxRate + iSecXrate;
 
   // Rename the Station
@@ -213 +211 @@
            !settings.value("outPort").toString().isEmpty() ) { 
 
-        QTime enomtime = QTime(0,0,0).addMSecs(iSecXrate/MAXRATE/1000);
+        QTime enomtime = QTime(0,0,0).addMSecs(iSecXrate/_maxRate/1000);
 
         emit( newMessage(QString("%1: Old epoch %2 (%3) thrown away")
-                         .arg(staID.data()).arg(iSecXrate/MAXRATE)
+                         .arg(staID.data()).arg(iSecXrate/_maxRate)
                          .arg(enomtime.toString("HH:mm:ss"))
                          .toAscii(), true) );
@@ -417 +415 @@
   // Reread several options
   // ----------------------
+  _maxRate = settings.value("maxRate").toInt();
+  if (_maxRate < 1) {
+    _maxRate = 1;
+  }
   _samplingRate  = settings.value("binSampl").toInt();
-  _waitTimeXrate = settings.value("waitTime").toInt() * MAXRATE; 
+  _waitTimeXrate = settings.value("waitTime").toInt() * _maxRate; 
   if (_waitTimeXrate < 1) {
     _waitTimeXrate = 1;

trunk/BNC/bnccaster.h

@@ -80 +80 @@
    QMutex                  _mutex;
    int                     _confInterval;
+   int                     _maxRate;
 };