Changeset 1258 in ntrip for trunk/BNS

Timestamp:

Dec 1, 2008, 11:26:09 PM (15 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) (5 diffs)
• bnswindow.h (modified) (2 diffs)

trunk/BNS/bns.cpp

@@ -420 +420 @@
           int len = MakeClockOrbit(&co, COTYPE_AUTO, 0, obuffer, sizeof(obuffer));
           if (len > 0) {
-            emit(newOutBytes(len));
+            if (ic == 0) { emit(newOutBytes1(len));}
+            if (ic == 1) { emit(newOutBytes2(len));}
             _caster.at(ic)->write(obuffer, len);
           }

trunk/BNS/bns.h

@@ -43 +43 @@
   void newClkBytes(int nBytes);
   void newEphBytes(int nBytes);
-  void newOutBytes(int nBytes);
+  void newOutBytes1(int nBytes);
+  void newOutBytes2(int nBytes);
   void newMessage(const QByteArray msg);
   void error(const QByteArray msg);

trunk/BNS/bnswindow.cpp

@@ -437 +437 @@
   _statusLbl[5] = new QLabel("Ephemeris Corrections I:");  
   _statusLbl[6] = new QLabel("Ephemeris Corrections II:");  
+  _statusLbl[7] = new QLabel("0 byte(s)"); _statusCnt[3] = 0;
 
   _statusLbl[0]->setWhatsThis(tr("Status of incoming broadcast ephemeris."));
@@ -442 +443 @@
   _statusLbl[2]->setWhatsThis(tr("Status of outgoing stream to NTRIP broadcaster."));
   _statusLbl[3]->setWhatsThis(tr("Status of incoming broadcast ephemeris."));
-  _statusLbl[4]->setWhatsThis(tr("Status of incoming stream of clocks and orbits."));
-  _statusLbl[5]->setWhatsThis(tr("Status of outgoing stream to NTRIP broadcaster."));
+  _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[7]->setWhatsThis(tr("Status of outgoing stream to NTRIP broadcaster II."));
 
   layout_status->addWidget(_statusLbl[3], 0, 0);
@@ -452 +455 @@
   layout_status->addWidget(_statusLbl[2], 0, 3);
   layout_status->addWidget(_statusLbl[6], 1, 2);
+  layout_status->addWidget(_statusLbl[7], 1, 3);
   _status->setLayout(layout_status);
 
@@ -648 +652 @@
   connect(_bns, SIGNAL(newEphBytes(int)), this, SLOT(slotEphBytes(int)));
   connect(_bns, SIGNAL(newClkBytes(int)), this, SLOT(slotClkBytes(int)));
-  connect(_bns, SIGNAL(newOutBytes(int)), this, SLOT(slotOutBytes(int)));
+  connect(_bns, SIGNAL(newOutBytes1(int)), this, SLOT(slotOutBytes1(int)));
+  connect(_bns, SIGNAL(newOutBytes2(int)), this, SLOT(slotOutBytes2(int)));
 
   _bns->start();
@@ -661 +666 @@
   updateStatus(1, nBytes);
 }
-void bnsWindow::slotOutBytes(int nBytes) {
+void bnsWindow::slotOutBytes1(int nBytes) {
   updateStatus(2, nBytes);
+}
+void bnsWindow::slotOutBytes2(int nBytes) {
+  updateStatus(3, nBytes);
 }
 

trunk/BNS/bnswindow.h

@@ -44 +44 @@
   void slotEphBytes(int nBytes);
   void slotClkBytes(int nBytes);
-  void slotOutBytes(int nBytes);
+  void slotOutBytes1(int nBytes);
+  void slotOutBytes2(int nBytes);
 
  protected:
@@ -102 +103 @@
 //QWidget*    _status;
   QGroupBox*  _status;
-  QLabel*     _statusLbl[6];  
-  double      _statusCnt[3];
+  QLabel*     _statusLbl[8];  
+  double      _statusCnt[4];
   QMutex      _mutex;