Changeset 6082 in ntrip for trunk/BNC/src/PPP_free

Timestamp:

Sep 7, 2014, 6:22:27 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP_free

Files:

• bncpppclient.cpp (modified) (2 diffs)
• bncpppclient.h (modified) (3 diffs)
• pppClient.cpp (modified) (2 diffs)

trunk/BNC/src/PPP_free/bncpppclient.cpp

@@ -221 +221 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void bncPPPclient::putNewCorrections(QList<QString> corrList) {
+void bncPPPclient::putOrbCorrections(const std::vector<t_orbCorr*>& corr) {
   QMutexLocker locker(&_mutex);
-
-  // Check the Mountpoint (source of corrections)
-  // --------------------------------------------
-  if (!_opt->_corrMount.empty()) {
-    QMutableListIterator<QString> itm(corrList);
-    while (itm.hasNext()) {
-      QStringList hlp = itm.next().split(" ");
-      if (hlp.size() > 0) {
-        QString mountpoint = hlp[hlp.size()-1];
-        if (mountpoint != QString(_opt->_corrMount.c_str())) {
-          itm.remove();     
-        }
-      }
-    }
-  }
-
-  if (corrList.size() == 0) {
-    return;
-  }
-
-  QListIterator<QString> it(corrList);
-  while (it.hasNext()) {
-    QString line = it.next();
-
-    QTextStream in(&line);
-    int     messageType;
-    int     updateInterval;
-    int     GPSweek;
-    double  GPSweeks;
-    QString prn;
-    in >> messageType >> updateInterval >> GPSweek >> GPSweeks >> prn;
-
-    if ( t_corr::relevantMessageType(messageType) ) {
-      t_corr* cc = 0;
-      if (_corr.contains(prn)) {
-        cc = _corr.value(prn); 
-      }
-      else {
-        cc = new t_corr();
-        _corr[prn] = cc;
-      }
-      cc->readLine(line);
-      _corr_tt = cc->tClk;
-    }
-    else if ( messageType == BTYPE_GPS || messageType == BTYPE_GLONASS ) { 
-      t_bias* bb = 0;
-      if (_bias.contains(prn)) {
-        bb = _bias.value(prn);
-      }
-      else {
-        bb = new t_bias();
-        _bias[prn] = bb;
-      }
-      bb->readLine(line);
-    }
-  }
+}
+
+// 
+////////////////////////////////////////////////////////////////////////////
+void bncPPPclient::putClkCorrections(const std::vector<t_clkCorr*>& corr) {
+  QMutexLocker locker(&_mutex);
 }
 
@@ -298 +248 @@
 }
 
-// 
-////////////////////////////////////////////////////////////////////////////
-t_irc bncPPPclient::applyCorr(const bncTime& tt, const t_corr* cc, 
-                              ColumnVector& xc, ColumnVector& vv) {
-
-  double dtRao = tt - cc->tRao;
-
-  // Position
-  // --------
-  ColumnVector raoHlp = cc->rao + cc->dotRao * dtRao;
-
-  if (raoHlp.norm_Frobenius() > 20.0) {
-    return failure;
-  }
-
-  ColumnVector dx(3);
-  RSW_to_XYZ(xc.Rows(1,3), vv, raoHlp, dx);
-  xc[0] -= dx[0];
-  xc[1] -= dx[1];
-  xc[2] -= dx[2];
-
-  // Velocity
-  // --------
-  ColumnVector dotRaoHlp = cc->dotRao;
-
-  ColumnVector dv(3);
-  RSW_to_XYZ(xc.Rows(1,3), vv, dotRaoHlp, dv);
-  vv[0] -= dv[0];
-  vv[1] -= dv[1];
-  vv[2] -= dv[2];
-
-  // Clocks
-  // ------
-  double dtClk = tt - cc->tClk;
-
-  xc[3] += cc->dClk + cc->dotDClk * dtClk + cc->dotDotDClk * dtClk * dtClk
-        + cc->hrClk;
-
-  return success;
-}
-
 // Correct Time of Transmission
 ////////////////////////////////////////////////////////////////////////////

trunk/BNC/src/PPP_free/bncpppclient.h

@@ -39 +39 @@
 class t_epoData;
 class t_output;
+class t_orbCorr;
+class t_clkCorr;
 
 class bncPPPclient : public bncEphUser {
@@ -45 +47 @@
   ~bncPPPclient();
   void                processEpoch(const std::vector<t_satObs*>& satObs, t_output* output);
-  void                putNewCorrections(QList<QString> corrList);
+  void                putOrbCorrections(const std::vector<t_orbCorr*>& corr); 
+  void                putClkCorrections(const std::vector<t_clkCorr*>& corr); 
   QByteArray          staID() const {return _staID;}
   const t_pppOptions* opt() const {return _opt;}
@@ -66 +69 @@
   void  putNewObs(t_satData* satData);
   t_irc cmpToT(t_satData* satData);
-  static t_irc applyCorr(const bncTime& tt, const t_corr* cc, ColumnVector& xc, ColumnVector& vv);
 
   const t_pppOptions*     _opt;

trunk/BNC/src/PPP_free/pppClient.cpp

@@ -103 +103 @@
 //////////////////////////////////////////////////////////////////////////////
 void t_pppClient::putOrbCorrections(const vector<t_orbCorr*>& corr) {
+  _client->putOrbCorrections(corr);
 }
 
@@ -108 +109 @@
 //////////////////////////////////////////////////////////////////////////////
 void t_pppClient::putClkCorrections(const vector<t_clkCorr*>& corr) {
+  _client->putClkCorrections(corr);
 }