Changeset 6785 in ntrip

Timestamp:

Apr 20, 2015, 4:06:32 PM (9 years ago)

Author:

stuerze

Message:

consider GPGGA and GNGGA in manual nmea mode

Location:

trunk/BNC/src

Files:

• bncgetthread.cpp (modified) (3 diffs)
• bncwindow.cpp (modified) (3 diffs)

trunk/BNC/src/bncgetthread.cpp

@@ -241 +241 @@
     // Automatic NMEA
     // --------------
-    if (settings.value("serialAutoNMEA").toString() == "Auto") {
+    QString nmeaMode = settings.value("serialAutoNMEA").toString();
+    if (nmeaMode == "Auto") {
       _serialNMEA = AUTO_NMEA;
-
       QString fName = settings.value("serialFileNMEA").toString();
       if (!fName.isEmpty()) {
@@ -255 +255 @@
       }
     }
-
     // Manual NMEA
     // -----------
-    if (settings.value("serialAutoNMEA").toString() == "Manual") {
+    if ((nmeaMode == "Manual GPGGA") ||(nmeaMode == "Manual GNGGA")) {
       _serialNMEA = MANUAL_NMEA;
       bncSettings settings;
@@ -267 +266 @@
       }
       QByteArray _serialHeightNMEA = hlp.toAscii();
-      _manualNMEAString = ggaString(_latitude, _longitude, _serialHeightNMEA);
+      _manualNMEAString = ggaString(_latitude, _longitude, _serialHeightNMEA, nmeaMode);
     }
   }

trunk/BNC/src/bncwindow.cpp

@@ -326 +326 @@
   }
   _serialAutoNMEAComboBox  = new QComboBox();
-  _serialAutoNMEAComboBox->addItems(QString("no,Auto,Manual").split(","));
+  _serialAutoNMEAComboBox->addItems(QString("no,Auto,Manual GPGGA,Manual GNGGA").split(","));
   kk = _serialAutoNMEAComboBox->findText(settings.value("serialAutoNMEA").toString());
   if (kk != -1) {
@@ -795 +795 @@
   serLayout->addWidget(_serialHeightNMEALineEdit,                 5,15, 1,11);
   serLayout->addWidget(new QLabel("Sampling"),                    5,25, Qt::AlignRight);
- serLayout->addWidget(_serialManualNMEASamplingSpinBox,           5,26, 1,12);
+  serLayout->addWidget(_serialManualNMEASamplingSpinBox,          5,26, 1,12);
   serLayout->addWidget(new QLabel(""),                            6, 1);
   serLayout->setRowStretch(7, 999);
@@ -2251 +2251 @@
     bool enable2 = enable && _serialAutoNMEAComboBox->currentText() == "Auto";
     enableWidget(enable2, _serialFileNMEALineEdit);
-    bool enable3 = enable && _serialAutoNMEAComboBox->currentText() == "Manual";
+    bool enable3 = enable && _serialAutoNMEAComboBox->currentText() == "Manual GPGGA";
     enableWidget(enable3, _serialHeightNMEALineEdit);
     enableWidget(enable3, _serialManualNMEASamplingSpinBox);
+    bool enable4 = enable && _serialAutoNMEAComboBox->currentText() == "Manual GNGGA";
+    enableWidget(enable4, _serialHeightNMEALineEdit);
+    enableWidget(enable4, _serialManualNMEASamplingSpinBox);
   }