Changeset 5780 in ntrip

Timestamp:

Aug 4, 2014, 1:55:27 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP

Files:

• ppp.h (modified) (2 diffs)
• pppThread.cpp (modified) (1 diff)
• satobs.cpp (modified) (4 diffs)
• satobs.h (modified) (4 diffs)

trunk/BNC/src/PPP/ppp.h

@@ -40 +40 @@
 };
 
-class t_obs  {
+class t_pppObs  {
  public:
-  t_obs() {
+  t_pppObs() {
     _code            = 0.0;          
     _codeValid       = false;     
@@ -71 +71 @@
 class t_pppSatObs {
  public:
-  t_prn              _prn;
-  bncTime            _time;
-  std::vector<t_obs> _obs;
+  t_prn                 _prn;
+  bncTime               _time;
+  std::vector<t_pppObs> _obs;
 };
 

trunk/BNC/src/PPP/pppThread.cpp

@@ -167 +167 @@
   }
 
-  vector<t_pppSatObs*> satObs;
+  vector<t_pppSatObs*> pppSatObs;
   QListIterator<t_obs> it(obsList);
   while (it.hasNext()) {
-    const t_obs& obs = it.next();
+    const t_obs& oldObs = it.next();
+    t_pppSatObs* newObs = new t_pppSatObs;
+
+    pppSatObs.push_back(newObs);
   }
 
   t_output output;
-  _pppClient->processEpoch(satObs, &output);
+  _pppClient->processEpoch(pppSatObs, &output);
 
-  for (unsigned ii = 0; ii < satObs.size(); ii++) {
-    delete satObs[ii];
+  for (unsigned ii = 0; ii < pppSatObs.size(); ii++) {
+    delete pppSatObs[ii];
   }
-  satObs.clear();
+  pppSatObs.clear();
 
   emit newMessage(QByteArray(output._log.c_str()), true);

trunk/BNC/src/PPP/satobs.cpp

@@ -63 +63 @@
   _outlier    = false;
   for (unsigned ii = 0; ii < pppSatObs._obs.size(); ii++) {
-    const t_obs& obs = pppSatObs._obs[ii];
+    const t_pppObs& obs = pppSatObs._obs[ii];
     t_obsType obsType = string(obs._rnxType2ch).substr(0,2);
-    _allObs[obsType] = new t_obs(obs);
+    _allObs[obsType] = new t_pppObs(obs);
   }
   prepareObs();
@@ -73 +73 @@
 ////////////////////////////////////////////////////////////////////////////
 t_satObs::~t_satObs() {
-  map<t_obsType, t_obs*>::const_iterator it;
+  map<t_obsType, t_pppObs*>::const_iterator it;
   for (it = _allObs.begin(); it != _allObs.end(); it++) {
     delete it->second;
@@ -96 +96 @@
     obsType1[1] = preferredAttrib[iPref];
     if (_validObs1 == 0 && _allObs.find(obsType1) != _allObs.end()) {
-      t_obs* obs = _allObs[obsType1];
+      t_pppObs* obs = _allObs[obsType1];
       if (obs->_codeValid && obs->_phaseValid) {
         _validObs1 = obs;
@@ -105 +105 @@
       obsType2[1] = preferredAttrib[iPref];
       if (_validObs2 == 0 && _allObs.find(obsType2) != _allObs.end()) {
-        t_obs* obs = _allObs[obsType2];
+        t_pppObs* obs = _allObs[obsType2];
         if (obs->_codeValid && obs->_phaseValid) {
           _validObs2 = obs;

trunk/BNC/src/PPP/satobs.h

@@ -44 +44 @@
 
   bool slip() const {
-    std::map<t_obsType, t_obs*>::const_iterator it;
+    std::map<t_obsType, t_pppObs*>::const_iterator it;
     for (it = _allObs.begin(); it != _allObs.end(); it++) {
       if (it->second->_slip) {
@@ -55 +55 @@
   int slipCounter() const {
     int cnt = -1;
-    std::map<t_obsType, t_obs*>::const_iterator it;
+    std::map<t_obsType, t_pppObs*>::const_iterator it;
     for (it = _allObs.begin(); it != _allObs.end(); it++) {
       if (it->second->_slipCounter > cnt) {
@@ -66 +66 @@
   int biasJumpCounter() const {
     int jmp = -1;
-    std::map<t_obsType, t_obs*>::const_iterator it;
+    std::map<t_obsType, t_pppObs*>::const_iterator it;
     for (it = _allObs.begin(); it != _allObs.end(); it++) {
       if (it->second->_biasJumpCounter > jmp) {
@@ -118 +118 @@
   };
 
-  t_prn                       _prn;
-  bncTime                     _time;
-  int                         _channel;
-  std::map<t_obsType, t_obs*> _allObs;
-  bool                        _valid;
-  t_obs*                      _validObs1;
-  t_obs*                      _validObs2;
-  double                      _f1;
-  double                      _f2;
-  double                      _rawC1;
-  double                      _rawC2;
-  double                      _rawL1;
-  double                      _rawL2;
-  ColumnVector                _xcSat;
-  ColumnVector                _vvSat;
-  t_model                     _model;
-  bool                        _outlier;
-  std::map<t_lc::type, double> _res;
+  t_prn                          _prn;
+  bncTime                        _time;
+  int                            _channel;
+  std::map<t_obsType, t_pppObs*> _allObs;
+  bool                           _valid;
+  t_pppObs*                      _validObs1;
+  t_pppObs*                      _validObs2;
+  double                         _f1;
+  double                         _f2;
+  double                         _rawC1;
+  double                         _rawC2;
+  double                         _rawL1;
+  double                         _rawL2;
+  ColumnVector                   _xcSat;
+  ColumnVector                   _vvSat;
+  t_model                        _model;
+  bool                           _outlier;
+  std::map<t_lc::type, double>   _res;
 };