Changeset 6157 in ntrip for trunk/BNC/src/combination/bnccomb.h

Timestamp:

Sep 14, 2014, 10:53:36 AM (10 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/combination/bnccomb.h (modified) (2 diffs)

trunk/BNC/src/combination/bnccomb.h

@@ -75 +75 @@
       delete _clkCorr;
     }
-    t_prn        _prn;
+    QString      _prn;
     bncTime      _time;
     int          _iod;
     const t_eph* _eph;
-    t_orbCorr*   _orbCorr;
-    t_clkCorr*   _clkCorr;
-    QString      _acName;
+    t_orbCorr*   _orbCorr; // used for input
+    t_clkCorr*   _clkCorr; // used for input
+    QString      _acName; 
+    double       _dClk;    // used for output
     ColumnVector _diffRao;
-    QString ID() {return _acName + "_" + QString(_prn.toString().c_str());}
+    QString ID() {return _acName + "_" + _prn;}
   };
 
@@ -109 +110 @@
   void  switchToLastEph(const t_eph* lastEph, cmbCorr* corr);
   t_irc checkOrbits(QTextStream& out);
-  t_irc mergeOrbitCorr(const cmbCorr* orbitCorr, cmbCorr* clkCorr);
+  QVector<cmbCorr*>& corrs() {return _buffer[_resTime].corrs;}
 
   QList<cmbAC*>                          _ACs;