Changeset 6785 in ntrip


Ignore:
Timestamp:
Apr 20, 2015, 4:06:32 PM (7 years ago)
Author:
stuerze
Message:

consider GPGGA and GNGGA in manual nmea mode

Location:
trunk/BNC/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/bncgetthread.cpp

    r6773 r6785  
    241241    // Automatic NMEA
    242242    // --------------
    243     if (settings.value("serialAutoNMEA").toString() == "Auto") {
     243    QString nmeaMode = settings.value("serialAutoNMEA").toString();
     244    if (nmeaMode == "Auto") {
    244245      _serialNMEA = AUTO_NMEA;
    245 
    246246      QString fName = settings.value("serialFileNMEA").toString();
    247247      if (!fName.isEmpty()) {
     
    255255      }
    256256    }
    257 
    258257    // Manual NMEA
    259258    // -----------
    260     if (settings.value("serialAutoNMEA").toString() == "Manual") {
     259    if ((nmeaMode == "Manual GPGGA") ||(nmeaMode == "Manual GNGGA")) {
    261260      _serialNMEA = MANUAL_NMEA;
    262261      bncSettings settings;
     
    267266      }
    268267      QByteArray _serialHeightNMEA = hlp.toAscii();
    269       _manualNMEAString = ggaString(_latitude, _longitude, _serialHeightNMEA);
     268      _manualNMEAString = ggaString(_latitude, _longitude, _serialHeightNMEA, nmeaMode);
    270269    }
    271270  }
  • trunk/BNC/src/bncwindow.cpp

    r6776 r6785  
    326326  }
    327327  _serialAutoNMEAComboBox  = new QComboBox();
    328   _serialAutoNMEAComboBox->addItems(QString("no,Auto,Manual").split(","));
     328  _serialAutoNMEAComboBox->addItems(QString("no,Auto,Manual GPGGA,Manual GNGGA").split(","));
    329329  kk = _serialAutoNMEAComboBox->findText(settings.value("serialAutoNMEA").toString());
    330330  if (kk != -1) {
     
    795795  serLayout->addWidget(_serialHeightNMEALineEdit,                 5,15, 1,11);
    796796  serLayout->addWidget(new QLabel("Sampling"),                    5,25, Qt::AlignRight);
    797  serLayout->addWidget(_serialManualNMEASamplingSpinBox,           5,26, 1,12);
     797  serLayout->addWidget(_serialManualNMEASamplingSpinBox,          5,26, 1,12);
    798798  serLayout->addWidget(new QLabel(""),                            6, 1);
    799799  serLayout->setRowStretch(7, 999);
     
    22512251    bool enable2 = enable && _serialAutoNMEAComboBox->currentText() == "Auto";
    22522252    enableWidget(enable2, _serialFileNMEALineEdit);
    2253     bool enable3 = enable && _serialAutoNMEAComboBox->currentText() == "Manual";
     2253    bool enable3 = enable && _serialAutoNMEAComboBox->currentText() == "Manual GPGGA";
    22542254    enableWidget(enable3, _serialHeightNMEALineEdit);
    22552255    enableWidget(enable3, _serialManualNMEASamplingSpinBox);
     2256    bool enable4 = enable && _serialAutoNMEAComboBox->currentText() == "Manual GNGGA";
     2257    enableWidget(enable4, _serialHeightNMEALineEdit);
     2258    enableWidget(enable4, _serialManualNMEASamplingSpinBox);
    22562259  }
    22572260
Note: See TracChangeset for help on using the changeset viewer.