Changeset 2865 in ntrip for trunk/BNC

Timestamp:

Jan 22, 2011, 12:52:25 PM (14 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncapp.cpp (modified) (4 diffs)
• bncapp.h (modified) (2 diffs)
• bnccomb.cpp (modified) (3 diffs)
• bnccomb.h (modified) (2 diffs)

trunk/BNC/bncapp.cpp

@@ -48 +48 @@
 #include "bncsettings.h" 
 #include "bncversion.h" 
+#include "bnccomb.h" 
 
 using namespace std;
@@ -110 +111 @@
     _GLOFreq[ii] = 0;
   }
+
+  _bncComb = new bncComb();
 }
 
@@ -142 +145 @@
 
   delete _rawFile;
+
+  delete _bncComb;
 }
 
@@ -749 +754 @@
     emit( newMessage(line.toAscii(), true) );
     return;
+  }
+
+  // Combination of Corrections
+  // --------------------------
+  if (_bncComb) {
+    _bncComb->processCorrLine(staID, line);
   }
 

trunk/BNC/bncapp.h

@@ -33 +33 @@
 #include "bncrawfile.h"
 #include "RTCM3/RTCM3Decoder.h"
+
+class bncComb;
 
 class bncApp : public QApplication {
@@ -116 +118 @@
     bncRawFile*         _rawFile;
     int                 _GLOFreq[PRN_GLONASS_NUM];
+    bncComb*            _bncComb;
 };
 #endif

trunk/BNC/bnccomb.cpp

@@ -39 +39 @@
  * -----------------------------------------------------------------------*/
 
+#include <iostream>
+
 #include "bnccomb.h"
 #include "bncapp.h"
@@ -47 +49 @@
 ////////////////////////////////////////////////////////////////////////////
 bncComb::bncComb() {
-  connect(((bncApp*)qApp), SIGNAL(newCorrections(QList<QString>)),
-          this, SLOT(slotNewCorrections(QList<QString>)));
 }
 
@@ -58 +58 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void bncComb::slotNewCorrections(QList<QString> corrList) {
-  QMutexLocker locker(&_mutex);
-
-  if (corrList.size() == 0) {
-    return;
-  }
-
+void bncComb::processCorrLine(const QString& staID, const QString& line) {
+  ///  cout << staID.toAscii().data() << " " << line.toAscii().data() << endl;
 }
 

trunk/BNC/bnccomb.h

@@ -34 +34 @@
   bncComb();
   ~bncComb();
+  void processCorrLine(const QString& staID, const QString& line);
 
  public slots:
-  void slotNewCorrections(QList<QString> corrList);
 
  signals:
@@ -42 +42 @@
 
  private:
-  QMutex                  _mutex;
 };