Changeset 5877 in ntrip

Timestamp:

Aug 8, 2014, 12:11:00 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP

Files:

• pppClient.cpp (modified) (1 diff)
• pppFilter.cpp (modified) (1 diff)
• pppInclude.h (modified) (1 diff)
• pppParlist.cpp (modified) (2 diffs)
• pppParlist.h (modified) (1 diff)
• pppRunRealTime.cpp (modified) (1 diff)

trunk/BNC/src/PPP/pppClient.cpp

@@ -352 +352 @@
     _output->_xyzRover[1] = _staRover->xyzApr()[1] + _filter->x()[1];
     _output->_xyzRover[2] = _staRover->xyzApr()[2] + _filter->x()[2];
+
+    xyz2neu(_staRover->ellApr().data(), _filter->x().data(), _output->_neu);
+
     copy(&_filter->Q().data()[0], &_filter->Q().data()[6], _output->_covMatrix);
+
     _output->_numSat     = _filter->numSat();
     _output->_pDop       = _filter->PDOP();

trunk/BNC/src/PPP/pppFilter.cpp

@@ -160 +160 @@
   }
 
-  _parlist->printResult(_epoTime, _QFlt, _xFlt, 0);
+  _parlist->printResult(_epoTime, _QFlt, _xFlt);
 
   return success;

trunk/BNC/src/PPP/pppInclude.h

@@ -28 +28 @@
   double       _xyzRover[3];  
   double       _covMatrix[6]; 
+  double       _neu[3];  
   int          _numSat;       
   double       _pDop;         

trunk/BNC/src/PPP/pppParlist.cpp

@@ -382 +382 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_pppParlist::printResult(const bncTime& epoTime, const SymmetricMatrix& QQ,
-                            const ColumnVector& xx, double ambFixRate) const {
+                               const ColumnVector& xx) const {
 
   string epoTimeStr = string(epoTime);
@@ -450 +450 @@
         << " dU = " << setprecision(4) << neu[2] << " +- "
         << setprecision(4) << sqrt(QQneu[2][2]);
-    if (ambFixRate > 0.0) {
-      LOG << " fix "; 
-    }
-    else {
-      LOG << " flt "; 
-    }
-    LOG << int(100*ambFixRate) << " %\n";
-  }
-}
-
+    LOG << endl;
+  }
+}
+

trunk/BNC/src/PPP/pppParlist.h

@@ -104 +104 @@
   std::vector<t_pppParam*>& params() {return _params;}
   void printResult(const bncTime& epoTime, const SymmetricMatrix& QQ, 
-                   const ColumnVector& xx, double ambFixRate) const;
+                   const ColumnVector& xx) const;
  private:
   std::vector<t_pppParam*> _params;

trunk/BNC/src/PPP/pppRunRealTime.cpp

@@ -204 +204 @@
 
     if (!output._error && _opt->xyzAprRoverSet()) {
-      ColumnVector dx(3);
-      dx[0] = _opt->_xyzAprRover[0] - output._xyzRover[0];
-      dx[1] = _opt->_xyzAprRover[1] - output._xyzRover[1];
-      dx[2] = _opt->_xyzAprRover[2] - output._xyzRover[2];
-      emit newPosition (output._epoTime, dx[0], dx[1], dx[2]);
+      emit newPosition (output._epoTime, output._neu[0], output._neu[1], output._neu[2]);
     }