Changeset 3505 in ntrip

Timestamp:

Nov 19, 2011, 2:57:04 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• GPSS/hassDecoder.cpp (modified) (2 diffs)
• GPSS/hassDecoder.h (modified) (1 diff)
• RTCM3/RTCM3coDecoder.h (modified) (2 diffs)
• bncgetthread.cpp (modified) (1 diff)

trunk/BNC/GPSS/hassDecoder.cpp

@@ -17 +17 @@
 
 #include "hassDecoder.h"
-#include "bncapp.h"
 
 using namespace std;
@@ -23 +22 @@
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-hassDecoder::hassDecoder() : GPSDecoder() {
+hassDecoder::hassDecoder(const QString& staID) : RTCM3coDecoder(staID) {
 }
 

trunk/BNC/GPSS/hassDecoder.h

@@ -5 +5 @@
 #include <QtCore>
 
-#include "RTCM/GPSDecoder.h"
-#include "rtcm3torinex.h"
+#include "RTCM3/RTCM3coDecoder.h"
 
-class hassDecoder : public QObject, public GPSDecoder {
+class hassDecoder : public RTCM3coDecoder {
 Q_OBJECT
 
  public:
-  hassDecoder();
+  hassDecoder(const QString& staID);
   virtual ~hassDecoder();
   virtual t_irc Decode(char* data, int dataLen, std::vector<std::string>& errmsg);
 
- signals:
-  void newMessage(QByteArray msg, bool showOnScreen);
-
  private:
-  QByteArray _buffer;
 } ;
 

trunk/BNC/RTCM3/RTCM3coDecoder.h

@@ -52 +52 @@
   void newCorrLine(QString line, QString staID, long coTime);
 
- private:
+ protected:
   void printLine(const QString& line, long coTime);
-
-  int            _port;
   std::ofstream* _out;
   QString        _staID;
@@ -61 +59 @@
   QString        _fileName;
   QByteArray     _buffer;
+  double         _GPSweeks;
+
+ private:
   ClockOrbit     _co;
   Bias           _bias;
-  double         _GPSweeks;
 };
 

trunk/BNC/bncgetthread.cpp

@@ -321 +321 @@
   else if (_format.indexOf("HASS") != -1) {
     emit(newMessage(_staID + ": Get data in HASS format", true));
-    _decoder = new hassDecoder();
+    _decoder = new hassDecoder(_staID);
   }
   else {