Changeset 2312 in ntrip

Timestamp:

Feb 19, 2010, 4:01:08 PM (14 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

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

trunk/BNC/bnccaster.cpp

@@ -303 +303 @@
 // Dump Complete Epochs
 ////////////////////////////////////////////////////////////////////////////
-void bncCaster::dumpEpochs(long minTime, long maxTime) {
+void bncCaster::dumpEpochs(long minTimeXrate, long maxTimeXrate) {
 
   const char begEpoch[] = "BEGEPOCH";
@@ -311 +311 @@
   const int endEpochNBytes = sizeof(endEpoch) - 1;
 
-  for (long sec = minTime; sec <= maxTime; sec++) {
+  for (long secXrate = minTimeXrate; secXrate <= maxTimeXrate; ++secXrate) {
 
     bool first = true;
-    QList<p_obs> allObs = _epochs->values(sec);
+    QList<p_obs> allObs = _epochs->values(secXrate);
 
     QListIterator<p_obs> it(allObs);
@@ -320 +320 @@
       p_obs obs = it.next();
 
-      if (_samplingRate == 0 || sec % _samplingRate == 0) {
+      if (_samplingRate == 0 || (secXrate/_maxRate) % _samplingRate == 0) {
 
         if (first) {
@@ -401 +401 @@
 
       delete obs;
-      _epochs->remove(sec);
+      _epochs->remove(secXrate);
       first = false;
     }
@@ -415 +415 @@
   // Reread several options
   // ----------------------
-  _maxRate = settings.value("maxRate").toInt();
-  if (_maxRate < 1) {
-    _maxRate = 1;
-  }
+  _maxRate = 20;
+
   _samplingRate  = settings.value("binSampl").toInt();
   _waitTimeXrate = settings.value("waitTime").toInt() * _maxRate; 

trunk/BNC/bnccaster.h

@@ -60 +60 @@
 
  private:
-   void dumpEpochs(long minTime, long maxTime);
+   void dumpEpochs(long minTimeXrate, long maxTimeXrate);
    static int myWrite(QTcpSocket* sock, const char* buf, int bufLen);