Changeset 3578 in ntrip for trunk/BNC/RTCM3

Timestamp:

Dec 26, 2011, 10:24:30 AM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/RTCM3

Files:

• RTCM3Decoder.cpp (modified) (1 diff)
• RTCM3Decoder.h (modified) (3 diffs)
• RTCM3coDecoder.h (modified) (4 diffs)

trunk/BNC/RTCM3/RTCM3Decoder.cpp

@@ -433 +433 @@
 }
 
-// Store ephemerides
-//////////////////////////////////////////////////////////////////////////////
-bool RTCM3Decoder::storeEph(const gpsephemeris& gpseph) {
-  t_ephGPS eph; eph.set(&gpseph);
-
-  return storeEph(eph);
-}
-
-
-bool RTCM3Decoder::storeEph(const t_ephGPS& gpseph) {
-  const double secPerWeek = 7.0 * 24.0 * 3600.0;
-  double weekold = 0.0;
-  double weeknew = gpseph.GPSweek() + gpseph.GPSweeks() / secPerWeek;
-  string prn = gpseph.prn().toAscii().data();
-  if ( _ephList.find(prn) != _ephList.end() ) {
-    weekold = _ephList.find(prn)->second.GPSweek() 
-            + _ephList.find(prn)->second.GPSweeks() / secPerWeek; 
-  }
-
-  if ( weeknew - weekold > 1.0/secPerWeek ) {
-    _ephList[prn] = gpseph;
-
-    return true;
-  }
-
-  return false;
-}
-
 // Time of Corrections
 //////////////////////////////////////////////////////////////////////////////

trunk/BNC/RTCM3/RTCM3Decoder.h

@@ -32 +32 @@
 #include "../RTCM/GPSDecoder.h"
 #include "RTCM3coDecoder.h"
-#include "ephemeris.h"
 #include "bncrawfile.h"
 
@@ -46 +45 @@
   virtual t_irc Decode(char* buffer, int bufLen, std::vector<std::string>& errmsg);
   virtual int corrGPSEpochTime() const;
-
-  bool  storeEph(const gpsephemeris& gpseph);
-  bool  storeEph(const t_ephGPS&     gpseph);
 
  signals:
@@ -65 +61 @@
   t_mode                 _mode;
 
-  std::map<std::string, t_ephGPS> _ephList;
   double                 _antXYZ[3];
   bncRawFile*            _rawFile;

trunk/BNC/RTCM3/RTCM3coDecoder.h

@@ -31 +31 @@
 #include <QtNetwork>
 
-#include "bncephuser.h"
 #include "RTCM/GPSDecoder.h"
 
@@ -38 +37 @@
 }
 
-class RTCM3coDecoder : public bncEphUser, public GPSDecoder {
+class RTCM3coDecoder : public QObject, public GPSDecoder {
 Q_OBJECT
  public:
@@ -53 +52 @@
   void newCorrLine(QString line, QString staID, long coTime);
 
- protected:
+ private:
   void printLine(const QString& line, long coTime);
   std::ofstream* _out;
@@ -61 +60 @@
   QByteArray     _buffer;
   double         _GPSweeks;
-
- private:
   ClockOrbit     _co;
   Bias           _bias;