Changeset 6785 in ntrip for trunk/BNC/src/bncwindow.cpp
- Timestamp:
- Apr 20, 2015, 4:06:32 PM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/src/bncwindow.cpp
r6776 r6785 326 326 } 327 327 _serialAutoNMEAComboBox = new QComboBox(); 328 _serialAutoNMEAComboBox->addItems(QString("no,Auto,Manual ").split(","));328 _serialAutoNMEAComboBox->addItems(QString("no,Auto,Manual GPGGA,Manual GNGGA").split(",")); 329 329 kk = _serialAutoNMEAComboBox->findText(settings.value("serialAutoNMEA").toString()); 330 330 if (kk != -1) { … … 795 795 serLayout->addWidget(_serialHeightNMEALineEdit, 5,15, 1,11); 796 796 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); 798 798 serLayout->addWidget(new QLabel(""), 6, 1); 799 799 serLayout->setRowStretch(7, 999); … … 2251 2251 bool enable2 = enable && _serialAutoNMEAComboBox->currentText() == "Auto"; 2252 2252 enableWidget(enable2, _serialFileNMEALineEdit); 2253 bool enable3 = enable && _serialAutoNMEAComboBox->currentText() == "Manual ";2253 bool enable3 = enable && _serialAutoNMEAComboBox->currentText() == "Manual GPGGA"; 2254 2254 enableWidget(enable3, _serialHeightNMEALineEdit); 2255 2255 enableWidget(enable3, _serialManualNMEASamplingSpinBox); 2256 bool enable4 = enable && _serialAutoNMEAComboBox->currentText() == "Manual GNGGA"; 2257 enableWidget(enable4, _serialHeightNMEALineEdit); 2258 enableWidget(enable4, _serialManualNMEASamplingSpinBox); 2256 2259 } 2257 2260
Note:
See TracChangeset
for help on using the changeset viewer.