Changeset 5589 in ntrip

Timestamp:

Dec 1, 2013, 4:45:20 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/RTRover

Files:

• bncrtrover.cpp (modified) (1 diff)
• bncrtrover.h (modified) (1 diff)

trunk/BNC/src/RTRover/bncrtrover.cpp

@@ -448 +448 @@
       continue;
     }
+
+    processFrontEpoch();
+  }
+}
     
-    // 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, numSatBase, satObsBase, &output);
-    
-    // Write output
-    // ---------------------
-    _outputFile.write(output._log);
-    _outputFile.flush();
-    
-    // Free memory
-    // -----------
-    rtrover_freeOutput(&output);
-    for (int ii = 0; ii < numSatRover; ii++) {
-      rtrover_satObs& satObs = satObsRover[ii];
-      delete [] satObs._obs;
-    }
-    for (int ii = 0; ii < numSatBase; ii++) {
-      rtrover_satObs& satObs = satObsBase[ii];
-      delete [] satObs._obs;
-    }
-  }
-}
+//
+////////////////////////////////////////////////////////////////////////////
+void t_bncRtrover::processFrontEpoch() {
+
+  // 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, numSatBase, satObsBase, &output);
+  
+  // Write output
+  // ---------------------
+  _outputFile.write(output._log);
+  _outputFile.flush();
+  
+  // Free memory
+  // -----------
+  rtrover_freeOutput(&output);
+  for (int ii = 0; ii < numSatRover; ii++) {
+    rtrover_satObs& satObs = satObsRover[ii];
+    delete [] satObs._obs;
+  }
+  for (int ii = 0; ii < numSatBase; ii++) {
+    rtrover_satObs& satObs = satObsBase[ii];
+    delete [] satObs._obs;
+  }
+}

trunk/BNC/src/RTRover/bncrtrover.h

@@ -29 +29 @@
     std::vector<t_obs> _obsBase; 
   };
+  void processFrontEpoch();
   QMutex                  _mutex;
   QByteArray              _mode;