Changeset 1711 in ntrip for trunk

Timestamp:

Mar 4, 2009, 5:32:52 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncgetthread.cpp (modified) (2 diffs)
• bncnetquery.h (modified) (2 diffs)

trunk/BNC/bncgetthread.cpp

@@ -251 +251 @@
     // ------------
     hlp = settings.value("serialFlowControl").toString();
-    if      (hlp == "OFF") {
-      _serialPort->setFlowControl(FLOW_OFF);    
-    }
-    else if (hlp == "XONXOFF") {
+    if (hlp == "XONXOFF") {
       _serialPort->setFlowControl(FLOW_XONXOFF);    
     }
     else if (hlp == "HARDWARE") {
       _serialPort->setFlowControl(FLOW_HARDWARE);    
+    }
+    else {
+      _serialPort->setFlowControl(FLOW_OFF);    
     }
 
@@ -621 +621 @@
     if (nb > 0) {
       QByteArray data = _serialPort->read(nb);
+
+      if (_serialNMEA == AUTO_NMEA) {
+        _query->sendNMEA(data);
+      }
+
       if (_serialOutFile) {
         _serialOutFile->write(data);

trunk/BNC/bncnetquery.h

@@ -16 +16 @@
             (bncApp*) qApp, SLOT(slotMessage(const QByteArray,bool)));
   }
-  virtual ~bncNetQuery() {};
+  virtual ~bncNetQuery() {}
   
   virtual void stop() = 0;
@@ -22 +22 @@
   virtual void startRequest(const QUrl& url, const QByteArray& gga) = 0;
   virtual void waitForReadyRead(QByteArray& outData) = 0;
+  virtual void sendNMEA(const QByteArray& /* ggaString */) {}
 
   queryStatus status() const {return _status;}