Changeset 1636 in ntrip


Ignore:
Timestamp:
Feb 22, 2009, 12:30:43 AM (15 years ago)
Author:
weber
Message:

* empty log message *

Location:
trunk/BNC
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/BNC/bncgetthread.cpp

    r1634 r1636  
    266266    }
    267267    _serialPort->setTimeout(0,100);
    268     _serialPort->setFlowControl(FLOW_OFF);
     268    hlp = settings.value("serialFlowControl").toString();
     269    if      (hlp == "OFF") {
     270      _serialPort->setFlowControl(FLOW_OFF);   
     271    }
     272    else if (hlp == "XONXOFF") {
     273      _serialPort->setFlowControl(FLOW_XONXOFF);   
     274    }
     275else if (hlp == "HARDWARE") {
     276      _serialPort->setFlowControl(FLOW_HARDWARE);   
     277    }
    269278  }
    270279  else {

  • trunk/BNC/bncsettings.cpp

    r1601 r1636  
    7272    setValue("serialPortName",   "");
    7373    setValue("serialStopBits",   "1");
     74    setValue("serialFlowControl","OFF");
    7475    setValue("startTab",         "0");
    7576    setValue("waitTime",         "5");

  • trunk/BNC/bncwindow.cpp

    r1630 r1636  
    267267  if (kk != -1) {
    268268    _serialStopBitsComboBox->setCurrentIndex(kk);
     269  }
     270  _serialFlowControlComboBox = new QComboBox();
     271  _serialFlowControlComboBox->setMaximumWidth(11*ww);
     272  _serialFlowControlComboBox->addItems(QString("OFF,XONXOFF,HARDWARE").split(","));
     273  kk = _serialFlowControlComboBox->findText(settings.value("serialFlowControl").toString());
     274  if (kk != -1) {
     275    _serialFlowControlComboBox->setCurrentIndex(kk);
    269276  }
    270277  _serialAutoNMEAComboBox  = new QComboBox();
    … …  
    351358  _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>"));
    352359  _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>"));
     360  _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>"));
    353361  _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>"));
    354362  _serialFileNMEALineEdit->setWhatsThis(tr("<p>Specify the full path to a file where NMEA messages coming from your serial connected device are saved.</p>"));
    … …  
    608616  serLayout->addWidget(new QLabel("Baud rate"),                   2,0, Qt::AlignLeft);
    609617  serLayout->addWidget(_serialBaudRateComboBox,                   2,1);
    610   serLayout->addWidget(new QLabel("               Parity  "),    2,2, Qt::AlignRight);
    611   serLayout->addWidget(_serialParityComboBox,                     2,3);
     618  serLayout->addWidget(new QLabel("               Flow control"), 2,2, Qt::AlignRight);
     619  serLayout->addWidget(_serialFlowControlComboBox,                2,3);
    612620  serLayout->addWidget(new QLabel("Data bits"),                   3,0, Qt::AlignLeft);
    613621  serLayout->addWidget(_serialDataBitsComboBox,                   3,1);
    614   serLayout->addWidget(new QLabel("               Stop bits  "),  3,2, Qt::AlignRight);
    615   serLayout->addWidget(_serialStopBitsComboBox,                   3,3);
     622  serLayout->addWidget(new QLabel("               Parity  "),     3,2, Qt::AlignRight);
     623  serLayout->addWidget(_serialParityComboBox,                     3,3);
     624  serLayout->addWidget(new QLabel("               Stop bits  "),  3,4, Qt::AlignRight);
     625  serLayout->addWidget(_serialStopBitsComboBox,                   3,5);
    616626  serLayout->addWidget(new QLabel("NMEA"),                        4,0);
    617627  serLayout->addWidget(_serialAutoNMEAComboBox,                   4,1);
    … …  
    632642    _serialDataBitsComboBox->setStyleSheet("background-color: lightGray");
    633643    _serialStopBitsComboBox->setStyleSheet("background-color: lightGray");
     644    _serialFlowControlComboBox->setStyleSheet("background-color: lightGray");
    634645    _serialAutoNMEAComboBox->setStyleSheet("background-color: lightGray");
    635646    _serialFileNMEALineEdit->setStyleSheet("background-color: lightGray");
    … …  
    640651    _serialDataBitsComboBox->setEnabled(false);
    641652    _serialStopBitsComboBox->setEnabled(false);
     653    _serialFlowControlComboBox->setEnabled(false);
    642654    _serialAutoNMEAComboBox->setEnabled(false);
    643655    _serialFileNMEALineEdit->setEnabled(false);
    … …  
    953965  settings.setValue("serialPortName",  _serialPortNameLineEdit->text());
    954966  settings.setValue("serialStopBits",  _serialStopBitsComboBox->currentText());
     967  settings.setValue("serialFlowControl",_serialFlowControlComboBox->currentText());
    955968  settings.setValue("startTab",    aogroup->currentIndex());
    956969  settings.setValue("waitTime",    _waitTimeSpinBox->value());
    … …  
    13531366      _serialDataBitsComboBox->setStyleSheet("background-color: white");
    13541367      _serialStopBitsComboBox->setStyleSheet("background-color: white");
     1368      _serialFlowControlComboBox->setStyleSheet("background-color: white");
    13551369      _serialAutoNMEAComboBox->setStyleSheet("background-color: white");
    13561370      _serialPortNameLineEdit->setEnabled(true);
    … …  
    13591373      _serialDataBitsComboBox->setEnabled(true);
    13601374      _serialStopBitsComboBox->setEnabled(true);
     1375      _serialFlowControlComboBox->setEnabled(true);
    13611376      _serialAutoNMEAComboBox->setEnabled(true);
    13621377      if (_serialAutoNMEAComboBox->currentText() != "Auto" ) {
    … …  
    13771392      _serialDataBitsComboBox->setStyleSheet("background-color: lightGray");
    13781393      _serialStopBitsComboBox->setStyleSheet("background-color: lightGray");
     1394      _serialFlowControlComboBox->setStyleSheet("background-color: lightGray");
    13791395      _serialAutoNMEAComboBox->setStyleSheet("background-color: lightGray");
    13801396      _serialFileNMEALineEdit->setStyleSheet("background-color: lightGray");
    … …  
    13851401      _serialDataBitsComboBox->setEnabled(false);
    13861402      _serialStopBitsComboBox->setEnabled(false);
     1403      _serialFlowControlComboBox->setEnabled(false);
    13871404      _serialAutoNMEAComboBox->setEnabled(false);
    13881405      _serialHeightNMEALineEdit->setEnabled(false);

  • trunk/BNC/bncwindow.h

    r1601 r1636  
    138138    QComboBox* _serialDataBitsComboBox;
    139139    QComboBox* _serialStopBitsComboBox;
     140    QComboBox* _serialFlowControlComboBox;
    140141    QLineEdit* _serialHeightNMEALineEdit;
    141142    QLineEdit* _serialFileNMEALineEdit;
Note: See TracChangeset for help on using the changeset viewer.