Changeset 1803 in ntrip

Timestamp:

Apr 19, 2009, 11:13:00 PM (16 years ago)

Author:

weber

Message:

* empty log message *

Location:

trunk/BNS

Files:

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

trunk/BNS/bns.cpp

@@ -251 +251 @@
     QByteArray buffer = "New Ephemeris " + ep->prn().toAscii() + "\n";
     _casterEph->write(buffer.data(), buffer.length());
+    int len = buffer.length();
+    if (len > 0) {
+      emit(newOutEphBytes(len));
+    }
   }
 

trunk/BNS/bns.h

@@ -46 +46 @@
   void newOutBytes2(int nBytes);
   void newOutBytes3(int nBytes);
+  void newOutEphBytes(int nBytes);
   void newMessage(const QByteArray msg);
   void error(const QByteArray msg);

trunk/BNS/bnswindow.cpp

@@ -297 +297 @@
   _refSys_3_ComboBox->setWhatsThis(tr("Select the target reference system for outgoing clock and orbit corrections."));
   _outFile_3_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."));
+  _outHost_Eph_LineEdit->setWhatsThis(tr("BNS can upload a Broadcast Ephemeris stream 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 Broadcast Ephemeris."));
+  _outPort_Eph_LineEdit->setWhatsThis(tr("Specify the IP port of an NTRIP Broadcaster to upload the stream. Default is port 80."));
+  _mountpoint_Eph_LineEdit->setWhatsThis(tr("Specify the mounpoint for stream upload to an NTRIP Broadcaster."));
+  _password_Eph_LineEdit->setWhatsThis(tr("Specify the stream upload password protecting the mounpoint on an NTRIP Broadcaster."));
   _rnxPathLineEdit->setWhatsThis(tr("Specify the path for saving the generated clock corrections as Clock RINEX files. If the specified directory does not exist, BNS will not create Clock RINEX files."));
   _rnxIntrComboBox->setWhatsThis(tr("Select the length of the Clock RINEX file."));
@@ -573 +577 @@
   // ---------------------
   QWidget* tab_casEph = new QWidget();
-  tabs->addTab(tab_casEph, "Broadcast Ephemerides");
+  tabs->addTab(tab_casEph, "Broadcast Ephemeris");
 
   QGridLayout* layout_casEph = new QGridLayout;
@@ -582 +586 @@
   _mountpoint_Eph_LineEdit->setMaximumWidth(12*ww);
 
-  layout_casEph->addWidget(new QLabel("Host"),               0, 0);
-  layout_casEph->addWidget(_outHost_Eph_LineEdit,              0, 1, 1, 3);
-  layout_casEph->addWidget(new QLabel("  Port"),             0, 4, Qt::AlignRight);
-  layout_casEph->addWidget(_outPort_Eph_LineEdit,              0, 5, 1, 10);
-  layout_casEph->addWidget(new QLabel("Mountpoint"),         1, 0);
-  layout_casEph->addWidget(_mountpoint_Eph_LineEdit,           1, 1);
-  layout_casEph->addWidget(new QLabel("Password"),           1, 2, Qt::AlignRight);
-  layout_casEph->addWidget(_password_Eph_LineEdit,             1, 3);
-  layout_casEph->addWidget(new QLabel("Concatenated Broadcast Ephemerides"), 2, 0, 1, 50);
+  layout_casEph->addWidget(new QLabel("Host"),                  0, 0);
+  layout_casEph->addWidget(_outHost_Eph_LineEdit,               0, 1, 1, 3);
+  layout_casEph->addWidget(new QLabel("  Port"),                0, 4, Qt::AlignRight);
+  layout_casEph->addWidget(_outPort_Eph_LineEdit,               0, 5, 1, 10);
+  layout_casEph->addWidget(new QLabel("Mountpoint           "), 1, 0);
+  layout_casEph->addWidget(_mountpoint_Eph_LineEdit,            1, 1);
+  layout_casEph->addWidget(new QLabel("          Password"),    1, 2, Qt::AlignRight);
+  layout_casEph->addWidget(_password_Eph_LineEdit,              1, 3);
+  layout_casEph->addWidget(new QLabel("Upload concatenated Broadcast Ephemeris in RTCMv3 format to caster."), 2, 0, 1, 50);
+  layout_casEph->addWidget(new QLabel(""),                      3, 0);
 
   tab_casEph->setLayout(layout_casEph);
@@ -681 +686 @@
   _statusLbl[2] = new QLabel("0 byte(s)"); _statusCnt[2] = 0;
   _statusLbl[3] = new QLabel("0 byte(s)"); _statusCnt[3] = 0;
-  _statusLbl[9] = new QLabel("0 byte(s)"); _statusCnt[4] = 0;
-  _statusLbl[7] = new QLabel("RINEX Ephemeris:");  
-  _statusLbl[4] = new QLabel("Clocks & Orbits:");
-  _statusLbl[5] = new QLabel("Broadcast Corrections I:");  
-  _statusLbl[6] = new QLabel("Broadcast Corrections II:");  
-  _statusLbl[8] = new QLabel("Broadcast Corrections III:");  
+  _statusLbl[4] = new QLabel("0 byte(s)"); _statusCnt[4] = 0;
+  _statusLbl[5] = new QLabel("0 byte(s)"); _statusCnt[5] = 0;
+  _statusLbl[6] = new QLabel("RINEX Ephemeris:");  
+  _statusLbl[7] = new QLabel("Clocks & Orbits:");
+  _statusLbl[8] = new QLabel("Broadcast Corrections I:");  
+  _statusLbl[9] = new QLabel("Broadcast Corrections II:");  
+  _statusLbl[10] = new QLabel("Broadcast Corrections III:");  
+  _statusLbl[11] = new QLabel("Broadcast Ephemeris:");  
 
   _statusLbl[0]->setWhatsThis(tr("Status of incoming broadcast ephemeris."));
   _statusLbl[1]->setWhatsThis(tr("Status of incoming stream of clocks and orbits."));
-  _statusLbl[2]->setWhatsThis(tr("Status of outgoing stream to NTRIP broadcaster."));
-  _statusLbl[7]->setWhatsThis(tr("Status of incoming broadcast ephemeris."));
-  _statusLbl[4]->setWhatsThis(tr("Status of incoming stream of clocks and orbits I."));
-  _statusLbl[5]->setWhatsThis(tr("Status of outgoing stream to NTRIP broadcaster I."));
-  _statusLbl[6]->setWhatsThis(tr("Status of outgoing stream to NTRIP broadcaster II."));
-  _statusLbl[3]->setWhatsThis(tr("Status of outgoing stream to NTRIP broadcaster II."));
-  _statusLbl[8]->setWhatsThis(tr("Status of outgoing stream to NTRIP broadcaster III."));
-
-  layout_status->addWidget(_statusLbl[7], 0, 0);
-  layout_status->addWidget(_statusLbl[0], 0, 1);
-  layout_status->addWidget(_statusLbl[5], 0, 2);
-  layout_status->addWidget(_statusLbl[2], 0, 3);
-  layout_status->addWidget(_statusLbl[4], 1, 0);
-  layout_status->addWidget(_statusLbl[1], 1, 1);
-  layout_status->addWidget(_statusLbl[6], 1, 2);
-  layout_status->addWidget(_statusLbl[3], 1, 3);
-  layout_status->addWidget(_statusLbl[8], 2, 2);
-  layout_status->addWidget(_statusLbl[9], 2, 3);
+  _statusLbl[2]->setWhatsThis(tr("Status of outgoing corrections stream to NTRIP broadcaster I."));
+  _statusLbl[3]->setWhatsThis(tr("Status of outgoing corrections stream to NTRIP broadcaster II."));
+  _statusLbl[4]->setWhatsThis(tr("Status of outgoing corrections stream to NTRIP broadcaster III."));
+  _statusLbl[5]->setWhatsThis(tr("Status of outgoing Broadcast Ephemeris to NTRIP broadcaster"));
+  _statusLbl[6]->setWhatsThis(tr("Status of incoming broadcast ephemeris."));
+  _statusLbl[7]->setWhatsThis(tr("Status of incoming stream of clocks and orbits I."));
+  _statusLbl[8]->setWhatsThis(tr("Status of outgoing corrections stream to NTRIP broadcaster I."));
+  _statusLbl[9]->setWhatsThis(tr("Status of outgoing corrections stream to NTRIP broadcaster II."));
+  _statusLbl[10]->setWhatsThis(tr("Status of outgoing corrections stream to NTRIP broadcaster III."));
+  _statusLbl[11]->setWhatsThis(tr("Status of outgoing Broadcast Ephemeris to NTRIP broadcaster"));
+
+  layout_status->addWidget(_statusLbl[6],  0, 0);
+  layout_status->addWidget(_statusLbl[0],  0, 1);
+  layout_status->addWidget(_statusLbl[11], 0, 2); 
+  layout_status->addWidget(_statusLbl[5],  0, 3); 
+  layout_status->addWidget(_statusLbl[7],  1, 0);
+  layout_status->addWidget(_statusLbl[1],  1, 1);
+  layout_status->addWidget(_statusLbl[8],  1, 2); 
+  layout_status->addWidget(_statusLbl[2],  1, 3); 
+  layout_status->addWidget(_statusLbl[9],  2, 2); 
+  layout_status->addWidget(_statusLbl[3],  2, 3); 
+  layout_status->addWidget(_statusLbl[10], 3, 2); 
+  layout_status->addWidget(_statusLbl[4],  3, 3); 
   _status->setLayout(layout_status);
 
@@ -939 +951 @@
   connect(_bns, SIGNAL(newOutBytes2(int)), this, SLOT(slotOutBytes2(int)));
   connect(_bns, SIGNAL(newOutBytes3(int)), this, SLOT(slotOutBytes3(int)));
+  connect(_bns, SIGNAL(newOutEphBytes(int)), this, SLOT(slotOutEphBytes(int)));
 
   _bns->start();
@@ -959 +972 @@
 void bnsWindow::slotOutBytes3(int nBytes) {
   updateStatus(4, nBytes);
+}
+void bnsWindow::slotOutEphBytes(int nBytes) {
+  updateStatus(5, nBytes);
 }
 
@@ -1130 +1146 @@
 
   // Enable/disable Broadcast Ephemerides
-  // ------------------------------------k-----------
+  // ------------------------------------
   if (tabs->currentIndex() == 7) {
     if (!isEmpty) {

trunk/BNS/bnswindow.h

@@ -50 +50 @@
   void slotOutBytes2(int nBytes);
   void slotOutBytes3(int nBytes);
+  void slotOutEphBytes(int nBytes);
 
  protected:
@@ -131 +132 @@
 //QWidget*    _status;
   QGroupBox*  _status;
-  QLabel*     _statusLbl[10];  
-  double      _statusCnt[5];
+  QLabel*     _statusLbl[12];  
+  double      _statusCnt[6];
   QMutex      _mutex;