Changeset 1744 in ntrip

Timestamp:

Mar 7, 2009, 1:59:43 PM (16 years ago)

Author:

weber

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncgetthread.cpp (modified) (2 diffs)
• bncserialport.cpp (modified) (1 diff)

trunk/BNC/bncgetthread.cpp

@@ -306 +306 @@
   // Instantiate the decoder
   // -----------------------
-  if      (_format.indexOf("RTCM_2") != -1) {
+  if      (_format.indexOf("RTCM_2") != -1 || _format.indexOf("RTCM2") != -1 ||
+           _format.indexOf("RTCM 2") != -1 ) {
     emit(newMessage(_staID + ": Get data in RTCM 2.x format", true));
     _decoder = new RTCM2Decoder(_staID.data());
   }
-  else if (_format.indexOf("RTCM_3") != -1) {
+  else if (_format.indexOf("RTCM_3") != -1 || _format.indexOf("RTCM3") != -1 ||
+           _format.indexOf("RTCM 3") != -1 ) {
     emit(newMessage(_staID + ": Get data in RTCM 3.x format", true));
     _decoder = new RTCM3Decoder(_staID);
@@ -534 +536 @@
       _query = new bncNetQueryRtp();
     }
+    else if (_ntripVersion == "S") {
+      _query = new bncNetQueryV0();
+    }
     else if (_ntripVersion == "N") {
       _query = new bncNetQueryV0();

trunk/BNC/bncserialport.cpp

@@ -170 +170 @@
        !_serialLatLineEdit->text().isEmpty() &&
        !_serialLonLineEdit->text().isEmpty() ) {
-    mountPoints->push_back("//" + _serialDataBits + "-"
-                                + _serialParity + "-"
-                                + _serialStopBits + "-"
-                                + _serialFlowControl + "-"
-                                + _serialPortLineEdit->text().replace("/","-").replace(QRegExp("^[-]"), "") + ":"
-                                + _serialBaudRate + "/"
-                                + _serialMountpointLineEdit->text() + " "
-                                + _serialFormatLineEdit->text() + " "
-                                + _serialLatLineEdit->text() + " "
-                                + _serialLonLineEdit->text() + " "
-                                + "no S");
+    mountPoints->push_back("//" 
+      + _serialPortLineEdit->text().replace("/","-").replace(QRegExp("^[-]"), "") + "-"
+      + _serialDataBits + "-"
+      + _serialParity + "-"
+      + _serialStopBits + "-"
+      + _serialFlowControl + "-"
+      + _serialBaudRate + "/"
+      + _serialMountpointLineEdit->text() + " "
+      + _serialFormatLineEdit->text() + " "
+      + _serialLatLineEdit->text() + " "
+      + _serialLonLineEdit->text() + " "
+      + "no S");
   } else {
    QMessageBox::warning(this, tr("Warning"),