Changeset 508 in ntrip

Timestamp:

Oct 14, 2007, 5:40:15 PM (17 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• RTCM3/RTCM3Decoder.cpp (modified) (4 diffs)
• RTCM3/RTCM3Decoder.h (modified) (2 diffs)
• bncgetthread.cpp (modified) (1 diff)

trunk/BNC/RTCM3/RTCM3Decoder.cpp

@@ -63 +63 @@
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-RTCM3Decoder::RTCM3Decoder() : GPSDecoder() {
+RTCM3Decoder::RTCM3Decoder(const QByteArray& staID) : GPSDecoder() {
 
   const int LEAPSECONDS = 14; /* only needed for approx. time */
@@ -80 +80 @@
   _Parser2.GPSTOW  = tim%(7*24*60*60);
 
-  _Parser2.headerfile       = strdup("TEST_HEADERFILE");
-  _Parser2.glonassephemeris = strdup("TEST_GLONASSEPHEMERIS");
-  _Parser2.gpsephemeris     = strdup("TEST_GPSEPHEMERIS");
+  _Parser2.headerfile       = 0;
+  _Parser2.glonassephemeris = 0;
+  _Parser2.gpsephemeris     = (staID + ".EPH").data();
   _Parser2.rinex3           = 1;
 }
@@ -89 +89 @@
 ////////////////////////////////////////////////////////////////////////////
 RTCM3Decoder::~RTCM3Decoder() {
+  if (_Parser2.glonassfile) {
+    fclose(_Parser2.glonassfile);
+  }
+  if (_Parser2.gpsfile) {
+    fclose(_Parser2.gpsfile);
+  }
 }
 
@@ -94 +100 @@
 ////////////////////////////////////////////////////////////////////////////
 void RTCM3Decoder::Decode(char* buffer, int bufLen) {
+
+  // Direct file output
+  // ------------------
   for (int ii = 0; ii < bufLen; ii++) {
-
-    // Direct file output
-    // ------------------
     HandleByte(&_Parser2, (unsigned int) buffer[ii]);
+    if (_Parser2.glonassfile) {
+      fflush(_Parser2.glonassfile);
+    }
+    if (_Parser2.gpsfile) {
+      fflush(_Parser2.gpsfile);
+    }
+  }
+
+  // Fill the obs structure
+  // ----------------------
+  for (int ii = 0; ii < bufLen; ii++) {
 
     _Parser.Message[_Parser.MessageSize++] = buffer[ii];

trunk/BNC/RTCM3/RTCM3Decoder.h

@@ -26 +26 @@
 #define RTCM3DECODER_H
 
+#include <QtCore>
 #include "../RTCM/GPSDecoder.h"
 
@@ -34 +35 @@
 class RTCM3Decoder : public GPSDecoder {
 public:
-  RTCM3Decoder();
+  RTCM3Decoder(const QByteArray& staID);
   ~RTCM3Decoder();
   void Decode(char* buffer = 0, int bufLen = 0);

trunk/BNC/bncgetthread.cpp

@@ -333 +333 @@
     else if (_format.indexOf("RTCM_3") != -1) {
       emit(newMessage("Get Data: " + _staID + " in RTCM 3.0 format"));
-      _decoder = new RTCM3Decoder();
+      _decoder = new RTCM3Decoder(_staID);
     }
     else if (_format.indexOf("RTIGS") != -1) {