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

Timestamp:

Sep 14, 2014, 10:21:12 AM (10 years ago)

Author:

mervart

Message:

 

File:

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

trunk/BNC/src/combination/bnccomb.h

@@ -21 +21 @@
  public slots:
   void slotProviderIDChanged(QString mountPoint);
-  void slotNewOrbCorrections(QList<t_orbCorr> orbCorr);
-  void slotNewClkCorrections(QList<t_clkCorr> clkCorr);
+  void slotNewOrbCorrections(QList<t_orbCorr> orbCorrections);
+  void slotNewClkCorrections(QList<t_clkCorr> clkCorrections);
 
  signals:
   void newMessage(QByteArray msg, bool showOnScreen);
-  void newClkCorrections(QList<t_clkCorr> clkCorr);
+  void newClkCorrections(QList<t_clkCorr> clkCorrections);
+  void newOrbCorrections(QList<t_orbCorr> orbCorrections);
 
  private:
@@ -62 +63 @@
   };
 
-  class cmbCorr : public t_clkCorr {
+  class cmbCorr {
    public:
-    QString      acName;
-    ColumnVector diffRao;
-    QString ID() {return acName + "_" + QString(_prn.toString().c_str());}
+    cmbCorr() {
+      _eph     = 0;
+      _iod     = 0;
+      _orbCorr = 0;
+      _clkCorr = 0;
+    }
+    ~cmbCorr() {
+      delete _orbCorr;
+      delete _clkCorr;
+    }
+    t_prn        _prn;
+    bncTime      _time;
+    int          _iod;
+    const t_eph* _eph;
+    t_orbCorr*   _orbCorr;
+    t_clkCorr*   _clkCorr;
+    QString      _acName;
+    ColumnVector _diffRao;
+    QString ID() {return _acName + "_" + QString(_prn.toString().c_str());}
   };
 
@@ -82 +99 @@
 
   void  processEpoch();
-  t_irc processEpoch_filter(QTextStream& out, QMap<QString, t_clkCorr*>& resCorr,
+  t_irc processEpoch_filter(QTextStream& out, QMap<QString, cmbCorr*>& resCorr,
                             ColumnVector& dx);
-  t_irc processEpoch_singleEpoch(QTextStream& out, QMap<QString, t_clkCorr*>& resCorr,
+  t_irc processEpoch_singleEpoch(QTextStream& out, QMap<QString, cmbCorr*>& resCorr,
                                  ColumnVector& dx);
   t_irc createAmat(Matrix& AA, ColumnVector& ll, DiagonalMatrix& PP,
-                   const ColumnVector& x0, QMap<QString, t_clkCorr*>& resCorr);
-  void  dumpResults(const QMap<QString, t_clkCorr*>& resCorr);
-  void  printResults(QTextStream& out, const QMap<QString, t_clkCorr*>& resCorr);
-  void  switchToLastEph(const t_eph* lastEph, t_clkCorr* corr);
+                   const ColumnVector& x0, QMap<QString, cmbCorr*>& resCorr);
+  void  dumpResults(const QMap<QString, cmbCorr*>& resCorr);
+  void  printResults(QTextStream& out, const QMap<QString, cmbCorr*>& resCorr);
+  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;
-  bncTime                 _resTime;
-  QVector<cmbParam*>      _params;
-  QMap<bncTime, cmbEpoch> _buffer;
-  bncRtnetDecoder*        _rtnetDecoder;
-  SymmetricMatrix         _QQ;
-  QByteArray              _log;
-  bncAntex*               _antex;
-  double                  _MAXRES;
-  QString                 _masterOrbitAC;
-  unsigned                _masterMissingEpochs;
-  e_method                _method;
-  bool                    _useGlonass;
-  int                     _cmbSampl;
-  QMap<QString, cmbCorr*> _orbitCorrs;
+  QList<cmbAC*>                          _ACs;
+  bncTime                                _resTime;
+  QVector<cmbParam*>                     _params;
+  QMap<bncTime, cmbEpoch>                _buffer;
+  bncRtnetDecoder*                       _rtnetDecoder;
+  SymmetricMatrix                        _QQ;
+  QByteArray                             _log;
+  bncAntex*                              _antex;
+  double                                 _MAXRES;
+  QString                                _masterOrbitAC;
+  unsigned                               _masterMissingEpochs;
+  e_method                               _method;
+  bool                                   _useGlonass;
+  int                                    _cmbSampl;
+  QMap<QString, QMap<t_prn, t_orbCorr> > _orbCorrections;
 };