Changeset 2387 in ntrip

Timestamp:

Mar 26, 2010, 11:55:55 AM (14 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

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

trunk/BNC/RTCM3/RTCM3Decoder.cpp

@@ -65 +65 @@
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-RTCM3Decoder::RTCM3Decoder(const QString& staID) : GPSDecoder() {
+RTCM3Decoder::RTCM3Decoder(const QString& staID, bool inputFromFile) : 
+                GPSDecoder() {
+
+  _staID           = staID;
+  _inputFromFile   = inputFromFile;
 
   bncSettings settings;
   _checkMountPoint = settings.value("miscMount").toString();
-  _staID = staID;
 
   // Ensure, that the Decoder uses the "old" convention for the data structure for Rinex2. Perlt
@@ -118 +121 @@
     if ( _coDecoder->Decode(buffer, bufLen, errmsg) == success ) {
       decoded = true;
-      if (_mode == unknown) {
-        /////        _mode = corrections;
+      if (!_inputFromFile && _mode == unknown) {
+        _mode = corrections;
       }
     }
@@ -340 +343 @@
       }
     }
-    if (_mode == unknown && decoded) {
-      ////      _mode = observations;
+    if (!_inputFromFile && _mode == unknown && decoded) {
+      _mode = observations;
     }
   }

trunk/BNC/RTCM3/RTCM3Decoder.h

@@ -41 +41 @@
 Q_OBJECT
  public:
-  RTCM3Decoder(const QString& fileName);
+  RTCM3Decoder(const QString& staID, bool inputFromFile);
   virtual ~RTCM3Decoder();
   virtual t_irc Decode(char* buffer, int bufLen, std::vector<std::string>& errmsg);
@@ -67 +67 @@
   std::map<std::string, t_ephGPS> _ephList;
   double                 _antXYZ[3];
-
+  bool                   _inputFromFile;
 };
 

trunk/BNC/bncgetthread.cpp

@@ -307 +307 @@
            _format.indexOf("RTCM 3") != -1 ) {
     emit(newMessage(_staID + ": Get data in RTCM 3.x format", true));
-    _decoder = new RTCM3Decoder(_staID);
+    bool inputFromFile = false;
+    if (_rawInpFile != 0) {
+      inputFromFile = true;
+    }
+    _decoder = new RTCM3Decoder(_staID, inputFromFile);
     connect((RTCM3Decoder*) _decoder, SIGNAL(newMessage(QByteArray,bool)), 
             this, SIGNAL(newMessage(QByteArray,bool)));