Index: trunk/BNC/src/bncmain.cpp
===================================================================
--- trunk/BNC/src/bncmain.cpp (revision 7888)
+++ trunk/BNC/src/bncmain.cpp (revision 7889)
@@ -275,9 +275,7 @@
"\n"
"Upload Ephemeris Panel keys:\n"
- " uploadEphHost {Broadcaster host, name or IP address [character string]}\n"
- " uploadEphPort {Broadcaster port [integer number]}\n"
- " uploadEphMountpoint {Mountpoint [character string]}\n"
- " uploadEphPassword {Stream upload password [character string]}\n"
- " uploadEphSample {Stream upload sampling rate [integer number of seconds: 5|10|15|20|25|30|35|40|45|50|55|60]}\n"
+ " uploadEphMountpointsOut {Upload corrections table [character string, semicolon separated list, each element in quotation marks, example:\n"
+ " \"www.igs-ip.net,2101,RTCM3EPH_GPS,pass,GPS\"]}\n"
+ " uploadSamplRtcmEph {Stream upload sampling rate [integer number of seconds: 0|5|10|15|20|25|30|35|40|45|50|55|60]}\n"
"\n"
"Add Stream keys:\n"
Index: trunk/BNC/src/bncsettings.cpp
===================================================================
--- trunk/BNC/src/bncsettings.cpp (revision 7888)
+++ trunk/BNC/src/bncsettings.cpp (revision 7889)
@@ -199,10 +199,6 @@
setValue_p("trafo_t0", "");
// Upload (eph)
- setValue_p("uploadEphHost", "");
- setValue_p("uploadEphPort", "");
- setValue_p("uploadAntexFile", "");
- setValue_p("uploadEphMountpoint", "");
- setValue_p("uploadEphPassword", "");
- setValue_p("uploadEphSample", "5");
+ setValue_p("uploadEphMountpointsOut","");
+ setValue_p("uploadSamplRtcmEph", "0");
}
#ifdef GNSSCENTER_PLUGIN
Index: trunk/BNC/src/bncwindow.cpp
===================================================================
--- trunk/BNC/src/bncwindow.cpp (revision 7888)
+++ trunk/BNC/src/bncwindow.cpp (revision 7889)
@@ -564,17 +564,42 @@
// Upload RTCM3 Ephemeris
// ----------------------
- _uploadEphHostLineEdit = new QLineEdit(settings.value("uploadEphHost").toString());
- _uploadEphPortLineEdit = new QLineEdit(settings.value("uploadEphPort").toString());
- _uploadEphPasswordLineEdit = new QLineEdit(settings.value("uploadEphPassword").toString());
- _uploadEphPasswordLineEdit->setEchoMode(QLineEdit::PasswordEchoOnEdit);
- _uploadEphMountpointLineEdit = new QLineEdit(settings.value("uploadEphMountpoint").toString());
- _uploadEphSampleSpinBox = new QSpinBox;
- _uploadEphSampleSpinBox->setMinimum(5);
- _uploadEphSampleSpinBox->setMaximum(60);
- _uploadEphSampleSpinBox->setSingleStep(5);
- _uploadEphSampleSpinBox->setMaximumWidth(9*ww);
- _uploadEphSampleSpinBox->setValue(settings.value("uploadEphSample").toInt());
- _uploadEphSampleSpinBox->setSuffix(" sec");
- _uploadEphBytesCounter = new bncBytesCounter;
+ _uploadEphTable = new QTableWidget(0,6);
+ _uploadEphTable->setColumnCount(6);
+ _uploadEphTable->setRowCount(0);
+ _uploadEphTable->setHorizontalHeaderLabels(QString("Host, Port, Mount, Password, System, bytes").split(","));
+ _uploadEphTable->setSelectionMode(QAbstractItemView::ExtendedSelection);
+ _uploadEphTable->setSelectionBehavior(QAbstractItemView::SelectRows);
+ _uploadEphTable->horizontalHeader()->resizeSection( 0,13*ww);
+ _uploadEphTable->horizontalHeader()->resizeSection( 1, 5*ww);
+ _uploadEphTable->horizontalHeader()->resizeSection( 2, 8*ww);
+ _uploadEphTable->horizontalHeader()->resizeSection( 3, 8*ww);
+ _uploadEphTable->horizontalHeader()->resizeSection( 4,10*ww);
+ _uploadEphTable->horizontalHeader()->resizeSection( 5,12*ww);
+ _uploadEphTable->horizontalHeader()->setResizeMode(QHeaderView::Interactive);
+ _uploadEphTable->horizontalHeader()->setDefaultAlignment(Qt::AlignLeft);
+
+ connect(_uploadEphTable, SIGNAL(itemSelectionChanged()),
+ SLOT(slotBncTextChanged()));
+
+ QPushButton* addUploadEphRowButton = new QPushButton("Add Row");
+ addUploadEphRowButton->setMaximumWidth(9*ww);
+ QPushButton* delUploadEphRowButton = new QPushButton("Del Row");
+ delUploadEphRowButton->setMaximumWidth(9*ww);
+
+ _uploadSamplRtcmEphSpinBox = new QSpinBox;
+ _uploadSamplRtcmEphSpinBox->setMinimum(0);
+ _uploadSamplRtcmEphSpinBox->setMaximum(60);
+ _uploadSamplRtcmEphSpinBox->setSingleStep(5);
+ _uploadSamplRtcmEphSpinBox->setMaximumWidth(9*ww);
+ _uploadSamplRtcmEphSpinBox->setValue(settings.value("uploadSamplRtcmEph").toInt());
+ _uploadSamplRtcmEphSpinBox->setSuffix(" sec");
+
+ iRowT = _uploadEphTable->rowCount();
+ if (iRowT > 0) {
+ enableWidget(true, _uploadSamplRtcmEphSpinBox);
+ }
+ else {
+ enableWidget(false, _uploadSamplRtcmEphSpinBox);
+ }
// Canvas with Editable Fields
@@ -1191,30 +1216,23 @@
// Upload Layout (Ephemeris)
// -------------------------
- QGridLayout* uploadLayoutEph = new QGridLayout;
-
- uploadLayoutEph->setColumnMinimumWidth(0, 9*ww);
- _uploadEphPortLineEdit->setMaximumWidth(9*ww);
- _uploadEphPasswordLineEdit->setMaximumWidth(9*ww);
- _uploadEphMountpointLineEdit->setMaximumWidth(12*ww);
-
- uploadLayoutEph->addWidget(new QLabel("Upload concatenated RTCMv3 Broadcast Ephemeris to caster.
"), 0, 0, 1, 50);
- uploadLayoutEph->addWidget(new QLabel("Host"), 1, 0);
- uploadLayoutEph->addWidget(_uploadEphHostLineEdit, 1, 1, 1, 3);
- uploadLayoutEph->addWidget(new QLabel(" Port"), 1, 4, Qt::AlignRight);
- uploadLayoutEph->addWidget(_uploadEphPortLineEdit, 1, 5, 1, 1);
- uploadLayoutEph->addWidget(new QLabel("Mountpoint "), 2, 0);
- uploadLayoutEph->addWidget(_uploadEphMountpointLineEdit, 2, 1);
- uploadLayoutEph->addWidget(new QLabel(" Password"), 2, 2, Qt::AlignRight);
- uploadLayoutEph->addWidget(_uploadEphPasswordLineEdit, 2, 3);
- uploadLayoutEph->addWidget(new QLabel("Sampling"), 3, 0);
- uploadLayoutEph->addWidget(_uploadEphSampleSpinBox, 3, 1);
- uploadLayoutEph->addWidget(new QLabel("Uploaded"), 4, 0);
- uploadLayoutEph->addWidget(_uploadEphBytesCounter, 4, 1);
- uploadLayoutEph->setRowStretch(5, 999);
+ QGridLayout* uploadHlpLayoutEph = new QGridLayout();
+
+ connect(addUploadEphRowButton, SIGNAL(clicked()), this, SLOT(slotAddUploadEphRow()));
+ connect(delUploadEphRowButton, SIGNAL(clicked()), this, SLOT(slotDelUploadEphRow()));
+
+ uploadHlpLayoutEph->addWidget(addUploadEphRowButton, 0, 0);
+ uploadHlpLayoutEph->addWidget(delUploadEphRowButton, 0, 1);
+ uploadHlpLayoutEph->addWidget(new QLabel(" Sampling"), 0, 2, Qt::AlignRight);
+ uploadHlpLayoutEph->addWidget(_uploadSamplRtcmEphSpinBox, 0, 3);
+
+ QBoxLayout* uploadLayoutEph = new QBoxLayout(QBoxLayout::TopToBottom);
+ populateUploadEphTable();
+
+ uploadLayoutEph->addWidget(new QLabel("Upload concatenated RTCMv3 Broadcast Ephemeris to caster.
"));
+ uploadLayoutEph->addWidget(_uploadEphTable);
+ uploadLayoutEph->addLayout(uploadHlpLayoutEph);
uploadEphgroup->setLayout(uploadLayoutEph);
- connect(_uploadEphHostLineEdit, SIGNAL(textChanged(const QString &)),
- this, SLOT(slotBncTextChanged()));
// Main Layout
@@ -1372,5 +1390,5 @@
_uploadTable->setWhatsThis(tr("BNC can upload clock and orbit corrections to Broadcast Ephemeris (Broadcast Corrections) in RTCM Version 3 SSR format. You may have a situation where clocks and orbits come from an external Real-time Network Engine (1) or a situation where clock and orbit corrections are combined within BNC (2).
(1) BNC identifies a stream as coming from a Real-time Network Engine if its format is specified as 'RTNET' and hence its decoder string in the 'Streams' canvas is 'RTNET'. It encodes and uploads that stream to the specified Ntrip Broadcaster Host and Port
(2) BNC understands that it is expected to encode and upload combined Broadcast Ephemeris Corrections if you specify correction streams in the 'Combine Corrections' table.
To fill the 'Upload Corrections' table, hit the 'Add Row' button, double click on the 'Host' field to enter the IP or URL of an Ntrip Broadcaster and hit Enter. Then double click on the 'Port', 'Mount' and 'Password' fields to enter the Ntrip Broadcaster IP port (default is 80), the mountpoint and the stream upload password. An empty 'Host' option field means that you don't want to upload corrections.
Select a target coordinate reference System (e.g. IGS08) for outgoing clock and orbit corrections.
By default orbit and clock corrections refer to Antenna Phase Center (APC). Tick 'CoM' to refer uploaded corrections to Center of Mass instead of APC.
Specify a path for saving generated Broadcast Corrections plus Broadcast Ephemeris as SP3 orbit files. If the specified directory does not exist, BNC will not create such files. The following is a path example for a Linux system: /home/user/BNC${GPSWD}.sp3
Note that '${GPSWD}' produces the GPS Week and Day number in the filename.
Specify a path for saving generated Broadcast Correction clocks plus Broadcast Ephemeris clocks as Clock RINEX files. If the specified directory does not exist, BNC will not create Clock RINEX files. The following is a path example for a Linux system: /home/user/BNC${GPSWD}.clk
Note that '${GPSWD}' produces the GPS Week and Day number in the filename.
Finally, specify a SSR Provider ID (issued by RTCM), SSR Solution ID, and SSR Issue of Data number.
In case the 'Combine Corrections' table contains only one Broadcast Correction stream, BNC will add that stream content to the Broadcast Ephemeris to save results in files specified via SP3 and/or Clock RINEX file path. You should then define only the SP3 and Clock RINEX file path and no further option in the 'Upload Corrections' table.
"));
addUploadRowButton->setWhatsThis(tr("Hit 'Add Row' button to add another line to the 'Upload Corrections' table.
"));
- delUploadRowButton->setWhatsThis(tr("Hit 'Del Row' button to delete the highlighted line(s) from the Upload Corrections' table.
"));
+ delUploadRowButton->setWhatsThis(tr("Hit 'Del Row' button to delete the highlighted line(s) from the 'Upload Corrections' table.
"));
_uploadIntrComboBox->setWhatsThis(tr("Select the length of the SP3 and Clock RINEX files.
"));
_uploadSamplRtcmEphCorrSpinBox->setWhatsThis(tr("Select a stream's orbit correction sampling interval in seconds.
A value of zero '0' tells BNC to upload all available orbit and clock correction samples together in combined messages.
"));
@@ -1382,11 +1400,8 @@
// WhatsThis, Upload Ephemeris
// ---------------------------
- _uploadEphHostLineEdit->setWhatsThis(tr("BNC can upload a Broadcast Ephemeris stream in RTCM Version 3 format. Specify the IP number or URL of an Ntrip Broadcaster to upload the stream.
An empty option field means that you don't want to upload Broadcast Ephemeris.
"));
- _uploadEphPortLineEdit->setWhatsThis(tr("Specify the IP port of the Ntrip Broadcaster to upload the Broadcast Ephemeris stream. Default is port 80.
"));
- _uploadEphMountpointLineEdit->setWhatsThis(tr("Specify a mountpoint for uploading the Broadcast Ephemeris stream.
"));
- _uploadEphPasswordLineEdit->setWhatsThis(tr("Specify the stream upload password protecting the mounpoint on the Ntrip Broadcaster.
"));
- _uploadEphSampleSpinBox->setWhatsThis(tr("Select the Broadcast Ephemeris sampling interval in seconds.
Default is '5', meaning that a complete set of Broadcast Ephemeris is uploaded every 5 seconds.
"));
- _uploadEphBytesCounter->setWhatsThis(tr("BNC shows the amount of data uploaded via this stream.
"));
-// weber
+ _uploadEphTable->setWhatsThis(tr("BNC can upload a Broadcast Ephemeris stream in RTCM Version 3 format. Specify the IP number or URL of an Ntrip Broadcaster to upload the respective stream.
"));
+ addUploadEphRowButton->setWhatsThis(tr("Hit 'Add Row' button to add another line to the 'Upload Ephemeris' table.
"));
+ delUploadEphRowButton->setWhatsThis(tr("Hit 'Del Row' button to delete the highlighted line(s) from the 'Upload Ephemeris' table.
"));
+ _uploadSamplRtcmEphSpinBox->setWhatsThis(tr("Select the Broadcast Ephemeris sampling interval in seconds.
Default is '5', meaning that a complete set of Broadcast Ephemeris is uploaded every 5 seconds.
"));
// WhatsThis, Streams Canvas
@@ -1494,22 +1509,18 @@
_mountPointsTable->deleteLater();
delete _log;
+ delete _loggroup;
_cmbTable->deleteLater();
delete _cmbMaxresLineEdit;
delete _cmbUseGlonass;
delete _cmbSamplSpinBox;
- delete _cmbMethodComboBox;
+ delete _cmbMethodComboBox;;
+ _uploadEphTable->deleteLater();
+ delete _uploadSamplRtcmEphCorrSpinBox;
_uploadTable->deleteLater();
delete _uploadIntrComboBox;
delete _uploadAntexFile;
- delete _uploadSamplRtcmEphCorrSpinBox;
+ delete _uploadSamplRtcmEphSpinBox;
delete _uploadSamplSp3SpinBox;
delete _uploadSamplClkRnxSpinBox;
- delete _uploadEphHostLineEdit;
- delete _uploadEphPortLineEdit;
- delete _uploadEphPasswordLineEdit;
- delete _uploadEphMountpointLineEdit;
- delete _uploadEphSampleSpinBox;
- delete _uploadEphBytesCounter;
- delete _loggroup;
delete _reqcActionComboBox;
delete _reqcObsFileChooser;
@@ -1847,4 +1858,28 @@
if (!hlp.isEmpty()) {
uploadMountpointsOut << hlp;
+ }
+ }
+
+ QStringList uploadEphMountpointsOut;
+ for (int iRow = 0; iRow < _uploadEphTable->rowCount(); iRow++) {
+ QString hlp;
+ for (int iCol = 0; iCol < _uploadEphTable->columnCount(); iCol++) {
+ if (_uploadEphTable->cellWidget(iRow, iCol) &&
+ (iCol == 3 || iCol == 4 || iCol == 5)) {
+ if (iCol == 3) {
+ QLineEdit* passwd = (QLineEdit*)(_uploadEphTable->cellWidget(iRow, iCol));
+ hlp += passwd->text() + ",";
+ }
+ else if (iCol == 4) {
+ QComboBox* system = (QComboBox*)(_uploadEphTable->cellWidget(iRow, iCol));
+ hlp += system->currentText() + ",";
+ }
+ }
+ else if (_uploadEphTable->item(iRow, iCol)) {
+ hlp += _uploadEphTable->item(iRow, iCol)->text() + ",";
+ }
+ }
+ if (!hlp.isEmpty()) {
+ uploadEphMountpointsOut << hlp;
}
}
@@ -1956,9 +1991,11 @@
settings.setValue("uploadAntexFile", _uploadAntexFile->fileName());
// Upload Ephemeris
- settings.setValue("uploadEphHost", _uploadEphHostLineEdit->text());
- settings.setValue("uploadEphPort", _uploadEphPortLineEdit->text());
- settings.setValue("uploadEphMountpoint",_uploadEphMountpointLineEdit->text());
- settings.setValue("uploadEphPassword", _uploadEphPasswordLineEdit->text());
- settings.setValue("uploadEphSample", _uploadEphSampleSpinBox->value());
+ if (!uploadEphMountpointsOut.isEmpty()) {
+ settings.setValue("uploadEphMountpointsOut", uploadEphMountpointsOut);
+ }
+ else {
+ settings.setValue("uploadEphMountpointsOut", "");
+ }
+ settings.setValue("uploadSamplRtcmEph", _uploadSamplRtcmEphSpinBox->value());
if (_caster) {
@@ -2068,5 +2105,5 @@
if (_uploadTable->rowCount() > 0)
BNC_CORE->slotMessage("Panel 'Upload Corrections' active", true);
- if (!_uploadEphHostLineEdit->text().isEmpty())
+ if (_uploadEphTable->rowCount() > 0)
BNC_CORE->slotMessage("Panel 'UploadEphemeris' active", true);
@@ -2095,6 +2132,4 @@
_casterEph = new bncEphUploadCaster();
- connect(_casterEph, SIGNAL(newBytes(QByteArray,double)),
- _uploadEphBytesCounter, SLOT(slotNewBytes(QByteArray,double)));
}
@@ -2451,14 +2486,4 @@
}
- // Enable/disable Broadcast Ephemerides
- // ------------------------------------
- if (sender() == 0 || sender() == _uploadEphHostLineEdit) {
- enable = !_uploadEphHostLineEdit->text().isEmpty();
- enableWidget(enable, _uploadEphPortLineEdit);
- enableWidget(enable, _uploadEphMountpointLineEdit);
- enableWidget(enable, _uploadEphPasswordLineEdit);
- enableWidget(enable, _uploadEphSampleSpinBox);
- }
-
// Combine Corrections
// -------------------
@@ -2495,4 +2520,14 @@
enableWidget(false, _uploadSamplSp3SpinBox);
enableWidget(false, _uploadAntexFile);
+ }
+
+ // Upload(eph)
+ // -----------
+ iRow = _uploadEphTable->rowCount();
+ if (iRow > 0) {
+ enableWidget(true, _uploadSamplRtcmEphSpinBox);
+ }
+ else {
+ enableWidget(false, _uploadSamplRtcmEphSpinBox);
}
@@ -2720,4 +2755,111 @@
}
+//
+////////////////////////////////////////////////////////////////////////////
+void bncWindow::slotAddUploadEphRow() {
+ int iRow = _uploadEphTable->rowCount();
+ _uploadEphTable->insertRow(iRow);
+ for (int iCol = 0; iCol < _uploadEphTable->columnCount(); iCol++) {
+ if (iCol == 3) {
+ QLineEdit* passwd = new QLineEdit();
+ passwd->setFrame(false);
+ passwd->setEchoMode(QLineEdit::PasswordEchoOnEdit);
+ _uploadEphTable->setCellWidget(iRow, iCol, passwd);
+ }
+ else if (iCol == 4) {
+ QComboBox* system = new QComboBox();
+ system->setEditable(false);
+ system->addItems(QString("ALL,GPS,GLONASS,Galileo,BDS,QZSS,SBAS").split(","));
+ system->setFrame(false);
+ _uploadEphTable->setCellWidget(iRow, iCol, system);
+ }
+ else if (iCol == 5) {
+ bncTableItem* bncIt = new bncTableItem();
+ bncIt->setFlags(bncIt->flags() & ~Qt::ItemIsEditable);
+ _uploadEphTable->setItem(iRow, iCol, bncIt);
+ BNC_CORE->_uploadTableItems[iRow] = bncIt;
+ }
+ else {
+ _uploadEphTable->setItem(iRow, iCol, new QTableWidgetItem(""));
+ }
+ }
+}
+
+//
+////////////////////////////////////////////////////////////////////////////
+void bncWindow::slotDelUploadEphRow() {
+ BNC_CORE->_uploadTableItems.clear();
+ int nRows = _uploadEphTable->rowCount();
+ bool flg[nRows];
+ for (int iRow = 0; iRow < nRows; iRow++) {
+ if (_uploadEphTable->isItemSelected(_uploadEphTable->item(iRow,1))) {
+ flg[iRow] = true;
+ }
+ else {
+ flg[iRow] = false;
+ }
+ }
+ for (int iRow = nRows-1; iRow >= 0; iRow--) {
+ if (flg[iRow]) {
+ _uploadEphTable->removeRow(iRow);
+ }
+ }
+ for (int iRow = 0; iRow < _uploadTable->rowCount(); iRow++) {
+ BNC_CORE->_uploadTableItems[iRow] =
+ (bncTableItem*) _uploadEphTable->item(iRow, 5);
+ }
+ nRows = _uploadEphTable->rowCount();
+ if (nRows < 1) {
+ enableWidget(false, _uploadSamplRtcmEphSpinBox);
+ }
+}
+
+//
+////////////////////////////////////////////////////////////////////////////
+void bncWindow::populateUploadEphTable() {
+ for (int iRow = _uploadEphTable->rowCount()-1; iRow >=0; iRow--) {
+ _uploadEphTable->removeRow(iRow);
+ }
+
+ bncSettings settings;
+
+ int iRow = -1;
+ QListIterator it(settings.value("uploadEphMountpointsOut").toStringList());
+ while (it.hasNext()) {
+ QStringList hlp = it.next().split(",");
+ if (hlp.size() > 4) {
+ ++iRow;
+ _uploadEphTable->insertRow(iRow);
+ }
+ for (int iCol = 0; iCol < hlp.size(); iCol++) {
+ if (iCol == 3) {
+ QLineEdit* passwd = new QLineEdit();
+ passwd->setFrame(false);
+ passwd->setEchoMode(QLineEdit::PasswordEchoOnEdit);
+ passwd->setText(hlp[iCol]);
+ _uploadEphTable->setCellWidget(iRow, iCol, passwd);
+ }
+ else if (iCol == 4) {
+ QComboBox* system = new QComboBox();
+ system->setEditable(false);
+ system->addItems(QString("ALL,GPS,GLONASS,Galileo,BDS,QZSS,SBAS").split(","));
+ system->setFrame(false);
+ system->setCurrentIndex(system->findText(hlp[iCol]));
+ _uploadEphTable->setCellWidget(iRow, iCol, system);
+ }
+ else if (iCol == 5) {
+ bncTableItem* bncIt = new bncTableItem();
+ bncIt->setFlags(bncIt->flags() & ~Qt::ItemIsEditable);
+ _uploadEphTable->setItem(iRow, iCol, bncIt);
+ BNC_CORE->_uploadTableItems[iRow] = bncIt;
+ }
+ else {
+ _uploadEphTable->setItem(iRow, iCol, new QTableWidgetItem(hlp[iCol]));
+ }
+ }
+ }
+}
+
+
// Progress Bar Change
////////////////////////////////////////////////////////////////////////////
Index: trunk/BNC/src/bncwindow.h
===================================================================
--- trunk/BNC/src/bncwindow.h (revision 7888)
+++ trunk/BNC/src/bncwindow.h (revision 7889)
@@ -65,5 +65,5 @@
void AddToolbar();
- public slots:
+ public slots:
void slotMountPointsRead(QList);
void slotBncTextChanged();
@@ -91,4 +91,6 @@
void slotAddUploadRow();
void slotDelUploadRow();
+ void slotAddUploadEphRow();
+ void slotDelUploadEphRow();
void slotSetUploadTrafo();
void slotReqcEditOption();
@@ -104,4 +106,5 @@
void populateCmbTable();
void populateUploadTable();
+ void populateUploadEphTable();
void enableWidget(bool enable, QWidget* widget);
void startRealTime();
@@ -116,5 +119,5 @@
QAction* _actFontSel;
QAction* _actSaveOpt;
- QAction* _actQuit;
+ QAction* _actQuit;
QAction* _actMapMountPoints;
QAction* _actStart;
@@ -221,10 +224,6 @@
qtFileChooser* _uploadAntexFile;
- QLineEdit* _uploadEphHostLineEdit;
- QLineEdit* _uploadEphPortLineEdit;
- QLineEdit* _uploadEphPasswordLineEdit;
- QLineEdit* _uploadEphMountpointLineEdit;
- QSpinBox* _uploadEphSampleSpinBox;
- bncBytesCounter* _uploadEphBytesCounter;
+ QTableWidget* _uploadEphTable;
+ QSpinBox* _uploadSamplRtcmEphSpinBox;
bncCaster* _caster;
@@ -237,5 +236,5 @@
bool _runningSp3Comp;
- bool running() {return _runningRealTime || _runningPPP || _runningEdit ||
+ bool running() {return _runningRealTime || _runningPPP || _runningEdit ||
_runningQC || _runningSp3Comp;}
@@ -253,5 +252,5 @@
Q_INTERFACES(GnssCenter::t_pluginFactoryInterface)
public:
- virtual QWidget* create() {return new bncWindow();}
+ virtual QWidget* create() {return new bncWindow();}
virtual QString getName() const {return QString("BNC");}
};
Index: trunk/BNC/src/upload/bncephuploadcaster.cpp
===================================================================
--- trunk/BNC/src/upload/bncephuploadcaster.cpp (revision 7888)
+++ trunk/BNC/src/upload/bncephuploadcaster.cpp (revision 7889)
@@ -27,22 +27,24 @@
bncEphUploadCaster::bncEphUploadCaster() : bncEphUser(true) {
bncSettings settings;
+ int sampl = settings.value("uploadSamplRtcmEph").toInt();
- QString mountpoint = settings.value("uploadEphMountpoint").toString();
- if (mountpoint.isEmpty()) {
- _ephUploadCaster = 0;
- }
- else {
- QString outHost = settings.value("uploadEphHost").toString();
- int outPort = settings.value("uploadEphPort").toInt();
- QString password = settings.value("uploadEphPassword").toString();
- int sampl = settings.value("uploadEphSample").toInt();
+ // List of upload casters
+ // ----------------------
+ int iRow = -1;
+ QListIterator it(settings.value("uploadEphMountpointsOut").toStringList());
+ while (it.hasNext()) {
+ QStringList hlp = it.next().split(",");
+ if (hlp.size() > 3) {
+ ++iRow;
+ int outPort = hlp[1].toInt();
+ bncUploadCaster* newCaster = new bncUploadCaster(hlp[2], hlp[0], outPort,
+ hlp[3], iRow, sampl);
- _ephUploadCaster = new bncUploadCaster(mountpoint, outHost, outPort,
- password, -1, sampl);
+ connect(newCaster, SIGNAL(newBytes(QByteArray,double)),
+ this, SIGNAL(newBytes(QByteArray,double)));
- connect(_ephUploadCaster, SIGNAL(newBytes(QByteArray,double)),
- this, SIGNAL(newBytes(QByteArray,double)));
-
- _ephUploadCaster->start();
+ newCaster->start();
+ _casters.push_back(newCaster);
+ }
}
}
@@ -51,6 +53,6 @@
////////////////////////////////////////////////////////////////////////////
bncEphUploadCaster::~bncEphUploadCaster() {
- if (_ephUploadCaster) {
- _ephUploadCaster->deleteSafely();
+ for (int ic = 0; ic < _casters.size(); ic++) {
+ _casters[ic]->deleteSafely();
}
}
@@ -59,57 +61,72 @@
////////////////////////////////////////////////////////////////////////////
void bncEphUploadCaster::ephBufferChanged() {
- if (_ephUploadCaster) {
- QByteArray outBuffer;
+ bncSettings settings;
+ int iRow = -1;
+ QListIterator it(settings.value("uploadEphMountpointsOut").toStringList());
+ while (it.hasNext()) {
+ QStringList hlp = it.next().split(",");
+ if (hlp.size() > 3) {
+ ++iRow;
+ QString system = hlp[4];
+ QByteArray outBuffer;
- QDateTime now = currentDateAndTimeGPS();
- bncTime currentTime(now.toString(Qt::ISODate).toStdString());
+ QDateTime now = currentDateAndTimeGPS();
+ bncTime currentTime(now.toString(Qt::ISODate).toStdString());
- QListIterator it(prnList());
- while (it.hasNext()) {
- const t_eph* eph = ephLast(it.next());
+ QListIterator it(prnList());
+ while (it.hasNext()) {
+ const t_eph* eph = ephLast(it.next());
- bncTime toc = eph->TOC();
- double timeDiff = fabs(toc - currentTime);
+ bncTime toc = eph->TOC();
+ double timeDiff = fabs(toc - currentTime);
- const t_ephGPS* ephGPS = dynamic_cast(eph);
- const t_ephGlo* ephGlo = dynamic_cast(eph);
- const t_ephGal* ephGal = dynamic_cast(eph);
- const t_ephSBAS* ephSBAS = dynamic_cast(eph);
- const t_ephBDS* ephBDS = dynamic_cast(eph);
+ const t_ephGPS* ephGPS = dynamic_cast(eph);
+ const t_ephGlo* ephGlo = dynamic_cast(eph);
+ const t_ephGal* ephGal = dynamic_cast(eph);
+ const t_ephSBAS* ephSBAS = dynamic_cast(eph);
+ const t_ephBDS* ephBDS = dynamic_cast(eph);
- unsigned char Array[80];
- int size = 0;
+ unsigned char Array[80];
+ int size = 0;
- if (ephGPS) {
- if (timeDiff <= 4*3600) {
- size = t_ephEncoder::RTCM3(*ephGPS, Array);
+ if (ephGPS && ephGPS->type() == t_eph::GPS &&
+ (system == "ALL" || system == "GPS")) {
+ if (timeDiff <= 4*3600) {
+ size = t_ephEncoder::RTCM3(*ephGPS, Array);
+ }
+ }
+ else if (ephGPS && ephGPS->type() == t_eph::QZSS &&
+ (system == "ALL" || system == "QZSS")) {
+ if (timeDiff <= 4*3600) {
+ size = t_ephEncoder::RTCM3(*ephGPS, Array);
+ }
+ }
+ else if (ephGlo && (system == "ALL" || system == "GLONASS")) {
+ if (timeDiff <= 1*3600) {
+ size = t_ephEncoder::RTCM3(*ephGlo, Array);
+ }
+ }
+ else if (ephGal && (system == "ALL" || system == "Galileo")) {
+ if (timeDiff <= 4*3600) {
+ size = t_ephEncoder::RTCM3(*ephGal, Array);
+ }
+ }
+ else if (ephSBAS && (system == "ALL" || system == "SBAS")) {
+ if (timeDiff <= 600) {
+ size = t_ephEncoder::RTCM3(*ephSBAS, Array);
+ }
+ }
+ else if (ephBDS && (system == "ALL" || system == "BDS")) {
+ if (timeDiff <= 6*3600) {
+ size = t_ephEncoder::RTCM3(*ephBDS, Array);
+ }
+ }
+ if (size > 0) {
+ outBuffer += QByteArray((char*) Array, size);
}
}
- else if (ephGlo) {
- if (timeDiff <= 1*3600) {
- size = t_ephEncoder::RTCM3(*ephGlo, Array);
- }
+ if (outBuffer.size() > 0) {
+ _casters.at(iRow)->setOutBuffer(outBuffer);
}
- else if (ephGal) {
- if (timeDiff <= 4*3600) {
- size = t_ephEncoder::RTCM3(*ephGal, Array);
- }
- }
- else if (ephSBAS) {
- if (timeDiff <= 600) {
- size = t_ephEncoder::RTCM3(*ephSBAS, Array);
- }
- }
- else if (ephBDS) {
- if (timeDiff <= 6*3600) {
- size = t_ephEncoder::RTCM3(*ephBDS, Array);
- }
- }
- if (size > 0) {
- outBuffer += QByteArray((char*) Array, size);
- }
- }
- if (outBuffer.size() > 0) {
- _ephUploadCaster->setOutBuffer(outBuffer);
}
}
Index: trunk/BNC/src/upload/bncephuploadcaster.h
===================================================================
--- trunk/BNC/src/upload/bncephuploadcaster.h (revision 7888)
+++ trunk/BNC/src/upload/bncephuploadcaster.h (revision 7889)
@@ -16,5 +16,6 @@
virtual void ephBufferChanged();
private:
- bncUploadCaster* _ephUploadCaster;
+// bncUploadCaster* _ephUploadCaster;
+ QVector _casters;
};