Changeset 1068 in ntrip

Timestamp:

Aug 27, 2008, 12:58:27 PM (17 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNS

Files:

• bns.cpp (modified) (1 diff)
• bnswindow.cpp (modified) (6 diffs)
• bnswindow.h (modified) (1 diff)

trunk/BNS/bns.cpp ¶

@@ -76 +76 @@
 
     QString mountpoint  = settings.value("mountpoint_%1").toString().arg(ic);
-    QString outFileName = settings.value("outFile_%1").toString().arg(ic);
-    QString refSys      = settings.value("refSys_%1").toString().arg(ic);
-
-    _caster.push_back(new t_bnscaster(mountpoint, outFileName, refSys));
-    connect(_caster.back(), SIGNAL(error(const QByteArray)),
-            this, SLOT(slotError(const QByteArray)));
-    connect(_caster.back(), SIGNAL(newMessage(const QByteArray)),
-            this, SLOT(slotMessage(const QByteArray)));
+    if (!mountpoint.isEmpty()) {
+      QString outFileName = settings.value("outFile_%1").toString().arg(ic);
+      QString refSys      = settings.value("refSys_%1").toString().arg(ic);
+
+      _caster.push_back(new t_bnscaster(mountpoint, outFileName, refSys));
+      connect(_caster.back(), SIGNAL(error(const QByteArray)),
+              this, SLOT(slotError(const QByteArray)));
+      connect(_caster.back(), SIGNAL(newMessage(const QByteArray)),
+              this, SLOT(slotMessage(const QByteArray)));
+    }
   }
 

trunk/BNS/bnswindow.cpp ¶

@@ -152 +152 @@
   _fileAppendCheckBox->setWhatsThis(tr("<p>When BNS is started, new files are created by default and any existing files with the same name will be overwritten. However, users might want to append already existing files following a restart of BNS, a system crash or when BNS crashed. Tick 'Append files' to continue with existing files and keep what has been recorded so far.</p>"));
 
-  _refSysComboBox = new QComboBox;
-  _refSysComboBox->setMaximumWidth(9*ww);
-  _refSysComboBox->setEditable(false);
-  _refSysComboBox->addItems(QString("IGS05,ETRS89").split(","));
-  int ii = _refSysComboBox->findText(settings.value("refSys").toString());
-  if (ii != -1) {
-    _refSysComboBox->setCurrentIndex(ii);
-  }
-  _refSysComboBox->setWhatsThis(tr("Select the target reference system for outgoing clock and orbit corrections."));
-
   _ephHostLineEdit  = new QLineEdit(settings.value("ephHost").toString());
   _ephHostLineEdit->setWhatsThis(tr("BNS reads Broadcast Ephemeris in RINEX Version 3 Navigation file format from an IP address. Specify the host IP e.g. of a BNC installation providing this information."));
@@ -177 +167 @@
   _outPortLineEdit->setWhatsThis(tr("Specify the IP port of an NTRIP Broadcaster to upload the stream. Default is port 80."));
   _outPortLineEdit->setMaximumWidth(9*ww);
-  _mountpointLineEdit = new QLineEdit(settings.value("mountpoint").toString());
-  _mountpointLineEdit->setWhatsThis(tr("Specify the mounpoint for stream upload to an NTRIP Broadcaster."));
-  _mountpointLineEdit->setMaximumWidth(9*ww);
   _passwordLineEdit   = new QLineEdit(settings.value("password").toString());
   _passwordLineEdit->setWhatsThis(tr("Specify the stream upload password protecting the mounpoint on an NTRIP Broadcaster."));
   _passwordLineEdit->setMaximumWidth(9*ww);
   _passwordLineEdit->setEchoMode(QLineEdit::Password);
-  _outFileLineEdit    = new QLineEdit(settings.value("outFile").toString());
-  _outFileLineEdit->setWhatsThis(tr("Specify the full path to a file where outgoing clock and orbit corrections to Broadcast Ephemeris are saved. Beware that the size of this file can rapidly increase. Default is an empty option field meaning that outgoing corrections are not saved."));
+  _mountpoint_1_LineEdit = new QLineEdit(settings.value("mountpoint_1").toString());
+  _mountpoint_1_LineEdit->setWhatsThis(tr("Specify the mounpoint for stream upload to an NTRIP Broadcaster."));
+  _mountpoint_1_LineEdit->setMaximumWidth(9*ww);
+  _mountpoint_2_LineEdit = new QLineEdit(settings.value("mountpoint_2").toString());
+  _mountpoint_2_LineEdit->setWhatsThis(tr("Specify the mounpoint for stream upload to an NTRIP Broadcaster."));
+  _mountpoint_2_LineEdit->setMaximumWidth(9*ww);
+  _refSys_1_ComboBox = new QComboBox;
+  _refSys_1_ComboBox->setMaximumWidth(9*ww);
+  _refSys_1_ComboBox->setEditable(false);
+  _refSys_1_ComboBox->addItems(QString("IGS05,ETRS89").split(","));
+  int ii = _refSys_1_ComboBox->findText(settings.value("refSys_1").toString());
+  if (ii != -1) {
+    _refSys_1_ComboBox->setCurrentIndex(ii);
+  }
+  _refSys_1_ComboBox->setWhatsThis(tr("Select the target reference system for outgoing clock and orbit corrections."));
+  _refSys_2_ComboBox = new QComboBox;
+  _refSys_2_ComboBox->setMaximumWidth(9*ww);
+  _refSys_2_ComboBox->setEditable(false);
+  _refSys_2_ComboBox->addItems(QString("IGS05,ETRS89").split(","));
+  ii = _refSys_2_ComboBox->findText(settings.value("refSys_2").toString());
+  if (ii != -1) {
+    _refSys_2_ComboBox->setCurrentIndex(ii);
+  }
+  _refSys_2_ComboBox->setWhatsThis(tr("Select the target reference system for outgoing clock and orbit corrections."));
+  _outFile_1_LineEdit    = new QLineEdit(settings.value("outFile_1").toString());
+  _outFile_1_LineEdit->setWhatsThis(tr("Specify the full path to a file where outgoing clock and orbit corrections to Broadcast Ephemeris are saved. Beware that the size of this file can rapidly increase. Default is an empty option field meaning that outgoing corrections are not saved."));
+  _outFile_2_LineEdit    = new QLineEdit(settings.value("outFile_2").toString());
+  _outFile_2_LineEdit->setWhatsThis(tr("Specify the full path to a file where outgoing clock and orbit corrections to Broadcast Ephemeris are saved. Beware that the size of this file can rapidly increase. Default is an empty option field meaning that outgoing corrections are not saved."));
 
   _rnxPathLineEdit = new QLineEdit(settings.value("rnxPath").toString());
@@ -262 +275 @@
   layout_gen->addWidget(new QLabel("Append files"),        1, 0);
   layout_gen->addWidget(_fileAppendCheckBox,               1, 1); 
-  layout_gen->addWidget(new QLabel("Reference System"),    2, 0);
-  layout_gen->addWidget(_refSysComboBox,                   2, 1);
-  layout_gen->addWidget(new QLabel("General settings for logfile, file handling and target reference system."),3, 0, 1, 2, Qt::AlignLeft);
-  layout_gen->addWidget(new QLabel("    "),                4, 0);
+  layout_gen->addWidget(new QLabel("General settings for logfile, file handling and target reference system."), 2, 0, 1, 2, Qt::AlignLeft);
+  layout_gen->addWidget(new QLabel("    "),                3, 0);
 
   tab_gen->setLayout(layout_gen);
@@ -301 +312 @@
   layout_cas->addWidget(new QLabel("Host"),       0, 0, Qt::AlignLeft);
   layout_cas->addWidget(_outHostLineEdit,         0, 1);
-  layout_cas->addWidget(new QLabel("Port"),       0, 3, Qt::AlignLeft);
-  layout_cas->addWidget(_outPortLineEdit,         0, 4);
-  layout_cas->addWidget(new QLabel("Mountpoint"), 1, 0, Qt::AlignLeft);
-  layout_cas->addWidget(_mountpointLineEdit,      1, 1);
-  layout_cas->addWidget(new QLabel("Password"),   1, 3, Qt::AlignLeft);
-  layout_cas->addWidget(_passwordLineEdit,        1, 4);
-  layout_cas->addWidget(new QLabel("Save stream (full path)"), 2, 0, Qt::AlignLeft);
-  layout_cas->addWidget(_outFileLineEdit,         2, 1);
-  layout_cas->addWidget(new QLabel("Stream upload of clock and orbit corrections to NTRIP broadcaster."), 3, 0, 1, 4, Qt::AlignLeft);
-  layout_cas->addWidget(new QLabel(""),           4, 0);
+  layout_cas->addWidget(new QLabel("Port"),       0, 2, Qt::AlignLeft);
+  layout_cas->addWidget(_outPortLineEdit,         0, 3);
+  layout_cas->addWidget(new QLabel("Password"),   0, 4, Qt::AlignLeft);
+  layout_cas->addWidget(_passwordLineEdit,        0, 5);
+
+  layout_cas->addWidget(new QLabel("Mountpoint 1"),            1, 0, Qt::AlignLeft);
+  layout_cas->addWidget(_mountpoint_1_LineEdit,                1, 1);
+  layout_cas->addWidget(new QLabel("Save stream (full path)"), 1, 2, Qt::AlignLeft);
+  layout_cas->addWidget(_outFile_1_LineEdit,                   1, 3);
+  layout_cas->addWidget(new QLabel("System"),                  1, 4);
+  layout_cas->addWidget(_refSys_1_ComboBox,                    1, 5);
+
+  layout_cas->addWidget(new QLabel("Mountpoint 2"),            2, 0, Qt::AlignLeft);
+  layout_cas->addWidget(_mountpoint_2_LineEdit,                2, 1);
+  layout_cas->addWidget(new QLabel("Save stream (full path)"), 2, 2, Qt::AlignLeft);
+  layout_cas->addWidget(_outFile_2_LineEdit,                   2, 3);
+  layout_cas->addWidget(new QLabel("System"),                  2, 4);
+  layout_cas->addWidget(_refSys_2_ComboBox,                    2, 5);
+
+  layout_cas->addWidget(new QLabel("Stream upload of clock and orbit corrections to NTRIP broadcaster."), 4, 0, 1, 4, Qt::AlignLeft);
+  layout_cas->addWidget(new QLabel(""),           5, 0);
 
   tab_cas->setLayout(layout_cas);
@@ -488 +510 @@
   settings.setValue("logFile",    _logFileLineEdit->text());
   settings.setValue("fileAppend", _fileAppendCheckBox->checkState());
-  settings.setValue("refSys",     _refSysComboBox->currentText());
+  settings.setValue("refSys_1",     _refSys_1_ComboBox->currentText());
+  settings.setValue("refSys_2",     _refSys_2_ComboBox->currentText());
   settings.setValue("ephHost",    _ephHostLineEdit->text());
   settings.setValue("ephPort",    _ephPortLineEdit->text());
@@ -494 +517 @@
   settings.setValue("outHost",    _outHostLineEdit->text());
   settings.setValue("outPort",    _outPortLineEdit->text());
-  settings.setValue("mountpoint", _mountpointLineEdit->text());
-  settings.setValue("outFile",    _outFileLineEdit->text());
+  settings.setValue("mountpoint_1", _mountpoint_1_LineEdit->text());
+  settings.setValue("mountpoint_2", _mountpoint_2_LineEdit->text());
+  settings.setValue("outFile_1",    _outFile_1_LineEdit->text());
+  settings.setValue("outFile_2",    _outFile_2_LineEdit->text());
   settings.setValue("password",   _passwordLineEdit->text());
   settings.setValue("rnxPath",    _rnxPathLineEdit->text());

trunk/BNS/bnswindow.h ¶

@@ -78 +78 @@
   QLineEdit* _outHostLineEdit;
   QLineEdit* _outPortLineEdit;
-  QLineEdit* _mountpointLineEdit;
   QLineEdit* _passwordLineEdit;
-  QLineEdit* _outFileLineEdit;
+  QLineEdit* _mountpoint_1_LineEdit;
+  QLineEdit* _mountpoint_2_LineEdit;
+  QLineEdit* _outFile_1_LineEdit;
+  QLineEdit* _outFile_2_LineEdit;
+  QComboBox* _refSys_1_ComboBox;
+  QComboBox* _refSys_2_ComboBox;
   QLineEdit* _rnxPathLineEdit;
   QLineEdit* _sp3PathLineEdit;
   QComboBox* _rnxIntrComboBox;
   QComboBox* _sp3IntrComboBox;
-  QComboBox* _refSysComboBox;
   QSpinBox*  _rnxSamplSpinBox;
   QSpinBox*  _sp3SamplSpinBox;