Changeset 2907 in ntrip

Timestamp:

Jan 27, 2011, 2:17:20 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncapp.cpp (modified) (1 diff)
• bncephuser.cpp (modified) (4 diffs)
• bncwindow.cpp (modified) (1 diff)

trunk/BNC/bncapp.cpp

@@ -117 +117 @@
 #ifdef USE_COMBINATION
   _bncComb = new bncComb();
+  if (_bncComb->nStreams() < 2) {
+    delete _bncComb;
+    _bncComb = 0;
+  }
 #endif
 }

trunk/BNC/bncephuser.cpp

@@ -39 +39 @@
  * -----------------------------------------------------------------------*/
 
+#include <iostream>
+
 #include "bncephuser.h"
 #include "bncapp.h"
@@ -75 +77 @@
   QString prn = QString("G%1").arg(gpseph.satellite, 2, 10, QChar('0'));
 
+  cout << "newEph " << prn.toAscii().data() << endl; 
+
   if (_eph.contains(prn)) {
     t_ephGPS* eLast = static_cast<t_ephGPS*>(_eph.value(prn)->last);
@@ -100 +104 @@
 
   QString prn = QString("R%1").arg(gloeph.almanac_number, 2, 10, QChar('0'));
+
+  cout << "newEph " << prn.toAscii().data() << endl; 
 
   if (_eph.contains(prn)) {
@@ -129 +135 @@
   QString prn = QString("E%1").arg(galeph.satellite, 2, 10, QChar('0'));
 
+  cout << "newEph " << prn.toAscii().data() << endl; 
+
   if (_eph.contains(prn)) {
     t_ephGal* eLast = static_cast<t_ephGal*>(_eph.value(prn)->last);

trunk/BNC/bncwindow.cpp

@@ -532 +532 @@
   _aogroup->addTab(pppgroup,tr("PPP (1)"));
   _aogroup->addTab(ppp2group,tr("PPP (2)"));
+#ifdef USE_COMBINATION
   _aogroup->addTab(cmbgroup,tr("Combination"));
+#endif
 
   // Log Tab