Changeset 3578 in ntrip for trunk/BNC/GPSS

Timestamp:

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

Author:

mervart

Message:

 

Location:

trunk/BNC/GPSS

Files:

• hassDecoder.cpp (modified) (3 diffs)
• hassDecoder.h (modified) (2 diffs)

trunk/BNC/GPSS/hassDecoder.cpp

@@ -20 +20 @@
 #include "bnctime.h"
 #include "bncutils.h"
+#include "RTCM3/RTCM3coDecoder.h"
 
 using namespace std;
@@ -25 +26 @@
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-hassDecoder::hassDecoder(const QString& staID) : RTCM3coDecoder(staID) {
+hassDecoder::hassDecoder(const QString& staID) {
   _GPSweeks = -1.0;
 }
@@ -128 +129 @@
                      0.0, dotRao[0], dotRao[1], dotRao[2], 0.0);
 
-    reopen(_fileNameSkl, _fileName, _out);    
-    printLine(corrLine, coTime);
+    RTCM3coDecoder::reopen(_fileNameSkl, _fileName, _out);    
+    if (_out) {
+      *_out << corrLine.toAscii().data() << endl;
+      _out->flush();
+    }
+    emit newCorrLine(corrLine, _staID, coTime);
   }
 

trunk/BNC/GPSS/hassDecoder.h

@@ -5 +5 @@
 #include <QtCore>
 
-#include "RTCM3/RTCM3coDecoder.h"
+#include "bncephuser.h"
+#include "RTCM/GPSDecoder.h"
 
-class hassDecoder : public RTCM3coDecoder {
+class hassDecoder : public bncEphUser, public GPSDecoder {
 Q_OBJECT
-
  public:
   hassDecoder(const QString& staID);
@@ -15 +15 @@
   virtual t_irc Decode(char* data, int dataLen, std::vector<std::string>& errmsg);
 
+ signals:
+  void newCorrLine(QString line, QString staID, long coTime);
+
  private:
+  std::ofstream* _out;
+  QString        _staID;
+  QString        _fileNameSkl;
+  QString        _fileName;
+  QByteArray     _buffer;
+  double         _GPSweeks;
 } ;