Changeset 1261 in ntrip for trunk/BNS

Timestamp:

Dec 2, 2008, 1:20:42 PM (16 years ago)

Author:

weber

Message:

* empty log message *

Location:

trunk/BNS

Files:

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

trunk/BNS/bns.cpp

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

trunk/BNS/bnscaster.h

@@ -15 +15 @@
   bool usedSocket() const {return _outSocket;}
   bool crdTrafo() const {return _crdTrafo;}
-  int  ic() const {return _ic;}
 
  signals:

trunk/BNS/bnswindow.cpp

@@ -433 +433 @@
   _statusLbl[1] = new QLabel("0 byte(s)"); _statusCnt[1] = 0;
   _statusLbl[2] = new QLabel("0 byte(s)"); _statusCnt[2] = 0;
-  _statusLbl[3] = new QLabel("0 byte(s)"); _statusCnt[3] = 0;
-
-  _statusLbl[7] = new QLabel("RINEX Ephemeris:");  
+  _statusLbl[3] = new QLabel("RINEX Ephemeris:");  
   _statusLbl[4] = new QLabel("Clocks & Orbits:");
   _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."));
   _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[3]->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."));
-
-  layout_status->addWidget(_statusLbl[7], 0, 0);
+  _statusLbl[7]->setWhatsThis(tr("Status of outgoing stream to NTRIP broadcaster II."));
+
+  layout_status->addWidget(_statusLbl[3], 0, 0);
   layout_status->addWidget(_statusLbl[0], 0, 1);
   layout_status->addWidget(_statusLbl[4], 1, 0);
@@ -456 +455 @@
   layout_status->addWidget(_statusLbl[2], 0, 3);
   layout_status->addWidget(_statusLbl[6], 1, 2);
-  layout_status->addWidget(_statusLbl[3], 1, 3);
+  layout_status->addWidget(_statusLbl[7], 1, 3);
   _status->setLayout(layout_status);