Changeset 875 in ntrip for trunk

Timestamp:

May 6, 2008, 10:49:30 AM (17 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• RTCM3/RTCM3coDecoder.cpp (modified) (3 diffs)
• RTCM3/RTCM3coDecoder.h (modified) (2 diffs)
• bncgetthread.cpp (modified) (1 diff)
• bnczerodecoder.h (modified) (1 diff)

trunk/BNC/RTCM3/RTCM3coDecoder.cpp

@@ -47 +47 @@
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-RTCM3coDecoder::RTCM3coDecoder() : GPSDecoder() {
+RTCM3coDecoder::RTCM3coDecoder(const QString& fileName) 
+  : bncZeroDecoder(fileName) {
 }
 
@@ -59 +60 @@
 t_irc RTCM3coDecoder::Decode(char* buffer, int bufLen) {
 
+  reopen();
+  
   _buffer.append(buffer, bufLen);
-  printf("BUFFER: %d %d\n", bufLen, _buffer.size());
 
   while (true) {
@@ -74 +76 @@
     else if (irc == 0) {
       for(int ii = 0; ii < _co.NumberOfGPSSat; ++ii) {
-        printf("%d G%d %d %f %f %f %f\n", _co.GPSEpochTime,
+        QString line;
+        line.sprintf("%d G%d %d %f %f %f %f\n", _co.GPSEpochTime,
                _co.Sat[ii].ID, _co.Sat[ii].IOD, _co.Sat[ii].Clock.DeltaA0,
                _co.Sat[ii].Orbit.DeltaRadial, _co.Sat[ii].Orbit.DeltaAlongTrack,
                _co.Sat[ii].Orbit.DeltaCrossTrack);
+        _out->write(line.toAscii().data(), line.length());
+        _out->flush();
       }
       char obuffer[CLOCKORBIT_BUFFERSIZE];
       int len = MakeClockOrbit(&_co, COTYPE_AUTO, 0, obuffer, sizeof(obuffer));
-      printf("LEN: %d\n", len);
       if (len > 0) {
         _buffer = _buffer.substr(len);

trunk/BNC/RTCM3/RTCM3coDecoder.h

@@ -26 +26 @@
 #define RTCM3CODECODER_H
 
-#include "../RTCM/GPSDecoder.h"
+#include "bnczerodecoder.h"
 
 extern "C" {
@@ -32 +32 @@
 }
 
-class RTCM3coDecoder : public GPSDecoder {
+class RTCM3coDecoder : public bncZeroDecoder {
 public:
-  RTCM3coDecoder();
+  RTCM3coDecoder(const QString& fileName);
   virtual ~RTCM3coDecoder();
   virtual t_irc Decode(char* buffer = 0, int bufLen = 0);

trunk/BNC/bncgetthread.cpp

@@ -377 +377 @@
     else if (_format.indexOf("SP3") != -1) {
       emit(newMessage("Get Corrections: " + _staID + " in RTCM 3.x format"));
-      _decoder = new RTCM3coDecoder();
+      _decoder = new RTCM3coDecoder(_staID);
     }
     else if (_format.indexOf("ZERO") != -1) {

trunk/BNC/bnczerodecoder.h

@@ -31 +31 @@
 
 class bncZeroDecoder: public GPSDecoder {
-  public:
-    bncZeroDecoder(const QString& fileName);
-    ~bncZeroDecoder();
-    virtual t_irc Decode(char* buffer, int bufLen);
-  private:
-    void reopen();
-    QString        _fileName;
-    std::ofstream* _out;
-    QDate          _fileDate;
+ public:
+  bncZeroDecoder(const QString& fileName);
+  ~bncZeroDecoder();
+  virtual t_irc Decode(char* buffer, int bufLen);
+ protected:
+  void reopen();
+  QString        _fileName;
+  std::ofstream* _out;
+ private:
+  QDate          _fileDate;
 };