Changeset 7299 in ntrip

Timestamp:

Sep 23, 2015, 5:21:35 PM (9 years ago)

Author:

stuerze

Message:

some additions, to allow PPP with the internal combination result

Location:

trunk/BNC/src

Files:

• combination/bnccomb.cpp (modified) (3 diffs)
• combination/bnccomb.h (modified) (2 diffs)
• pppRun.cpp (modified) (3 diffs)

trunk/BNC/src/combination/bnccomb.cpp

@@ -123 +123 @@
 
   return outStr;
+}
+
+// Singleton
+////////////////////////////////////////////////////////////////////////////
+bncComb* bncComb::instance() {
+  static bncComb _bncComb;
+  return &_bncComb;
 }
 
@@ -857 +864 @@
       for (int iPar = 1; iPar <= _params.size(); iPar++) {
         cmbParam* pp = _params[iPar-1];
-        if ( AA.Column(iPar).maximum_absolute_value() > 0.0 &&
+        if ( pp &&
+             AA.Column(iPar).maximum_absolute_value() > 0.0 &&
              pp->type == cmbParam::offACSat                 &&
              pp->prn == prn) {
@@ -871 +879 @@
 //        for (int iPar = 1; iPar <= _params.size(); iPar++) {
 //          cmbParam* pp = _params[iPar-1];
-//          if ( AA.Column(iPar).maximum_absolute_value() > 0.0 &&
+//          if ( pp &&
+//               AA.Column(iPar).maximum_absolute_value() > 0.0 &&
 //               pp->type == cmbParam::offACSat                 &&
 //               pp->prn == prn) {

trunk/BNC/src/combination/bnccomb.h

@@ -17 +17 @@
   bncComb();
   virtual ~bncComb();
+  static bncComb* instance();
   int  nStreams() const {return _ACs.size();}
 
@@ -127 +128 @@
 };
 
+#define BNC_CMB (bncComb::instance())
+
 #endif

trunk/BNC/src/pppRun.cpp

@@ -57 +57 @@
 #include "rinex/rnxnavfile.h"
 #include "rinex/corrfile.h"
+#include "combination/bnccomb.h"
 
 using namespace BNC_PPP;
@@ -115 +116 @@
     connect(BNC_CORE, SIGNAL(newPhaseBiases(QList<t_satPhaseBias>)),
             this, SLOT(slotNewPhaseBiases(QList<t_satPhaseBias>)),conType);
+
+    connect(BNC_CMB, SIGNAL(newOrbCorrections(QList<t_orbCorr>)),
+            this, SLOT(slotNewOrbCorrections(QList<t_orbCorr>)),conType);
+
+    connect(BNC_CMB, SIGNAL(newClkCorrections(QList<t_clkCorr>)),
+            this, SLOT(slotNewClkCorrections(QList<t_clkCorr>)),conType);
   }
   else {
@@ -369 +376 @@
   }
 
-  if (_opt->_realTime) {
+  if (_opt->_realTime) { qDebug() << clkCorr[0]._staID.c_str();
     if (_opt->_corrMount.empty() || _opt->_corrMount != clkCorr[0]._staID) {
       return;