Changeset 2905 in ntrip for trunk/BNC/bncpppclient.h

Timestamp:

Jan 27, 2011, 1:57:40 PM (13 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/bncpppclient.h (modified) (6 diffs)

trunk/BNC/bncpppclient.h

@@ -27 +27 @@
 
 #include <queue>
-#include <QtNetwork>
-
-#include <newmat.h>
-
-#include "bncconst.h"
-#include "bnctime.h"
+#include "bncephuser.h"
 #include "RTCM/GPSDecoder.h"
-#include "RTCM3/ephemeris.h"
 
 class bncModel;
@@ -99 +93 @@
 };
 
-class t_corr {
- public:
-  t_corr() {
-    raoSet  = false;
-    dClkSet = false;
-  }
-  bool ready() {return raoSet && dClkSet;}
-  bncTime       tt;
-  int          iod;
-  double       dClk;
-  double       dotDClk;
-  double       dotDotDClk;
-  ColumnVector rao;
-  ColumnVector dotRao;
-  ColumnVector dotDotRao;
-  bool         raoSet;
-  bool         dClkSet;
-};
-
 class t_bias {
  public:
@@ -131 +106 @@
 };
 
-class bncPPPclient : public QObject {
+class bncPPPclient : public bncEphUser {
  Q_OBJECT
 
@@ -140 +115 @@
 
  public slots:
-  void slotNewEphGPS(gpsephemeris gpseph);
-  void slotNewEphGlonass(glonassephemeris gloeph);
-  void slotNewEphGalileo(galileoephemeris galeph);
   void slotNewCorrections(QList<QString> corrList);
 
@@ -164 +136 @@
   };
 
-  class t_ephPair {
-   public:
-    t_ephPair() {
-      last = 0;
-      prev = 0;
-    }
-    ~t_ephPair() {
-      delete last;
-      delete prev;
-    }
-    t_eph* last;
-    t_eph* prev;
-  };
-
   t_irc getSatPos(const bncTime& tt, const QString& prn, 
                   ColumnVector& xc, ColumnVector& vv);
@@ -187 +145 @@
 
   QByteArray              _staID;
-  QMutex                  _mutex;
-  QMap<QString, t_ephPair*> _eph;
   QMap<QString, t_corr*>  _corr;
   bncTime                 _corr_tt;