Changeset 5778 in ntrip

Timestamp:

Aug 4, 2014, 1:42:28 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP

Files:

• pppClient.cpp (modified) (3 diffs)
• pppClient.h (modified) (2 diffs)
• pppThread.cpp (modified) (1 diff)

trunk/BNC/src/PPP/pppClient.cpp

@@ -155 +155 @@
 // 
 //////////////////////////////////////////////////////////////////////////////
-t_irc t_pppClient::prepareObs(const vector<t_pppSatObs>& pppSatObs,
+t_irc t_pppClient::prepareObs(const vector<t_pppSatObs*>& pppSatObs,
                               vector<t_satObs*>& obsVector, bncTime& epoTime) {
   // Default 
@@ -169 +169 @@
   int numValidGPS = 0;
   for (unsigned ii = 0; ii < pppSatObs.size(); ii++) {
-    char system = pppSatObs[ii]._prn.system();
+    char system = pppSatObs[ii]->_prn.system();
     if (system == 'G' || (system == 'R' && OPT->useGlonass())) {
-      t_satObs* satObs = new t_satObs(pppSatObs[ii]);
+      t_satObs* satObs = new t_satObs(*pppSatObs[ii]);
       if (satObs->isValid()) {
         obsVector.push_back(satObs);
@@ -410 +410 @@
 // 
 //////////////////////////////////////////////////////////////////////////////
-void t_pppClient::processEpoch(const vector<t_pppSatObs>& pppSatObs, t_output* output) {
+void t_pppClient::processEpoch(const vector<t_pppSatObs*>& pppSatObs, t_output* output) {
 
   try {

trunk/BNC/src/PPP/pppClient.h

@@ -27 +27 @@
   void putClkCorrections(const std::vector<t_clkCorr>& corr); 
   void putBiases(const std::vector<t_satBiases>& biases);   
-  void processEpoch(const std::vector<t_pppSatObs>& pppSatObs, t_output* output);
+  void processEpoch(const std::vector<t_pppSatObs*>& pppSatObs, t_output* output);
 
   const t_ephPool* ephPool() const {return _ephPool;}
@@ -46 +46 @@
   void finish(t_irc irc);
   void clearObs();
-  t_irc prepareObs(const std::vector<t_pppSatObs>& pppSatObs,
+  t_irc prepareObs(const std::vector<t_pppSatObs*>& pppSatObs,
                    std::vector<t_satObs*>& obsVector, bncTime& epoTime);
   t_irc cmpModel(t_station* station, const ColumnVector& xyzc,

trunk/BNC/src/PPP/pppThread.cpp

@@ -167 +167 @@
   }
 
-  vector<t_pppSatObs> satObs;
-  t_output            output;
+  vector<t_pppSatObs*> satObs;
+  QListIterator<t_obs> it(obsList);
+  while (it.hasNext()) {
+    const t_obs& obs = it.next();
+  }
 
+  t_output output;
   _pppClient->processEpoch(satObs, &output);