Index: trunk/BNC/bnc.pro =================================================================== --- trunk/BNC/bnc.pro (revision 1736) +++ trunk/BNC/bnc.pro (revision 1737) @@ -32,4 +32,5 @@ bncnetqueryrtp.h bncsettings.h latencychecker.h \ bncipport.h bncnetqueryv0.h bncnetqueryudp.h \ + bncserialport.h \ RTCM/GPSDecoder.h RTCM/RTCM2.h RTCM/RTCM2Decoder.h \ RTCM/RTCM2_2021.h RTCM/rtcm_utils.h \ @@ -52,4 +53,5 @@ bncnetqueryrtp.cpp bncsettings.cpp latencychecker.cpp \ bncipport.cpp bncnetqueryv0.cpp bncnetqueryudp.cpp \ + bncserialport.cpp \ RTCM/RTCM2.cpp RTCM/RTCM2Decoder.cpp \ RTCM/RTCM2_2021.cpp RTCM/rtcm_utils.cpp \ Index: trunk/BNC/bncserialport.cpp =================================================================== --- trunk/BNC/bncserialport.cpp (revision 1737) +++ trunk/BNC/bncserialport.cpp (revision 1737) @@ -0,0 +1,198 @@ +// Part of BNC, a utility for retrieving decoding and +// converting GNSS data streams from NTRIP broadcasters. +// +// Copyright (C) 2009 +// German Federal Agency for Cartography and Geodesy (BKG) +// http://www.bkg.bund.de +// Czech Technical University Prague, Department of Geodesy +// http://www.fsv.cvut.cz +// +// Email: euref-ip@bkg.bund.de +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation, version 2. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +/* ------------------------------------------------------------------------- + * BKG NTRIP Client + * ------------------------------------------------------------------------- + * + * Class: bncSerialPort + * + * Purpose: Select serial port for stream retrieval + * + * Author: G. Weber + * + * Created: 18-Feb-2009 + * + * Changes: + * + * -----------------------------------------------------------------------*/ + +#include + +#include "bncserialport.h" + +using namespace std; + +// Constructor +//////////////////////////////////////////////////////////////////////////// +bncSerialPort::bncSerialPort(QWidget* parent) : QDialog(parent) { + + setMinimumSize(400,150); + QVBoxLayout* mainLayout = new QVBoxLayout(this); + QGridLayout* editLayout = new QGridLayout; + + setWindowTitle(tr("Add Stream from Serial Port")); + + _serialMountpointLineEdit = new QLineEdit(); + _serialPortLineEdit = new QLineEdit(); + _serialFormatLineEdit = new QLineEdit(); + _serialBaudRateComboBox = new QComboBox(); + _serialFlowControlComboBox = new QComboBox(); + _serialDataBitsComboBox = new QComboBox(); + _serialParityComboBox = new QComboBox(); + _serialStopBitsComboBox = new QComboBox(); + _serialLatLineEdit = new QLineEdit(); + _serialLonLineEdit = new QLineEdit(); + + _serialBaudRateComboBox->addItems(QString("110,300,600," + "1200,2400,4800,9600,19200,38400,57600,115200").split(",")); + _serialFlowControlComboBox->addItems(QString("OFF,XONXOFF,HARDWARE").split(",")); + _serialDataBitsComboBox->addItems(QString("5,6,7,8").split(",")); + _serialParityComboBox->addItems(QString("NONE,ODD,EVEN,SPACE").split(",")); + _serialStopBitsComboBox->addItems(QString("1,2").split(",")); + + _serialBaudRateComboBox->setCurrentIndex(7); + _serialDataBitsComboBox->setCurrentIndex(3); + + int ww = QFontMetrics(font()).width('w'); + _serialMountpointLineEdit->setMaximumWidth(11*ww); + _serialPortLineEdit->setMaximumWidth(11*ww); + _serialBaudRateComboBox->setMaximumWidth(9*ww); + _serialFlowControlComboBox->setMaximumWidth(11*ww); + _serialDataBitsComboBox->setMaximumWidth(5*ww); + _serialParityComboBox->setMaximumWidth(9*ww); + _serialStopBitsComboBox->setMaximumWidth(5*ww); + _serialLatLineEdit->setMaximumWidth(9*ww); + _serialLonLineEdit->setMaximumWidth(9*ww); + _serialFormatLineEdit->setMaximumWidth(9*ww); + + // WhatsThis + // --------- + _serialMountpointLineEdit->setWhatsThis(tr("

BNC allows to retrieve streams via serial port without using the NTRIP transport protocol.

Specify a mountpoint. Recommended is a 4-character station ID.
Example: FFMJ

")); + _serialPortLineEdit->setWhatsThis(tr("

Enter the serial 'Port name' selected for communication with your serial connected device. Valid port names are

Windows:       COM1, COM2
Linux:         /dev/ttyS0, /dev/ttyS1
FreeBSD:       /dev/ttyd0, /dev/ttyd1
Digital Unix:  /dev/tty01, /dev/tty02
HP-UX:         /dev/tty1p0, /dev/tty2p0
SGI/IRIX:      /dev/ttyf1, /dev/ttyf2
SunOS/Solaris: /dev/ttya, /dev/ttyb

Note that you must plug a serial cable in the port defined here before you start BNC.

")); + _serialFormatLineEdit->setWhatsThis(tr("

Specify the stream format.

Available options are 'RTCM_2', 'RTCM_3', 'RTIGS', and 'ZERO'.

")); + _serialBaudRateComboBox->setWhatsThis(tr("

Select a 'Baud rate' for the serial link.

Note that your selection must equal the baud rate configured to the serial connected device. Note further that using a high baud rate is recommended.

")); + _serialFlowControlComboBox->setWhatsThis(tr("

Select a 'Flow control' for the seriallink.

Note that your selection must equal the flow control configured to the serial connected device. Select 'OFF' if you don't know better.

")); + _serialDataBitsComboBox->setWhatsThis(tr("

Select the number of 'Data bits' for the serial link.

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.

")); + _serialParityComboBox->setWhatsThis(tr("

Select the 'Parity' for the serial link.

Note that your selection must equal the parity selection configured to the serial connected device. Note further that parity is often set to 'NONE'.

")); + _serialStopBitsComboBox->setWhatsThis(tr("

Select the number of 'Stop bits' for the serial link.

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.

")); + _serialLatLineEdit->setWhatsThis(tr("

Enter the approximate latitude of the stream providing receiver in degrees.

Example: 45.32

")); + _serialLonLineEdit->setWhatsThis(tr("

Enter the approximate latitude of the stream providing receiver in degrees.

Example: 45.32

")); + + editLayout->addWidget(new QLabel(tr("Mountpoint")), 0, 0, Qt::AlignRight); + editLayout->addWidget(_serialMountpointLineEdit, 0, 1); + editLayout->addWidget(new QLabel(tr("Port")), 0, 2, Qt::AlignRight); + editLayout->addWidget(_serialPortLineEdit, 0, 3); + editLayout->addWidget(new QLabel(tr("Format")), 1, 0, Qt::AlignRight); + editLayout->addWidget(_serialFormatLineEdit, 1, 1); + editLayout->addWidget(new QLabel(tr("Baud rate")), 1, 2, Qt::AlignRight); + editLayout->addWidget(_serialBaudRateComboBox, 1, 3); + editLayout->addWidget(new QLabel(tr("Flow control")),2, 0, Qt::AlignRight); + editLayout->addWidget(_serialFlowControlComboBox, 2, 1); + editLayout->addWidget(new QLabel(tr("Data bits")), 2, 2, Qt::AlignRight); + editLayout->addWidget(_serialDataBitsComboBox, 2, 3); + editLayout->addWidget(new QLabel(tr("Parity")), 3, 0, Qt::AlignRight); + editLayout->addWidget(_serialParityComboBox, 3, 1); + editLayout->addWidget(new QLabel(tr("Stop bits")), 3, 2, Qt::AlignRight); + editLayout->addWidget(_serialStopBitsComboBox, 3, 3); + editLayout->addWidget(new QLabel(tr("Latitude")), 4, 0, Qt::AlignRight); + editLayout->addWidget(_serialLatLineEdit, 4, 1); + editLayout->addWidget(new QLabel(tr("Longitude")), 4, 2, Qt::AlignRight); + editLayout->addWidget(_serialLonLineEdit, 4, 3); + + mainLayout->addLayout(editLayout); + + _buttonWhatsThis = new QPushButton(tr("Help=Shift+F1"), this); + connect(_buttonWhatsThis, SIGNAL(clicked()), this, SLOT(slotWhatsThis())); + + _buttonCancel = new QPushButton(tr("Cancel"), this); + connect(_buttonCancel, SIGNAL(clicked()), this, SLOT(reject())); + + _buttonOK = new QPushButton(tr("OK"), this); + connect(_buttonOK, SIGNAL(clicked()), this, SLOT(accept())); + + _buttonOK->setDefault(true); + + QHBoxLayout* buttonLayout = new QHBoxLayout; + + buttonLayout->addWidget(_buttonWhatsThis); + buttonLayout->addStretch(1); + buttonLayout->addWidget(_buttonCancel); + buttonLayout->addWidget(_buttonOK); + + mainLayout->addLayout(buttonLayout); +} + +// Destructor +//////////////////////////////////////////////////////////////////////////// +bncSerialPort::~bncSerialPort() { + delete _buttonCancel; + delete _buttonOK; + delete _buttonWhatsThis; +} + +// Accept slot +//////////////////////////////////////////////////////////////////////////// +void bncSerialPort::accept() { + + QStringList* mountPoints = new QStringList; + + QString _serialBaudRate = _serialBaudRateComboBox->currentText(); + QString _serialFlowControl = _serialFlowControlComboBox->currentText(); + QString _serialDataBits = _serialDataBitsComboBox->currentText(); + QString _serialParity = _serialParityComboBox->currentText(); + QString _serialStopBits = _serialStopBitsComboBox->currentText(); + + if ( !_serialMountpointLineEdit->text().isEmpty() && + !_serialPortLineEdit->text().isEmpty() && + !_serialFormatLineEdit->text().isEmpty() && + !_serialLatLineEdit->text().isEmpty() && + !_serialLonLineEdit->text().isEmpty() ) { + mountPoints->push_back("//" + _serialDataBits + "-" + + _serialParity + "-" + + _serialStopBits + "-" + + _serialFlowControl + "-" + + _serialPortLineEdit->text().replace("/","-").replace(QRegExp("^[-]"), "") + ":" + + _serialBaudRate + "/" + + _serialMountpointLineEdit->text() + " " + + _serialFormatLineEdit->text() + " " + + _serialLatLineEdit->text() + " " + + _serialLonLineEdit->text() + " " + + "no S"); + } else { + QMessageBox::warning(this, tr("Warning"), + tr("Incomplete settings"), + QMessageBox::Ok); + } + + emit newMountPoints(mountPoints); + + QDialog::accept(); +} + +// Whats This Help +void bncSerialPort::slotWhatsThis() { +QWhatsThis::enterWhatsThisMode(); +} + Index: trunk/BNC/bncserialport.h =================================================================== --- trunk/BNC/bncserialport.h (revision 1737) +++ trunk/BNC/bncserialport.h (revision 1737) @@ -0,0 +1,65 @@ +// Part of BNC, a utility for retrieving decoding and +// converting GNSS data streams from NTRIP broadcasters. +// +// Copyright (C) 2009 +// German Federal Agency for Cartography and Geodesy (BKG) +// http://www.bkg.bund.de +// Czech Technical University Prague, Department of Geodesy +// http://www.fsv.cvut.cz +// +// Email: euref-ip@bkg.bund.de +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation, version 2. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +#ifndef BNCSERIALPORT_H +#define BNCSERIALPORT_H + +#include +#include +#include + +class bncSerialPort : public QDialog { + Q_OBJECT + + public: + bncSerialPort(QWidget* parent); + ~bncSerialPort(); + QString* _serialPort1; + + signals: + void newMountPoints(QStringList* mountPoints); + + private slots: + virtual void accept(); + void slotWhatsThis(); + + private: + QLineEdit* _serialMountpointLineEdit; + QLineEdit* _serialPortLineEdit; + QLineEdit* _serialFormatLineEdit; + QLineEdit* _serialLatLineEdit; + QLineEdit* _serialLonLineEdit; + QComboBox* _serialBaudRateComboBox; + QComboBox* _serialFlowControlComboBox; + QComboBox* _serialDataBitsComboBox; + QComboBox* _serialParityComboBox; + QComboBox* _serialStopBitsComboBox; + + QPushButton* _buttonGet; + QPushButton* _buttonCancel; + QPushButton* _buttonOK; + QPushButton* _buttonWhatsThis; +}; + +#endif Index: trunk/BNC/bncwindow.cpp =================================================================== --- trunk/BNC/bncwindow.cpp (revision 1736) +++ trunk/BNC/bncwindow.cpp (revision 1737) @@ -47,4 +47,5 @@ #include "bnctabledlg.h" #include "bncipport.h" +#include "bncserialport.h" #include "bnchlpdlg.h" #include "bnchtml.h" @@ -62,5 +63,5 @@ int ww = QFontMetrics(this->font()).width('w'); - static const QStringList labels = QString("account, Streams: broadcaster:port/mountpoint,decoder,lat,long,nmea,ntrip,bytes").split(","); + static const QStringList labels = QString("account, Streams: resource loader / mountpoint,decoder,lat,long,nmea,ntrip,bytes").split(","); setMinimumSize(85*ww, 65*ww); @@ -825,4 +826,5 @@ QPushButton *buttonNtrip = msgBox.addButton(tr("Caster"), QMessageBox::ActionRole); QPushButton *buttonIP = msgBox.addButton(tr("TCP/IP port"), QMessageBox::ActionRole); + QPushButton *buttonSerial = msgBox.addButton(tr("Serial port"), QMessageBox::ActionRole); QPushButton *buttonCancel = msgBox.addButton(tr("Cancel"), QMessageBox::ActionRole); @@ -830,16 +832,22 @@ if (msgBox.clickedButton() == buttonNtrip) { - bncTableDlg* dlg = new bncTableDlg(this); + bncTableDlg* dlg = new bncTableDlg(this); dlg->move(this->pos().x()+50, this->pos().y()+50); - connect(dlg, SIGNAL(newMountPoints(QStringList*)), + connect(dlg, SIGNAL(newMountPoints(QStringList*)), this, SLOT(slotNewMountPoints(QStringList*))); dlg->exec(); delete dlg; } else if (msgBox.clickedButton() == buttonIP) { - bncIpPort* ipp = new bncIpPort(this); - connect(ipp, SIGNAL(newMountPoints(QStringList*)), + bncIpPort* ipp = new bncIpPort(this); + connect(ipp, SIGNAL(newMountPoints(QStringList*)), this, SLOT(slotNewMountPoints(QStringList*))); ipp->exec(); delete ipp; + } else if (msgBox.clickedButton() == buttonSerial) { + bncSerialPort* sep = new bncSerialPort(this); + connect(sep, SIGNAL(newMountPoints(QStringList*)), + this, SLOT(slotNewMountPoints(QStringList*))); + sep->exec(); + delete sep; } else if (msgBox.clickedButton() == buttonCancel) { // Cancel