Changeset 7972 in ntrip

Timestamp:

Jun 29, 2016, 3:04:13 PM (8 years ago)

Author:

stuerze

Message:

consideration of provider ID changes in SSR correction streams during PPP processing

Location:

trunk/BNC/src

Files:

• PPP/pppClient.cpp (modified) (3 diffs)
• PPP/pppClient.h (modified) (2 diffs)
• PPP_SSR_I/pppClient.cpp (modified) (1 diff)
• PPP_SSR_I/pppClient.h (modified) (1 diff)
• pppRun.cpp (modified) (2 diffs)
• pppRun.h (modified) (1 diff)

trunk/BNC/src/PPP/pppClient.cpp

@@ -63 +63 @@
     _antex = 0;
   }
-
+/*
+  if (!_opt->_blqFileName.empty()) {
+    _loading = new t_loading(_opt->_blqFileName.c_str());
+  }
+  else {
+    _loading = 0;
+  }
+*/
   CLIENTS.setLocalData(this);  // CLIENTS takes ownership over "this"
 }
@@ -80 +87 @@
   delete _filter;
   delete _tides;
+  /*
+  if (_loading) {
+    delete _loading;
+  }
+  */
   clearObs();
 }
@@ -565 +577 @@
 }
 
+//
+//////////////////////////////////////////////////////////////////////////////
+void t_pppClient::reset() {
+
+  // to delete all parameters
+  delete _filter;
+  _filter   = new t_pppFilter();
+
+  // to delete old orbit and clock corrections
+  delete _ephPool;
+  _ephPool  = new t_pppEphPool();
+
+  // to delete old code biases
+  delete _obsPool;
+  _obsPool  = new t_pppObsPool();
+}

trunk/BNC/src/PPP/pppClient.h

@@ -45 +45 @@
   static t_pppClient* instance();
 
+  void reset();
+
  private:
   void initOutput(t_output* output);
@@ -69 +71 @@
   t_pppOptions*             _opt;
   t_tides*                  _tides;
+//  t_loading*                _loading;
 };
 

trunk/BNC/src/PPP_SSR_I/pppClient.cpp

@@ -428 +428 @@
   return failure;
 }
+
+//
+////////////////////////////////////////////////////////////////////////////
+void t_pppClient::reset() {
+
+  // to delete all parameters
+  delete _filter;
+  _filter   = new t_pppFilter(this);
+
+  // to delete old orbit and clock corrections
+  delete _ephUser;
+  _ephUser  = new bncEphUser(false);
+
+  // to delete old code biases
+  delete _pppUtils;
+  _pppUtils = new t_pppUtils();
+
+}

trunk/BNC/src/PPP_SSR_I/pppClient.h

@@ -52 +52 @@
   std::ostringstream& log() {return *_log;}
   const t_pppOptions* opt() const {return _opt;}
+  void                reset();
 
  private:

trunk/BNC/src/pppRun.cpp

@@ -122 +122 @@
     connect(BNC_CMB, SIGNAL(newClkCorrections(QList<t_clkCorr>)),
             this, SLOT(slotNewClkCorrections(QList<t_clkCorr>)),conType);
+            
+    connect(BNC_CORE, SIGNAL(providerIDChanged(QString)),
+            this, SLOT(slotProviderIDChanged(QString)));
   }
   else {
@@ -678 +681 @@
   return '$' + nmStr + QString("*%1\n").arg(int(XOR), 0, 16).toUpper();
 }
+
+//
+////////////////////////////////////////////////////////////////////////////
+void t_pppRun::slotProviderIDChanged(QString mountPoint) {
+  QMutexLocker locker(&_mutex);
+
+  if (mountPoint.toStdString() !=_opt->_corrMount) {
+    return;
+  }
+
+  QString msg = "pppRun " + QString(_opt->_roverName.c_str()) + ": Provider Changed: " + mountPoint;
+  emit newMessage(msg.toAscii(), true);
+
+  _pppClient->reset();
+
+  while (!_epoData.empty()) {
+    delete _epoData.front();
+    _epoData.pop_front();
+  }
+}

trunk/BNC/src/pppRun.h

@@ -48 +48 @@
   void slotSetSpeed(int speed);
   void slotSetStopFlag();
+  void slotProviderIDChanged(QString mountPoint);
 
  private: