Changeset 1636 in ntrip

Timestamp:

Feb 22, 2009, 12:30:43 AM (16 years ago)

Author:

weber

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncgetthread.cpp (modified) (1 diff)
• bncsettings.cpp (modified) (1 diff)
• bncwindow.cpp (modified) (10 diffs)
• bncwindow.h (modified) (1 diff)

trunk/BNC/bncgetthread.cpp ¶

@@ -266 +266 @@
     }
     _serialPort->setTimeout(0,100);
-    _serialPort->setFlowControl(FLOW_OFF);
+    hlp = settings.value("serialFlowControl").toString();
+    if      (hlp == "OFF") {
+      _serialPort->setFlowControl(FLOW_OFF);    
+    }
+    else if (hlp == "XONXOFF") {
+      _serialPort->setFlowControl(FLOW_XONXOFF);    
+    }
+else if (hlp == "HARDWARE") {
+      _serialPort->setFlowControl(FLOW_HARDWARE);    
+    }
   }
   else {

trunk/BNC/bncsettings.cpp ¶

@@ -72 +72 @@
     setValue("serialPortName",   "");
     setValue("serialStopBits",   "1");
+    setValue("serialFlowControl","OFF");
     setValue("startTab",         "0");
     setValue("waitTime",         "5");

trunk/BNC/bncwindow.cpp ¶

@@ -267 +267 @@
   if (kk != -1) {
     _serialStopBitsComboBox->setCurrentIndex(kk);
+  }
+  _serialFlowControlComboBox = new QComboBox();
+  _serialFlowControlComboBox->setMaximumWidth(11*ww);
+  _serialFlowControlComboBox->addItems(QString("OFF,XONXOFF,HARDWARE").split(","));
+  kk = _serialFlowControlComboBox->findText(settings.value("serialFlowControl").toString());
+  if (kk != -1) {
+    _serialFlowControlComboBox->setCurrentIndex(kk);
   }
   _serialAutoNMEAComboBox  = new QComboBox();
@@ -351 +358 @@
   _serialDataBitsComboBox->setWhatsThis(tr("<p>Select the number of 'Data bits' for the serial link.</p><p>Note that your selection must equal the number of data bits configured to the serial connected device. Note further that often 8 data bits are used.</p>"));
   _serialStopBitsComboBox->setWhatsThis(tr("<p>Select the number of 'Stop bits' for the serial link.</p><p>Note that your selection must equal the number of stop bits configured to the serial connected device. Note further that often 1 stop bit is used.</p>"));
+  _serialFlowControlComboBox->setWhatsThis(tr("<p>Select a 'Flow control' for the serial link.</p><p>Note that your selection must equal the flow control configured to the serial connected device. Select 'OFF' if you don't know better.</p>"));
   _serialAutoNMEAComboBox->setWhatsThis(tr("<p>Select 'Auto' to automatically forward NMEA-GGA messages coming from your serial connected device to the NTRIP broadcaster and/or save them in a file.</p><p>Forwarding NMEA-GGA messages is a must for VRS streams. Thus, in case your serial device is no capable to provide them, the alternative for VRS streams is a 'Manual' simulation of an initial NMEA-GGA message. Its contents is based on the approximate (editable) VRS latitude/longitude from the broadcaster's sourcetable and an approximate VRS height to be specified.</p>"));
   _serialFileNMEALineEdit->setWhatsThis(tr("<p>Specify the full path to a file where NMEA messages coming from your serial connected device are saved.</p>"));
@@ -608 +616 @@
   serLayout->addWidget(new QLabel("Baud rate"),                   2,0, Qt::AlignLeft);
   serLayout->addWidget(_serialBaudRateComboBox,                   2,1);
-  serLayout->addWidget(new QLabel("               Parity  "),     2,2, Qt::AlignRight);
-  serLayout->addWidget(_serialParityComboBox,                     2,3);
+  serLayout->addWidget(new QLabel("               Flow control"), 2,2, Qt::AlignRight);
+  serLayout->addWidget(_serialFlowControlComboBox,                2,3);
   serLayout->addWidget(new QLabel("Data bits"),                   3,0, Qt::AlignLeft);
   serLayout->addWidget(_serialDataBitsComboBox,                   3,1);
-  serLayout->addWidget(new QLabel("               Stop bits  "),  3,2, Qt::AlignRight);
-  serLayout->addWidget(_serialStopBitsComboBox,                   3,3);
+  serLayout->addWidget(new QLabel("               Parity  "),     3,2, Qt::AlignRight);
+  serLayout->addWidget(_serialParityComboBox,                     3,3);
+  serLayout->addWidget(new QLabel("               Stop bits  "),  3,4, Qt::AlignRight);
+  serLayout->addWidget(_serialStopBitsComboBox,                   3,5);
   serLayout->addWidget(new QLabel("NMEA"),                        4,0);
   serLayout->addWidget(_serialAutoNMEAComboBox,                   4,1);
@@ -632 +642 @@
     _serialDataBitsComboBox->setStyleSheet("background-color: lightGray");
     _serialStopBitsComboBox->setStyleSheet("background-color: lightGray");
+    _serialFlowControlComboBox->setStyleSheet("background-color: lightGray");
     _serialAutoNMEAComboBox->setStyleSheet("background-color: lightGray");
     _serialFileNMEALineEdit->setStyleSheet("background-color: lightGray");
@@ -640 +651 @@
     _serialDataBitsComboBox->setEnabled(false);
     _serialStopBitsComboBox->setEnabled(false);
+    _serialFlowControlComboBox->setEnabled(false);
     _serialAutoNMEAComboBox->setEnabled(false);
     _serialFileNMEALineEdit->setEnabled(false);
@@ -953 +965 @@
   settings.setValue("serialPortName",  _serialPortNameLineEdit->text());
   settings.setValue("serialStopBits",  _serialStopBitsComboBox->currentText());
+  settings.setValue("serialFlowControl",_serialFlowControlComboBox->currentText());
   settings.setValue("startTab",    aogroup->currentIndex());
   settings.setValue("waitTime",    _waitTimeSpinBox->value());
@@ -1353 +1366 @@
       _serialDataBitsComboBox->setStyleSheet("background-color: white");
       _serialStopBitsComboBox->setStyleSheet("background-color: white");
+      _serialFlowControlComboBox->setStyleSheet("background-color: white");
       _serialAutoNMEAComboBox->setStyleSheet("background-color: white");
       _serialPortNameLineEdit->setEnabled(true);
@@ -1359 +1373 @@
       _serialDataBitsComboBox->setEnabled(true);
       _serialStopBitsComboBox->setEnabled(true);
+      _serialFlowControlComboBox->setEnabled(true);
       _serialAutoNMEAComboBox->setEnabled(true);
       if (_serialAutoNMEAComboBox->currentText() != "Auto" ) {
@@ -1377 +1392 @@
       _serialDataBitsComboBox->setStyleSheet("background-color: lightGray");
       _serialStopBitsComboBox->setStyleSheet("background-color: lightGray");
+      _serialFlowControlComboBox->setStyleSheet("background-color: lightGray");
       _serialAutoNMEAComboBox->setStyleSheet("background-color: lightGray");
       _serialFileNMEALineEdit->setStyleSheet("background-color: lightGray");
@@ -1385 +1401 @@
       _serialDataBitsComboBox->setEnabled(false);
       _serialStopBitsComboBox->setEnabled(false);
+      _serialFlowControlComboBox->setEnabled(false);
       _serialAutoNMEAComboBox->setEnabled(false);
       _serialHeightNMEALineEdit->setEnabled(false);

trunk/BNC/bncwindow.h ¶

@@ -138 +138 @@
     QComboBox* _serialDataBitsComboBox;
     QComboBox* _serialStopBitsComboBox;
+    QComboBox* _serialFlowControlComboBox;
     QLineEdit* _serialHeightNMEALineEdit;
     QLineEdit* _serialFileNMEALineEdit;