Changeset 7230 in ntrip for trunk/BNC/src/bncserialport.cpp

Timestamp:

Aug 18, 2015, 12:50:22 PM (9 years ago)

Author:

stuerze

Message:

country code is considerred during mountpoint setup from tcp port, udp port and serial port

File:

• trunk/BNC/src/bncserialport.cpp (modified) (6 diffs)

trunk/BNC/src/bncserialport.cpp

@@ -65 +65 @@
   _serialLatLineEdit = new QLineEdit();
   _serialLonLineEdit = new QLineEdit();
+  _serialCountryLineEdit = new QLineEdit();
 
   _serialBaudRateComboBox->addItems(QString("110,300,600,"
@@ -84 +85 @@
   _serialParityComboBox->setMaximumWidth(9*ww);
   _serialStopBitsComboBox->setMaximumWidth(5*ww);
-  _serialLatLineEdit->setMaximumWidth(9*ww);
+  _serialLatLineEdit->setMaximumWidth(11*ww);
   _serialLonLineEdit->setMaximumWidth(9*ww);
   _serialFormatLineEdit->setMaximumWidth(9*ww);
+  _serialCountryLineEdit->setMaximumWidth(11*ww);
 
   // WhatsThis
@@ -100 +102 @@
   _serialLatLineEdit->setWhatsThis(tr("<p>Enter the approximate latitude of the stream providing receiver in degrees.<p></p>Example: 45.32</p>"));
   _serialLonLineEdit->setWhatsThis(tr("<p>Enter the approximate latitude of the stream providing receiver in degrees.<p></p>Example: 45.32</p>"));
+  _serialCountryLineEdit->setWhatsThis(tr("<p>Specify the country code.</p><p>Recommended is the ISO 3166-1 alpha-3a code.<br>Example: DEU</p>"));
 
   editLayout->addWidget(new QLabel(tr("Mountpoint")),  0, 0, Qt::AlignRight);
@@ -109 +112 @@
   editLayout->addWidget(new QLabel(tr("Longitude")),   1, 2, Qt::AlignRight);
   editLayout->addWidget(_serialLonLineEdit,            1, 3);
-  editLayout->addWidget(new QLabel(tr("Port name")),   2, 0, Qt::AlignRight);
-  editLayout->addWidget(_serialPortLineEdit,           2, 1);
-  editLayout->addWidget(new QLabel(tr("Baud rate")),   2, 2, Qt::AlignRight);
-  editLayout->addWidget(_serialBaudRateComboBox,       2, 3);
-  editLayout->addWidget(new QLabel(tr("Data bits")),   3, 0, Qt::AlignRight);
-  editLayout->addWidget(_serialDataBitsComboBox,       3, 1);
-  editLayout->addWidget(new QLabel(tr("Parity")),      3, 2, Qt::AlignRight);
-  editLayout->addWidget(_serialParityComboBox,         3, 3);
-  editLayout->addWidget(new QLabel(tr("Stop bits")),   4, 0, Qt::AlignRight);
-  editLayout->addWidget(_serialStopBitsComboBox,       4, 1);
-  editLayout->addWidget(new QLabel(tr("Flow control")),4, 2, Qt::AlignRight);
-  editLayout->addWidget(_serialFlowControlComboBox,    4, 3);
+  editLayout->addWidget(new QLabel(tr("Country")),     2, 0, Qt::AlignRight);
+  editLayout->addWidget(_serialCountryLineEdit,        2, 1);
+  editLayout->addWidget(new QLabel(tr("Port name")),   3, 0, Qt::AlignRight);
+  editLayout->addWidget(_serialPortLineEdit,           3, 1);
+  editLayout->addWidget(new QLabel(tr("Baud rate")),   3, 2, Qt::AlignRight);
+  editLayout->addWidget(_serialBaudRateComboBox,       3, 3);
+  editLayout->addWidget(new QLabel(tr("Data bits")),   4, 0, Qt::AlignRight);
+  editLayout->addWidget(_serialDataBitsComboBox,       4, 1);
+  editLayout->addWidget(new QLabel(tr("Parity")),      4, 2, Qt::AlignRight);
+  editLayout->addWidget(_serialParityComboBox,         4, 3);
+  editLayout->addWidget(new QLabel(tr("Stop bits")),   5, 0, Qt::AlignRight);
+  editLayout->addWidget(_serialStopBitsComboBox,       5, 1);
+  editLayout->addWidget(new QLabel(tr("Flow control")),5, 2, Qt::AlignRight);
+  editLayout->addWidget(_serialFlowControlComboBox,    5, 3);
 
   mainLayout->addLayout(editLayout);
@@ -168 +173 @@
        !_serialPortLineEdit->text().isEmpty() &&
        !_serialFormatLineEdit->text().isEmpty() &&
+       !_serialCountryLineEdit->text().isEmpty() &&
        !_serialLatLineEdit->text().isEmpty() &&
        !_serialLonLineEdit->text().isEmpty() ) {
@@ -179 +185 @@
       + _serialMountpointLineEdit->text() + " "
       + _serialFormatLineEdit->text() + " "
+      + _serialCountryLineEdit->text() + " "
       + _serialLatLineEdit->text() + " "
       + _serialLonLineEdit->text() + " "