Changeset 4773 in ntrip

Timestamp:

Oct 26, 2012, 3:28:30 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/RTRover

Files:

• bncrtrover.cpp (modified) (2 diffs)
• bncrtrover.h (modified) (2 diffs)

trunk/BNC/src/RTRover/bncrtrover.cpp

@@ -238 +238 @@
 }
 
+// Auxiliary function - copy observation data
+////////////////////////////////////////////////////////////////////////////
+void copyObs(const t_obs& obsBnc, rtrover_satObs& satObs) {
+
+}
+
 //
 ////////////////////////////////////////////////////////////////////////////
@@ -248 +254 @@
 
   bncTime obsTime(obsIn.GPSWeek, obsIn.GPSWeeks);
-  int numSatRover = 1;
+
+  // Find corresponding epoch or create a new one
+  // --------------------------------------------
+  t_epoData* epoData = 0;
+  for (unsigned ii = 0; ii < _epochs.size(); ii++) {
+    if (_epochs[ii]->_time == obsTime) {
+      epoData = _epochs[ii];
+      break;
+    }
+  }
+  if (epoData == 0) {
+    if (_epochs.size() == 0 || _epochs.back()->_time < obsTime) {
+      epoData = new t_epoData();
+      epoData->_time = obsTime;
+      _epochs.push_back(epoData);
+    }
+    else {
+      return;
+    } 
+  }
+
+  // Store observation into epoch class
+  // ----------------------------------
+  if      (staID == _roverMount) {
+    epoData->_obsRover.push_back(obsIn);
+  }
+  else if (staID == _baseMount) {
+    epoData->_obsBase.push_back(obsIn);
+  }
+
+  // Wait for observations
+  // ---------------------
+  const double WAITTIME = 5.0;
+  double dt = 0.0;
+  if (_epochs.size() > 1) {
+    dt = _epochs.back()->_time - _epochs.front()->_time;
+  }
+  if (dt < WAITTIME) {
+    return;
+  }
+
+  // Copy observations into rtrover_satObs structures
+  // ------------------------------------------------
+  t_epoData* frontEpoData = _epochs.front();
+  _epochs.erase(_epochs.begin());
+
+  int numSatRover = frontEpoData->_obsRover.size();
   rtrover_satObs satObsRover[numSatRover];
   for (int ii = 0; ii < numSatRover; ii++) {
- 
-  }
-
+    const t_obs& obsBnc = frontEpoData->_obsRover[ii];
+    rtrover_satObs& satObs = satObsRover[ii];
+    copyObs(obsBnc, satObs);
+  }
+
+  int numSatBase = frontEpoData->_obsBase.size();
+  rtrover_satObs satObsBase[numSatBase];
+  for (int ii = 0; ii < numSatBase; ii++) {
+    const t_obs& obsBnc = frontEpoData->_obsBase[ii];
+    rtrover_satObs& satObs = satObsBase[ii];
+    copyObs(obsBnc, satObs);
+  }
+
+  delete frontEpoData;
+
+  // Process single epoch
+  // --------------------
   rtrover_output output;
   rtrover_processEpoch(numSatRover, satObsRover, 0, 0, &output);
 
+  // Write and free output
+  // ---------------------
   _outputFile.write(output._log);
   _outputFile.flush();

trunk/BNC/src/RTRover/bncrtrover.h

@@ -3 +3 @@
 
 #include <vector>
-#include <queue>
 
 #include "RTCM/GPSDecoder.h"
@@ -30 +29 @@
     std::vector<t_obs> _obsBase; 
   };
-  QMutex                _mutex;
-  QByteArray            _mode;
-  QFile                 _outputFile;
-  QByteArray            _roverMount;
-  QByteArray            _baseMount;
-  QByteArray            _corrMount;
-  std::queue<t_epoData> _epochs;
+  QMutex                  _mutex;
+  QByteArray              _mode;
+  QFile                   _outputFile;
+  QByteArray              _roverMount;
+  QByteArray              _baseMount;
+  QByteArray              _corrMount;
+  std::vector<t_epoData*> _epochs;
 };