Changeset 7230 in ntrip


Ignore:
Timestamp:
Aug 18, 2015, 12:50:22 PM (7 years ago)
Author:
stuerze
Message:

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

Location:
trunk/BNC/src
Files:
6 edited

Legend:

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

    r7220 r7230  
    6161  _ipLatLineEdit = new QLineEdit();
    6262  _ipLonLineEdit = new QLineEdit();
     63  _ipCountryLineEdit = new QLineEdit();
    6364
    6465  int ww = QFontMetrics(font()).width('w');
     
    6869  _ipLatLineEdit->setMaximumWidth(9*ww);
    6970  _ipLonLineEdit->setMaximumWidth(9*ww);
     71  _ipCountryLineEdit->setMaximumWidth(9*ww);
    7072
    7173  // WhatsThis
     
    7779  _ipLatLineEdit->setWhatsThis(tr("<p>Enter the approximate latitude of the stream providing receiver in degrees.<p></p>Example: 45.32</p>"));
    7880  _ipLonLineEdit->setWhatsThis(tr("<p>Enter the approximate longitude of the stream providing receiver in degrees.<p></p>Example: -15.20</p>"));
     81  _ipCountryLineEdit->setWhatsThis(tr("<p>Specify the country code.</p><p>Recommended is the ISO 3166-1 alpha-3a code.<br>Example: DEU</p>"));
    7982
    8083  editLayout->addWidget(new QLabel(tr("Host")),      0, 0, Qt::AlignRight);
     
    9093  editLayout->addWidget(new QLabel(tr("Longitude")), 2, 2, Qt::AlignRight);
    9194  editLayout->addWidget(_ipLonLineEdit,              2, 3);
     95  editLayout->addWidget(new QLabel(tr("Country")),   3, 0, Qt::AlignRight);
     96  editLayout->addWidget(_ipCountryLineEdit,          3, 1);
    9297
    9398  mainLayout->addLayout(editLayout);
     
    132137       !_ipMountLineEdit->text().isEmpty()  &&
    133138       !_ipFormatLineEdit->text().isEmpty() &&
     139       !_ipCountryLineEdit->text().isEmpty() &&
    134140       !_ipLatLineEdit->text().isEmpty()    &&
    135141       !_ipLonLineEdit->text().isEmpty() ) {
     
    139145                                + _ipMountLineEdit->text() + " "
    140146                                + _ipFormatLineEdit->text() + " "
     147                                + _ipCountryLineEdit->text() + " "
    141148                                + _ipLatLineEdit->text() + " "
    142149                                + _ipLonLineEdit->text() + " "
  • trunk/BNC/src/bncipport.h

    r4278 r7230  
    5151    QLineEdit*   _ipLatLineEdit;
    5252    QLineEdit*   _ipLonLineEdit;
     53    QLineEdit*   _ipCountryLineEdit;
    5354
    5455    QPushButton* _buttonGet;
  • trunk/BNC/src/bncserialport.cpp

    r7221 r7230  
    6565  _serialLatLineEdit = new QLineEdit();
    6666  _serialLonLineEdit = new QLineEdit();
     67  _serialCountryLineEdit = new QLineEdit();
    6768
    6869  _serialBaudRateComboBox->addItems(QString("110,300,600,"
     
    8485  _serialParityComboBox->setMaximumWidth(9*ww);
    8586  _serialStopBitsComboBox->setMaximumWidth(5*ww);
    86   _serialLatLineEdit->setMaximumWidth(9*ww);
     87  _serialLatLineEdit->setMaximumWidth(11*ww);
    8788  _serialLonLineEdit->setMaximumWidth(9*ww);
    8889  _serialFormatLineEdit->setMaximumWidth(9*ww);
     90  _serialCountryLineEdit->setMaximumWidth(11*ww);
    8991
    9092  // WhatsThis
     
    100102  _serialLatLineEdit->setWhatsThis(tr("<p>Enter the approximate latitude of the stream providing receiver in degrees.<p></p>Example: 45.32</p>"));
    101103  _serialLonLineEdit->setWhatsThis(tr("<p>Enter the approximate latitude of the stream providing receiver in degrees.<p></p>Example: 45.32</p>"));
     104  _serialCountryLineEdit->setWhatsThis(tr("<p>Specify the country code.</p><p>Recommended is the ISO 3166-1 alpha-3a code.<br>Example: DEU</p>"));
    102105
    103106  editLayout->addWidget(new QLabel(tr("Mountpoint")),  0, 0, Qt::AlignRight);
     
    109112  editLayout->addWidget(new QLabel(tr("Longitude")),   1, 2, Qt::AlignRight);
    110113  editLayout->addWidget(_serialLonLineEdit,            1, 3);
    111   editLayout->addWidget(new QLabel(tr("Port name")),   2, 0, Qt::AlignRight);
    112   editLayout->addWidget(_serialPortLineEdit,           2, 1);
    113   editLayout->addWidget(new QLabel(tr("Baud rate")),   2, 2, Qt::AlignRight);
    114   editLayout->addWidget(_serialBaudRateComboBox,       2, 3);
    115   editLayout->addWidget(new QLabel(tr("Data bits")),   3, 0, Qt::AlignRight);
    116   editLayout->addWidget(_serialDataBitsComboBox,       3, 1);
    117   editLayout->addWidget(new QLabel(tr("Parity")),      3, 2, Qt::AlignRight);
    118   editLayout->addWidget(_serialParityComboBox,         3, 3);
    119   editLayout->addWidget(new QLabel(tr("Stop bits")),   4, 0, Qt::AlignRight);
    120   editLayout->addWidget(_serialStopBitsComboBox,       4, 1);
    121   editLayout->addWidget(new QLabel(tr("Flow control")),4, 2, Qt::AlignRight);
    122   editLayout->addWidget(_serialFlowControlComboBox,    4, 3);
     114  editLayout->addWidget(new QLabel(tr("Country")),     2, 0, Qt::AlignRight);
     115  editLayout->addWidget(_serialCountryLineEdit,        2, 1);
     116  editLayout->addWidget(new QLabel(tr("Port name")),   3, 0, Qt::AlignRight);
     117  editLayout->addWidget(_serialPortLineEdit,           3, 1);
     118  editLayout->addWidget(new QLabel(tr("Baud rate")),   3, 2, Qt::AlignRight);
     119  editLayout->addWidget(_serialBaudRateComboBox,       3, 3);
     120  editLayout->addWidget(new QLabel(tr("Data bits")),   4, 0, Qt::AlignRight);
     121  editLayout->addWidget(_serialDataBitsComboBox,       4, 1);
     122  editLayout->addWidget(new QLabel(tr("Parity")),      4, 2, Qt::AlignRight);
     123  editLayout->addWidget(_serialParityComboBox,         4, 3);
     124  editLayout->addWidget(new QLabel(tr("Stop bits")),   5, 0, Qt::AlignRight);
     125  editLayout->addWidget(_serialStopBitsComboBox,       5, 1);
     126  editLayout->addWidget(new QLabel(tr("Flow control")),5, 2, Qt::AlignRight);
     127  editLayout->addWidget(_serialFlowControlComboBox,    5, 3);
    123128
    124129  mainLayout->addLayout(editLayout);
     
    168173       !_serialPortLineEdit->text().isEmpty() &&
    169174       !_serialFormatLineEdit->text().isEmpty() &&
     175       !_serialCountryLineEdit->text().isEmpty() &&
    170176       !_serialLatLineEdit->text().isEmpty() &&
    171177       !_serialLonLineEdit->text().isEmpty() ) {
     
    179185      + _serialMountpointLineEdit->text() + " "
    180186      + _serialFormatLineEdit->text() + " "
     187      + _serialCountryLineEdit->text() + " "
    181188      + _serialLatLineEdit->text() + " "
    182189      + _serialLonLineEdit->text() + " "
  • trunk/BNC/src/bncserialport.h

    r4278 r7230  
    5151    QLineEdit*   _serialLatLineEdit;
    5252    QLineEdit*   _serialLonLineEdit;
     53    QLineEdit*   _serialCountryLineEdit;
    5354    QComboBox*   _serialBaudRateComboBox;
    5455    QComboBox*   _serialFlowControlComboBox;
  • trunk/BNC/src/bncudpport.cpp

    r7223 r7230  
    6060  _ipLatLineEdit = new QLineEdit();
    6161  _ipLonLineEdit = new QLineEdit();
     62  _ipCountryLineEdit = new QLineEdit();
    6263
    6364  int ww = QFontMetrics(font()).width('w');
     
    6768  _ipLatLineEdit->setMaximumWidth(9*ww);
    6869  _ipLonLineEdit->setMaximumWidth(9*ww);
     70  _ipCountryLineEdit->setMaximumWidth(9*ww);
    6971
    7072  // WhatsThis
     
    7577  _ipLatLineEdit->setWhatsThis(tr("<p>Enter the approximate latitude of the stream providing receiver in degrees.<p></p>Example: 45.32</p>"));
    7678  _ipLonLineEdit->setWhatsThis(tr("<p>Enter the approximate longitude of the stream providing receiver in degrees.<p></p>Example: -15.20</p>"));
     79  _ipCountryLineEdit->setWhatsThis(tr("<p>Specify the country code.</p><p>Recommended is the ISO 3166-1 alpha-3a code.<br>Example: DEU</p>"));
    7780
    7881  editLayout->addWidget(new QLabel(tr("UDP Port")),  0, 0, Qt::AlignRight);
     
    8689  editLayout->addWidget(new QLabel(tr("Longitude")), 2, 2, Qt::AlignRight);
    8790  editLayout->addWidget(_ipLonLineEdit,              2, 3);
     91  editLayout->addWidget(new QLabel(tr("Country")),   3, 0, Qt::AlignRight);
     92  editLayout->addWidget(_ipCountryLineEdit,          3, 1);
    8893
    8994  mainLayout->addLayout(editLayout);
     
    127132       !_ipMountLineEdit->text().isEmpty()  &&
    128133       !_ipFormatLineEdit->text().isEmpty() &&
     134       !_ipCountryLineEdit->text().isEmpty() &&
    129135       !_ipLatLineEdit->text().isEmpty()    &&
    130136       !_ipLonLineEdit->text().isEmpty() ) {
     
    134140                                + _ipMountLineEdit->text() + " "
    135141                                + _ipFormatLineEdit->text() + " "
     142                                + _ipCountryLineEdit->text() + " "
    136143                                + _ipLatLineEdit->text() + " "
    137144                                + _ipLonLineEdit->text() + " "
  • trunk/BNC/src/bncudpport.h

    r4278 r7230  
    5151    QLineEdit*   _ipLatLineEdit;
    5252    QLineEdit*   _ipLonLineEdit;
     53    QLineEdit*   _ipCountryLineEdit;
    5354
    5455    QPushButton* _buttonGet;
Note: See TracChangeset for help on using the changeset viewer.