Changeset 1249 in ntrip for trunk/BNS


Ignore:
Timestamp:
Dec 1, 2008, 12:37:45 PM (16 years ago)
Author:
weber
Message:

* empty log message *

Location:
trunk/BNS
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/BNS/bns.cpp

    r1245 r1249  
    8080      QString refSys      = settings.value(QString("refSys_%1").arg(ic)).toString();
    8181
    82       _caster.push_back(new t_bnscaster(mountpoint, outFileName, refSys));
     82      _caster.push_back(new t_bnscaster(mountpoint, outFileName, refSys, ic));
    8383      connect(_caster.back(), SIGNAL(error(const QByteArray)),
    8484              this, SLOT(slotError(const QByteArray)));

  • trunk/BNS/bnsabout.html

    r1205 r1249  
    2121The Bundesamt fuer Geodaesie und Kartographie (BKG) may not be held liable for damages of any kind, direct or consequential, which may result from the use of this software.<br>
    2222<br>
    23 BKG, Frankfurt, Germany, November 2008<br>
     23BKG, Frankfurt, Germany, December 2008<br>
    2424E-Mail: <a><u>euref-ip@bkg.bund.de</u></a>.<br>
    2525</p>

  • trunk/BNS/bnscaster.cpp

    r1243 r1249  
    2323////////////////////////////////////////////////////////////////////////////
    2424t_bnscaster::t_bnscaster(const QString& mountpoint, const QString& outFileName,
    25                          const QString& refSys) {
     25                         const QString& refSys, const int ic) {
    2626
    2727  _mountpoint         = mountpoint;
    2828  _outSocket          = 0;
    2929  _outSocketOpenTrial = 0;
     30  _ic = ic;
    3031
    3132  QSettings settings;
    … …  
    9596  QSettings settings;
    9697  _outSocket = new QTcpSocket();
    97   _outSocket->connectToHost(settings.value("outHost").toString(),
    98                             settings.value("outPort").toInt());
     98  QString password;
     99  if (_ic == 1) {
     100    _outSocket->connectToHost(settings.value("outHost1").toString(),
     101                              settings.value("outPort1").toInt());
     102    password = settings.value("password1").toString();
     103  }
     104  if (_ic == 2) {
     105    _outSocket->connectToHost(settings.value("outHost2").toString(),
     106                              settings.value("outPort2").toInt());
     107    password = settings.value("password2").toString();
     108  }
    99109
    100110  const int timeOut = 5000;  // 5 seconds
    … …  
    105115    return;
    106116  }
    107 
    108   QString password   = settings.value("password").toString();
    109117
    110118  QByteArray msg = "SOURCE " + password.toAscii() + " /" +

  • trunk/BNS/bnscaster.h

    r1123 r1249  
    88 public:
    99  t_bnscaster(const QString& mountpoint, const QString& outFileName,
    10               const QString& refSys);
     10              const QString& refSys, int ic);
    1111  virtual ~t_bnscaster();
    1212  void open();
    … …  
    2828  QTextStream* _outStream;
    2929  bool         _crdTrafo;
     30  int          _ic;
    3031};
    3132

  • trunk/BNS/bnshelp.html

    r1248 r1249  
    275275<p><a name="ephc"><h4>4.7. Ephemeris Corrections</h4></p>
    276276<p>
    277 BNS can upload the resulting stream(s) of clock and orbit corrections to Broadcast Ephemeris to an NTRIP Broadcaster. Both EUREF and IGS operate an NTRIP broadcaster at <u>http://www.euref-ip.net/home</u> and <u>http://www.igs-ip.net/home</u> which can be used for stream upload. The stream's format is RTCM Version 3.x. Note that it only carries the thentative message Types 4056 and 4057 for combined orbit and clock corrections to GPS and GLONASS Broadcast Ephemeris.
     277BNS can upload the resulting stream(s) of clock and orbit corrections to Broadcast Ephemeris to an NTRIP Broadcaster. Both EUREF and IGS operate an NTRIP broadcaster at <u>http://www.euref-ip.net/home</u> and <u>http://www.igs-ip.net/home</u> which can be used for stream upload. The stream's format is RTCM Version 3.x. Note that it only carries the premature message Types 4056 and 4057 for combined orbit and clock corrections to GPS and GLONASS Broadcast Ephemeris.
     278</p>
     279<p>
     280BNS allows to configure two Ephemeris Corrections streams refering do different reference systems for upload to different NTRIP broadcasters. You may use this functionality for parallel support of a backup NTRIP broadcaster or for simultaneous support of two reference systems.
    278281</p>
    279282
    … …  
    330333</p>
    331334<p>
    332 Contact [igs-ip@bkg.bund.de] if you would like to see further transformations implemented in BNS.
     335Contact [igs-ip@bkg.bund.de] if you would like to see further Helmert transformation parameters implemented in BNS to support other national or regional reference system.
    333336<p>
    334337

  • trunk/BNS/bnswindow.cpp

    r1243 r1249  
    167167  _clkPortLineEdit->setMaximumWidth(9*ww);
    168168
    169   _outHostLineEdit    = new QLineEdit(settings.value("outHost").toString());
    170   _outHostLineEdit->setWhatsThis(tr("BNS can stream clock and orbit corrections to Broadcast Ephemeris in RTCM Version 3 format. Specify the host IP of an NTRIP Broadcaster to upload the stream. An empty option field means that you don't want to upload corrections."));
    171   _outPortLineEdit    = new QLineEdit(settings.value("outPort").toString());
    172   _outPortLineEdit->setWhatsThis(tr("Specify the IP port of an NTRIP Broadcaster to upload the stream. Default is port 80."));
    173   _outPortLineEdit->setMaximumWidth(9*ww);
    174   _passwordLineEdit   = new QLineEdit(settings.value("password").toString());
    175   _passwordLineEdit->setWhatsThis(tr("Specify the stream upload password protecting the mounpoint on an NTRIP Broadcaster."));
    176   _passwordLineEdit->setMaximumWidth(9*ww);
    177   _passwordLineEdit->setEchoMode(QLineEdit::Password);
     169  _outHost_1_LineEdit    = new QLineEdit(settings.value("outHost1").toString());
     170  _outHost_1_LineEdit->setWhatsThis(tr("BNS can stream clock and orbit corrections to Broadcast Ephemeris in RTCM Version 3 format. Specify the host IP of an NTRIP Broadcaster to upload the stream. An empty option field means that you don't want to upload corrections."));
     171//_outHost_1_LineEdit->setMaximumWidth(9*ww); // weber
     172  _outPort_1_LineEdit    = new QLineEdit(settings.value("outPort1").toString());
     173  _outPort_1_LineEdit->setWhatsThis(tr("Specify the IP port of an NTRIP Broadcaster to upload the stream. Default is port 80."));
     174  _outPort_1_LineEdit->setMaximumWidth(9*ww);
     175  _password_1_LineEdit   = new QLineEdit(settings.value("password1").toString());
     176  _password_1_LineEdit->setWhatsThis(tr("Specify the stream upload password protecting the mounpoint on an NTRIP Broadcaster."));
     177  _password_1_LineEdit->setMaximumWidth(9*ww);
     178  _password_1_LineEdit->setEchoMode(QLineEdit::Password);
     179
     180  _outHost_2_LineEdit    = new QLineEdit(settings.value("outHost2").toString());
     181  _outHost_2_LineEdit->setWhatsThis(tr("BNS can stream clock and orbit corrections to Broadcast Ephemeris in RTCM Version 3 format. Specify the host IP of an NTRIP Broadcaster to upload the stream. An empty option field means that you don't want to upload corrections."));
     182//_outHost_2_LineEdit->setMaximumWidth(9*ww); // weber
     183  _outPort_2_LineEdit    = new QLineEdit(settings.value("outPort2").toString());
     184  _outPort_2_LineEdit->setWhatsThis(tr("Specify the IP port of an NTRIP Broadcaster to upload the stream. Default is port 80."));
     185  _outPort_2_LineEdit->setMaximumWidth(9*ww);
     186  _password_2_LineEdit   = new QLineEdit(settings.value("password2").toString());
     187  _password_2_LineEdit->setWhatsThis(tr("Specify the stream upload password protecting the mounpoint on an NTRIP Broadcaster."));
     188  _password_2_LineEdit->setMaximumWidth(9*ww);
     189  _password_2_LineEdit->setEchoMode(QLineEdit::Password);
     190
    178191  _mountpoint_1_LineEdit = new QLineEdit(settings.value("mountpoint_1").toString());
    179192  _mountpoint_1_LineEdit->setWhatsThis(tr("Specify the mounpoint for stream upload to an NTRIP Broadcaster."));
    180   _mountpoint_1_LineEdit->setMaximumWidth(9*ww);
     193  _mountpoint_1_LineEdit->setMaximumWidth(12*ww);
    181194  _mountpoint_2_LineEdit = new QLineEdit(settings.value("mountpoint_2").toString());
    182195  _mountpoint_2_LineEdit->setWhatsThis(tr("Specify the mounpoint for stream upload to an NTRIP Broadcaster."));
    183   _mountpoint_2_LineEdit->setMaximumWidth(9*ww);
     196  _mountpoint_2_LineEdit->setMaximumWidth(12*ww);
    184197  _refSys_1_ComboBox = new QComboBox;
    185   _refSys_1_ComboBox->setMaximumWidth(10*ww);
     198  _refSys_1_ComboBox->setMaximumWidth(12*ww);
    186199  _refSys_1_ComboBox->setEditable(false);
    187200  _refSys_1_ComboBox->addItems(QString("IGS05,ETRF2000").split(","));
    … …  
    192205  _refSys_1_ComboBox->setWhatsThis(tr("Select the target reference system for outgoing clock and orbit corrections."));
    193206  _refSys_2_ComboBox = new QComboBox;
    194   _refSys_2_ComboBox->setMaximumWidth(10*ww);
     207  _refSys_2_ComboBox->setMaximumWidth(12*ww);
    195208  _refSys_2_ComboBox->setEditable(false);
    196209  _refSys_2_ComboBox->addItems(QString("IGS05,ETRF2000").split(","));
    … …  
    321334  tab_co->setLayout(layout_co);
    322335
    323   // Caster Tab
    324   // ----------
    325   QWidget* tab_cas = new QWidget();
    326   tabs->addTab(tab_cas, "Ephemeris Corrections");
    327 
    328   QGridLayout* layout_cas = new QGridLayout;
    329   layout_cas->setColumnMinimumWidth(0, 9*ww);
    330 
    331   layout_cas->addWidget(new QLabel("Host"),       0, 0, Qt::AlignLeft);
    332   layout_cas->addWidget(_outHostLineEdit,         0, 1, 1, 2);
    333   layout_cas->addWidget(new QLabel("Port"),       0, 3, Qt::AlignRight);
    334   layout_cas->addWidget(_outPortLineEdit,         0, 4);
    335   layout_cas->addWidget(new QLabel("Password"),   0, 5, Qt::AlignRight);
    336   layout_cas->addWidget(_passwordLineEdit,        0, 6);
    337 
    338   layout_cas->addWidget(new QLabel("Mountpoint 1"),            1, 0, Qt::AlignLeft);
    339   layout_cas->addWidget(_mountpoint_1_LineEdit,                1, 1);
    340   layout_cas->addWidget(new QLabel("  System"),                1, 2, Qt::AlignRight);
    341   layout_cas->addWidget(_refSys_1_ComboBox,                    1, 3);
    342   layout_cas->addWidget(new QLabel("  Save (full path)"),      1, 4, Qt::AlignRight);
    343   layout_cas->addWidget(_outFile_1_LineEdit,                   1, 5, 1, 8);
    344 
    345   layout_cas->addWidget(new QLabel("Mountpoint 2"),            2, 0, Qt::AlignLeft);
    346   layout_cas->addWidget(_mountpoint_2_LineEdit,                2, 1);
    347   layout_cas->addWidget(new QLabel("  System"),                2, 2, Qt::AlignRight);
    348   layout_cas->addWidget(_refSys_2_ComboBox,                    2, 3);
    349   layout_cas->addWidget(new QLabel("  Save (full path)"),      2, 4, Qt::AlignRight);
    350   layout_cas->addWidget(_outFile_2_LineEdit,                   2, 5, 1, 8);
    351 
    352   layout_cas->addWidget(new QLabel("Produce broadcast ephemeris corrections, upload to caster, reference system, local storage."), 3, 0, 1, 8, Qt::AlignLeft);
    353 
    354   tab_cas->setLayout(layout_cas);
     336  // Caster Tab I
     337  // ------------
     338  QWidget* tab_cas1 = new QWidget();
     339  tabs->addTab(tab_cas1, "Ephemeris Corrections I");
     340
     341  QGridLayout* layout_cas1 = new QGridLayout;
     342  layout_cas1->setColumnMinimumWidth(0, 9*ww);
     343  layout_cas1->addWidget(new QLabel("Host"),             0, 0);
     344  layout_cas1->addWidget(_outHost_1_LineEdit,            0, 1, 1, 3);
     345  layout_cas1->addWidget(new QLabel("Port"),             0, 4, Qt::AlignRight);
     346  layout_cas1->addWidget(_outPort_1_LineEdit,            0, 5);
     347  layout_cas1->addWidget(new QLabel("Mountpoint"),       1, 0);
     348  layout_cas1->addWidget(_mountpoint_1_LineEdit,         1, 1);
     349  layout_cas1->addWidget(new QLabel("Password"),         1, 2, Qt::AlignRight);
     350  layout_cas1->addWidget(_password_1_LineEdit,           1, 3);
     351  layout_cas1->addWidget(new QLabel(" "),                1, 4);
     352  layout_cas1->addWidget(new QLabel(" "),                1, 5);
     353  layout_cas1->addWidget(new QLabel("System"),           2, 0);
     354  layout_cas1->addWidget(_refSys_1_ComboBox,             2, 1);
     355  layout_cas1->addWidget(new QLabel("Save (full path)"), 2, 2, Qt::AlignRight);
     356  layout_cas1->addWidget(_outFile_1_LineEdit,            2, 3, 1, 10);
     357  layout_cas1->addWidget(new QLabel("Produce broadcast ephemeris corrections, upload to caster, reference system, local storage."), 3, 0, 1, 10);
     358
     359  tab_cas1->setLayout(layout_cas1);
     360
     361  // Caster Tab II
     362  // -------------
     363  QWidget* tab_cas2 = new QWidget();
     364  tabs->addTab(tab_cas2, "Ephemeris Corrections II");
     365
     366  QGridLayout* layout_cas2 = new QGridLayout;
     367  layout_cas2->setColumnMinimumWidth(0, 9*ww);
     368  layout_cas2->addWidget(new QLabel("Host"),             0, 0);
     369  layout_cas2->addWidget(_outHost_2_LineEdit,            0, 1, 1, 3);
     370  layout_cas2->addWidget(new QLabel("Port"),             0, 4, Qt::AlignRight);
     371  layout_cas2->addWidget(_outPort_2_LineEdit,            0, 5);
     372  layout_cas2->addWidget(new QLabel("Mountpoint"),       1, 0);
     373  layout_cas2->addWidget(_mountpoint_2_LineEdit,         1, 1);
     374  layout_cas2->addWidget(new QLabel("Password"),         1, 2, Qt::AlignRight);
     375  layout_cas2->addWidget(_password_2_LineEdit,           1, 3);
     376  layout_cas2->addWidget(new QLabel(" "),                1, 4);
     377  layout_cas2->addWidget(new QLabel(" "),                1, 5);
     378  layout_cas2->addWidget(new QLabel("System"),           2, 0);
     379  layout_cas2->addWidget(_refSys_2_ComboBox,             2, 1);
     380  layout_cas2->addWidget(new QLabel("Save (full path)"), 2, 2, Qt::AlignRight);
     381  layout_cas2->addWidget(_outFile_2_LineEdit,            2, 3, 1, 10);
     382  layout_cas2->addWidget(new QLabel("Produce broadcast ephemeris corrections, upload to caster, reference system, local storage."), 3, 0, 1, 10);
     383
     384  tab_cas2->setLayout(layout_cas2);
    355385
    356386  // RINEX Tab
    … …  
    530560void bnsWindow::slotSaveOptions() {
    531561  QSettings settings;
    532   settings.setValue("proxyHost",  _proxyHostLineEdit->text());
    533   settings.setValue("proxyPort",  _proxyPortLineEdit->text());
    534   settings.setValue("logFile",    _logFileLineEdit->text());
    535   settings.setValue("fileAppend", _fileAppendCheckBox->checkState());
    536   settings.setValue("refSys_1",     _refSys_1_ComboBox->currentText());
    537   settings.setValue("refSys_2",     _refSys_2_ComboBox->currentText());
    538   settings.setValue("inpEcho",    _inpEchoLineEdit->text());
    539   settings.setValue("ephHost",    _ephHostLineEdit->text());
    540   settings.setValue("ephPort",    _ephPortLineEdit->text());
    541   settings.setValue("ephEcho",    _ephEchoLineEdit->text());
    542   settings.setValue("clkPort",    _clkPortLineEdit->text());
    543   settings.setValue("outHost",    _outHostLineEdit->text());
    544   settings.setValue("outPort",    _outPortLineEdit->text());
    545   settings.setValue("mountpoint_1", _mountpoint_1_LineEdit->text());
    546   settings.setValue("mountpoint_2", _mountpoint_2_LineEdit->text());
    547   settings.setValue("outFile_1",    _outFile_1_LineEdit->text());
    548   settings.setValue("outFile_2",    _outFile_2_LineEdit->text());
    549   settings.setValue("password",   _passwordLineEdit->text());
    550   settings.setValue("rnxPath",    _rnxPathLineEdit->text());
    551   settings.setValue("rnxIntr",    _rnxIntrComboBox->currentText());
    552   settings.setValue("rnxSampl",   _rnxSamplSpinBox->value());
    553   settings.setValue("sp3Path",    _sp3PathLineEdit->text());
    554   settings.setValue("sp3Intr",    _sp3IntrComboBox->currentText());
    555   settings.setValue("sp3Sampl",   _sp3SamplSpinBox->value());
     562  settings.setValue("proxyHost",   _proxyHostLineEdit->text());
     563  settings.setValue("proxyPort",   _proxyPortLineEdit->text());
     564  settings.setValue("logFile",     _logFileLineEdit->text());
     565  settings.setValue("fileAppend",  _fileAppendCheckBox->checkState());
     566  settings.setValue("refSys_1",    _refSys_1_ComboBox->currentText());
     567  settings.setValue("refSys_2",    _refSys_2_ComboBox->currentText());
     568  settings.setValue("inpEcho",     _inpEchoLineEdit->text());
     569  settings.setValue("ephHost",     _ephHostLineEdit->text());
     570  settings.setValue("ephPort",     _ephPortLineEdit->text());
     571  settings.setValue("ephEcho",     _ephEchoLineEdit->text());
     572  settings.setValue("clkPort",     _clkPortLineEdit->text());
     573  settings.setValue("outHost1",    _outHost_1_LineEdit->text());
     574  settings.setValue("outPort1",    _outPort_1_LineEdit->text());
     575  settings.setValue("mountpoint_1",_mountpoint_1_LineEdit->text());
     576  settings.setValue("mountpoint_2",_mountpoint_2_LineEdit->text());
     577  settings.setValue("outFile_1",   _outFile_1_LineEdit->text());
     578  settings.setValue("outFile_2",   _outFile_2_LineEdit->text());
     579  settings.setValue("password1",   _password_1_LineEdit->text());
     580  settings.setValue("password2",   _password_2_LineEdit->text());
     581  settings.setValue("rnxPath",     _rnxPathLineEdit->text());
     582  settings.setValue("rnxIntr",     _rnxIntrComboBox->currentText());
     583  settings.setValue("rnxSampl",    _rnxSamplSpinBox->value());
     584  settings.setValue("sp3Path",     _sp3PathLineEdit->text());
     585  settings.setValue("sp3Intr",     _sp3IntrComboBox->currentText());
     586  settings.setValue("sp3Sampl",    _sp3SamplSpinBox->value());
    556587}
    557588

  • trunk/BNS/bnswindow.h

    r1089 r1249  
    7878  QLineEdit* _clkPortLineEdit;
    7979  QLineEdit* _logFileLineEdit;
    80   QLineEdit* _outHostLineEdit;
    81   QLineEdit* _outPortLineEdit;
    82   QLineEdit* _passwordLineEdit;
     80  QLineEdit* _outHost_1_LineEdit;
     81  QLineEdit* _outPort_1_LineEdit;
     82  QLineEdit* _password_1_LineEdit;
     83  QLineEdit* _outHost_2_LineEdit;
     84  QLineEdit* _outPort_2_LineEdit;
     85  QLineEdit* _password_2_LineEdit;
    8386  QLineEdit* _mountpoint_1_LineEdit;
    8487  QLineEdit* _mountpoint_2_LineEdit;
Note: See TracChangeset for help on using the changeset viewer.