Changeset 1068 in ntrip


Ignore:
Timestamp:
Aug 27, 2008, 12:58:27 PM (16 years ago)
Author:
mervart
Message:

* empty log message *

Location:
trunk/BNS
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/BNS/bns.cpp

    r1067 r1068  
    7676
    7777    QString mountpoint  = settings.value("mountpoint_%1").toString().arg(ic);
    78     QString outFileName = settings.value("outFile_%1").toString().arg(ic);
    79     QString refSys      = settings.value("refSys_%1").toString().arg(ic);
    80 
    81     _caster.push_back(new t_bnscaster(mountpoint, outFileName, refSys));
    82     connect(_caster.back(), SIGNAL(error(const QByteArray)),
    83             this, SLOT(slotError(const QByteArray)));
    84     connect(_caster.back(), SIGNAL(newMessage(const QByteArray)),
    85             this, SLOT(slotMessage(const QByteArray)));
     78    if (!mountpoint.isEmpty()) {
     79      QString outFileName = settings.value("outFile_%1").toString().arg(ic);
     80      QString refSys      = settings.value("refSys_%1").toString().arg(ic);
     81
     82      _caster.push_back(new t_bnscaster(mountpoint, outFileName, refSys));
     83      connect(_caster.back(), SIGNAL(error(const QByteArray)),
     84              this, SLOT(slotError(const QByteArray)));
     85      connect(_caster.back(), SIGNAL(newMessage(const QByteArray)),
     86              this, SLOT(slotMessage(const QByteArray)));
     87    }
    8688  }
    8789

  • trunk/BNS/bnswindow.cpp

    r1058 r1068  
    152152  _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>"));
    153153
    154   _refSysComboBox = new QComboBox;
    155   _refSysComboBox->setMaximumWidth(9*ww);
    156   _refSysComboBox->setEditable(false);
    157   _refSysComboBox->addItems(QString("IGS05,ETRS89").split(","));
    158   int ii = _refSysComboBox->findText(settings.value("refSys").toString());
    159   if (ii != -1) {
    160     _refSysComboBox->setCurrentIndex(ii);
    161   }
    162   _refSysComboBox->setWhatsThis(tr("Select the target reference system for outgoing clock and orbit corrections."));
    163 
    164154  _ephHostLineEdit  = new QLineEdit(settings.value("ephHost").toString());
    165155  _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."));
    … …  
    177167  _outPortLineEdit->setWhatsThis(tr("Specify the IP port of an NTRIP Broadcaster to upload the stream. Default is port 80."));
    178168  _outPortLineEdit->setMaximumWidth(9*ww);
    179   _mountpointLineEdit = new QLineEdit(settings.value("mountpoint").toString());
    180   _mountpointLineEdit->setWhatsThis(tr("Specify the mounpoint for stream upload to an NTRIP Broadcaster."));
    181   _mountpointLineEdit->setMaximumWidth(9*ww);
    182169  _passwordLineEdit   = new QLineEdit(settings.value("password").toString());
    183170  _passwordLineEdit->setWhatsThis(tr("Specify the stream upload password protecting the mounpoint on an NTRIP Broadcaster."));
    184171  _passwordLineEdit->setMaximumWidth(9*ww);
    185172  _passwordLineEdit->setEchoMode(QLineEdit::Password);
    186   _outFileLineEdit    = new QLineEdit(settings.value("outFile").toString());
    187   _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."));
     173  _mountpoint_1_LineEdit = new QLineEdit(settings.value("mountpoint_1").toString());
     174  _mountpoint_1_LineEdit->setWhatsThis(tr("Specify the mounpoint for stream upload to an NTRIP Broadcaster."));
     175  _mountpoint_1_LineEdit->setMaximumWidth(9*ww);
     176  _mountpoint_2_LineEdit = new QLineEdit(settings.value("mountpoint_2").toString());
     177  _mountpoint_2_LineEdit->setWhatsThis(tr("Specify the mounpoint for stream upload to an NTRIP Broadcaster."));
     178  _mountpoint_2_LineEdit->setMaximumWidth(9*ww);
     179  _refSys_1_ComboBox = new QComboBox;
     180  _refSys_1_ComboBox->setMaximumWidth(9*ww);
     181  _refSys_1_ComboBox->setEditable(false);
     182  _refSys_1_ComboBox->addItems(QString("IGS05,ETRS89").split(","));
     183  int ii = _refSys_1_ComboBox->findText(settings.value("refSys_1").toString());
     184  if (ii != -1) {
     185    _refSys_1_ComboBox->setCurrentIndex(ii);
     186  }
     187  _refSys_1_ComboBox->setWhatsThis(tr("Select the target reference system for outgoing clock and orbit corrections."));
     188  _refSys_2_ComboBox = new QComboBox;
     189  _refSys_2_ComboBox->setMaximumWidth(9*ww);
     190  _refSys_2_ComboBox->setEditable(false);
     191  _refSys_2_ComboBox->addItems(QString("IGS05,ETRS89").split(","));
     192  ii = _refSys_2_ComboBox->findText(settings.value("refSys_2").toString());
     193  if (ii != -1) {
     194    _refSys_2_ComboBox->setCurrentIndex(ii);
     195  }
     196  _refSys_2_ComboBox->setWhatsThis(tr("Select the target reference system for outgoing clock and orbit corrections."));
     197  _outFile_1_LineEdit    = new QLineEdit(settings.value("outFile_1").toString());
     198  _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."));
     199  _outFile_2_LineEdit    = new QLineEdit(settings.value("outFile_2").toString());
     200  _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."));
    188201
    189202  _rnxPathLineEdit = new QLineEdit(settings.value("rnxPath").toString());
    … …  
    262275  layout_gen->addWidget(new QLabel("Append files"),        1, 0);
    263276  layout_gen->addWidget(_fileAppendCheckBox,               1, 1);
    264   layout_gen->addWidget(new QLabel("Reference System"),    2, 0);
    265   layout_gen->addWidget(_refSysComboBox,                   2, 1);
    266   layout_gen->addWidget(new QLabel("General settings for logfile, file handling and target reference system."),3, 0, 1, 2, Qt::AlignLeft);
    267   layout_gen->addWidget(new QLabel("    "),                4, 0);
     277  layout_gen->addWidget(new QLabel("General settings for logfile, file handling and target reference system."), 2, 0, 1, 2, Qt::AlignLeft);
     278  layout_gen->addWidget(new QLabel("    "),                3, 0);
    268279
    269280  tab_gen->setLayout(layout_gen);
    … …  
    301312  layout_cas->addWidget(new QLabel("Host"),       0, 0, Qt::AlignLeft);
    302313  layout_cas->addWidget(_outHostLineEdit,         0, 1);
    303   layout_cas->addWidget(new QLabel("Port"),       0, 3, Qt::AlignLeft);
    304   layout_cas->addWidget(_outPortLineEdit,         0, 4);
    305   layout_cas->addWidget(new QLabel("Mountpoint"), 1, 0, Qt::AlignLeft);
    306   layout_cas->addWidget(_mountpointLineEdit,      1, 1);
    307   layout_cas->addWidget(new QLabel("Password"),   1, 3, Qt::AlignLeft);
    308   layout_cas->addWidget(_passwordLineEdit,        1, 4);
    309   layout_cas->addWidget(new QLabel("Save stream (full path)"), 2, 0, Qt::AlignLeft);
    310   layout_cas->addWidget(_outFileLineEdit,         2, 1);
    311   layout_cas->addWidget(new QLabel("Stream upload of clock and orbit corrections to NTRIP broadcaster."), 3, 0, 1, 4, Qt::AlignLeft);
    312   layout_cas->addWidget(new QLabel(""),           4, 0);
     314  layout_cas->addWidget(new QLabel("Port"),       0, 2, Qt::AlignLeft);
     315  layout_cas->addWidget(_outPortLineEdit,         0, 3);
     316  layout_cas->addWidget(new QLabel("Password"),   0, 4, Qt::AlignLeft);
     317  layout_cas->addWidget(_passwordLineEdit,        0, 5);
     318
     319  layout_cas->addWidget(new QLabel("Mountpoint 1"),            1, 0, Qt::AlignLeft);
     320  layout_cas->addWidget(_mountpoint_1_LineEdit,                1, 1);
     321  layout_cas->addWidget(new QLabel("Save stream (full path)"), 1, 2, Qt::AlignLeft);
     322  layout_cas->addWidget(_outFile_1_LineEdit,                   1, 3);
     323  layout_cas->addWidget(new QLabel("System"),                  1, 4);
     324  layout_cas->addWidget(_refSys_1_ComboBox,                    1, 5);
     325
     326  layout_cas->addWidget(new QLabel("Mountpoint 2"),            2, 0, Qt::AlignLeft);
     327  layout_cas->addWidget(_mountpoint_2_LineEdit,                2, 1);
     328  layout_cas->addWidget(new QLabel("Save stream (full path)"), 2, 2, Qt::AlignLeft);
     329  layout_cas->addWidget(_outFile_2_LineEdit,                   2, 3);
     330  layout_cas->addWidget(new QLabel("System"),                  2, 4);
     331  layout_cas->addWidget(_refSys_2_ComboBox,                    2, 5);
     332
     333  layout_cas->addWidget(new QLabel("Stream upload of clock and orbit corrections to NTRIP broadcaster."), 4, 0, 1, 4, Qt::AlignLeft);
     334  layout_cas->addWidget(new QLabel(""),           5, 0);
    313335
    314336  tab_cas->setLayout(layout_cas);
    … …  
    488510  settings.setValue("logFile",    _logFileLineEdit->text());
    489511  settings.setValue("fileAppend", _fileAppendCheckBox->checkState());
    490   settings.setValue("refSys",     _refSysComboBox->currentText());
     512  settings.setValue("refSys_1",     _refSys_1_ComboBox->currentText());
     513  settings.setValue("refSys_2",     _refSys_2_ComboBox->currentText());
    491514  settings.setValue("ephHost",    _ephHostLineEdit->text());
    492515  settings.setValue("ephPort",    _ephPortLineEdit->text());
    … …  
    494517  settings.setValue("outHost",    _outHostLineEdit->text());
    495518  settings.setValue("outPort",    _outPortLineEdit->text());
    496   settings.setValue("mountpoint", _mountpointLineEdit->text());
    497   settings.setValue("outFile",    _outFileLineEdit->text());
     519  settings.setValue("mountpoint_1", _mountpoint_1_LineEdit->text());
     520  settings.setValue("mountpoint_2", _mountpoint_2_LineEdit->text());
     521  settings.setValue("outFile_1",    _outFile_1_LineEdit->text());
     522  settings.setValue("outFile_2",    _outFile_2_LineEdit->text());
    498523  settings.setValue("password",   _passwordLineEdit->text());
    499524  settings.setValue("rnxPath",    _rnxPathLineEdit->text());

  • trunk/BNS/bnswindow.h

    r1058 r1068  
    7878  QLineEdit* _outHostLineEdit;
    7979  QLineEdit* _outPortLineEdit;
    80   QLineEdit* _mountpointLineEdit;
    8180  QLineEdit* _passwordLineEdit;
    82   QLineEdit* _outFileLineEdit;
     81  QLineEdit* _mountpoint_1_LineEdit;
     82  QLineEdit* _mountpoint_2_LineEdit;
     83  QLineEdit* _outFile_1_LineEdit;
     84  QLineEdit* _outFile_2_LineEdit;
     85  QComboBox* _refSys_1_ComboBox;
     86  QComboBox* _refSys_2_ComboBox;
    8387  QLineEdit* _rnxPathLineEdit;
    8488  QLineEdit* _sp3PathLineEdit;
    8589  QComboBox* _rnxIntrComboBox;
    8690  QComboBox* _sp3IntrComboBox;
    87   QComboBox* _refSysComboBox;
    8891  QSpinBox*  _rnxSamplSpinBox;
    8992  QSpinBox*  _sp3SamplSpinBox;
Note: See TracChangeset for help on using the changeset viewer.