Changeset 3027 in ntrip

Timestamp:

Feb 24, 2011, 12:32:17 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncapp.cpp (modified) (1 diff)
• bncapp.h (modified) (2 diffs)
• bncgetthread.cpp (modified) (1 diff)
• combination/bnccomb.cpp (modified) (2 diffs)
• combination/bnccomb.h (modified) (1 diff)

trunk/BNC/bncapp.cpp

@@ -117 +117 @@
     _GLOFreq[ii] = 0;
   }
+
+  _bncPPPclient = 0;
 }
 

trunk/BNC/bncapp.h

@@ -35 +35 @@
 
 class bncComb;
+class bncPPPclient;
 
 class bncApp : public QApplication {
@@ -120 +121 @@
     int                 _GLOFreq[PRN_GLONASS_NUM];
     bncComb*            _bncComb;
+ public:
+    bncPPPclient*       _bncPPPclient;
 };
 #endif

trunk/BNC/bncgetthread.cpp

@@ -282 +282 @@
   if (settings.value("pppMount").toString() == _staID) {
     _PPPclient = new bncPPPclient(_staID);
+    app->_bncPPPclient = _PPPclient;
     qRegisterMetaType<bncTime>("bncTime");
     connect(_PPPclient, SIGNAL(newPosition(bncTime, double, double, double)), 

trunk/BNC/combination/bnccomb.cpp

@@ -24 +24 @@
 #include "bncmodel.h"
 #include "bncutils.h"
+#include "bncpppclient.h"
 
 using namespace std;
@@ -336 +337 @@
   }
 
-  // Emit new Corrections
-  // --------------------
-  co.messageType = COTYPE_GPSCOMBINED;
-  QStringList asciiLines = 
-    RTCM3coDecoder::corrsToASCIIlines(resTime.gpsw(), resTime.gpssec(), co, 0);
-
-  long coTime = resTime.gpsw() * 7*24*3600 + long(floor(resTime.gpssec()+0.5));
-  QStringListIterator il(asciiLines);
-  while (il.hasNext()) {
-    QString line = il.next();
-    emit newCorrLine(line, _caster->mountpoint(), coTime);
+  // Optionall send new Corrections to PPP client
+  // --------------------------------------------
+  bncApp* app = (bncApp*) qApp;
+  if (app->_bncPPPclient) {
+    QStringList corrLines;
+    co.messageType = COTYPE_GPSCOMBINED;
+    QStringListIterator il(RTCM3coDecoder::corrsToASCIIlines(resTime.gpsw(), 
+                                                  resTime.gpssec(), co, 0));
+    while (il.hasNext()) {
+      QString line = il.next() + " " + _caster->mountpoint();
+      corrLines << line;
+    }
+
+    app->_bncPPPclient->slotNewCorrections(corrLines);
   }
 }

trunk/BNC/combination/bnccomb.h

@@ -34 +34 @@
  signals:
   void newMessage(QByteArray msg, bool showOnScreen);
-  void newCorrLine(QString line, QString staID, long coTime);
 
  private: