Changeset 6055 in ntrip for trunk

Timestamp:

Sep 7, 2014, 8:48:53 AM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP_free

Files:

• bncmodel.cpp (modified) (1 diff)
• bncmodel.h (modified) (3 diffs)
• bncpppclient.cpp (modified) (11 diffs)
• bncpppclient.h (modified) (5 diffs)

trunk/BNC/src/PPP_free/bncmodel.cpp

@@ -54 +54 @@
 #include "pppopt.h"
 
+using namespace BNC_PPP;
 using namespace std;
 

trunk/BNC/src/PPP_free/bncmodel.h

@@ -36 +36 @@
 class t_satData;
 class bncAntex;
-class t_pppOpt;
+
+namespace BNC_PPP {
+
+class t_pppOptions;
 class bncPPPclient;
 
@@ -143 +146 @@
 
   bncPPPclient*         _pppClient;
-  const t_pppOpt*       _opt;
+  const t_pppOptions*   _opt;
   bncTime               _time;
   bncTime               _lastTimeOK;
@@ -165 +168 @@
 };
 
+}
+
 #endif

trunk/BNC/src/PPP_free/bncpppclient.cpp

@@ -48 +48 @@
 #include "bncconst.h"
 #include "bncmodel.h"
-#include "pppopt.h"
-
+#include "pppOptions.h"
+
+using namespace BNC_PPP;
 using namespace std;
 
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-bncPPPclient::bncPPPclient(QByteArray staID, t_pppOpt* opt, bool connectSlots) :
+bncPPPclient::bncPPPclient(QByteArray staID, t_pppOptions* opt, bool connectSlots) :
   bncEphUser(connectSlots) {
 
@@ -62 +63 @@
   }
   else {
-    _opt      = new t_pppOpt();
+    _opt      = new t_pppOptions();
     _optOwner = true;
   }
@@ -111 +112 @@
 
   if      (obs.satSys == 'R') {
-    if (!_opt->useGlonass) return;
+    if (!_opt->useSystem('R')) return;
   }
   else if (obs.satSys == 'E') {
-    if (!_opt->useGalileo) return;
+    if (!_opt->useSystem('E')) return;
   }
   else if (obs.satSys != 'G') {
@@ -210 +211 @@
     if (satData->P1 != 0.0 && satData->P2 != 0.0 && 
         satData->L1 != 0.0 && satData->L2 != 0.0 ) {
-      double f1 = t_CST::f1(obs.satSys, obs.slotNum);
-      double f2 = t_CST::f2(obs.satSys, obs.slotNum);
+      t_frequency::type fType1 = t_lc::toFreq(obs.satSys,t_lc::l1);
+      t_frequency::type fType2 = t_lc::toFreq(obs.satSys,t_lc::l2);
+      double f1 = t_CST::freq(fType1, obs.slotNum);
+      double f2 = t_CST::freq(fType2, obs.slotNum);
       double a1 =   f1 * f1 / (f1 * f1 - f2 * f2);
       double a2 = - f2 * f2 / (f1 * f1 - f2 * f2);
@@ -235 +238 @@
     if (satData->P1 != 0.0 && satData->P5 != 0.0 && 
         satData->L1 != 0.0 && satData->L5 != 0.0 ) {
-      double f1 = t_CST::freq1;
-      double f5 = t_CST::freq5;
+      double f1 = t_CST::freq(t_frequency::E1, 0);
+      double f5 = t_CST::freq(t_frequency::E5, 0);
       double a1 =   f1 * f1 / (f1 * f1 - f5 * f5);
       double a5 = - f5 * f5 / (f1 * f1 - f5 * f5);
@@ -259 +262 @@
   // Check the Mountpoint (source of corrections)
   // --------------------------------------------
-  if (!_opt->pppCorrMount.isEmpty()) {
+  if (!_opt->_corrMount.empty()) {
     QMutableListIterator<QString> itm(corrList);
     while (itm.hasNext()) {
@@ -265 +268 @@
       if (hlp.size() > 0) {
         QString mountpoint = hlp[hlp.size()-1];
-        if (mountpoint != _opt->pppCorrMount) {
+        if (mountpoint != QString(_opt->_corrMount.c_str())) {
           itm.remove();     
         }
@@ -323 +326 @@
   if (_eph.contains(prn)) {
 
-    if (_opt->pppMode && prn[0] != 'E') {
+    if (_opt->useOrbClkCorr() && prn[0] != 'E') {
       if (_corr.contains(prn)) {
         t_corr* cc = _corr.value(prn);
@@ -514 +517 @@
     // No corrections yet, skip the epoch
     // ----------------------------------
-    if (_opt->corrSync != 0.0 && !_corr_tt.valid()) {
+    if (_opt->useOrbClkCorr() && !_corr_tt.valid()) {
       return;
     }
@@ -520 +523 @@
     // Process the front epoch
     // -----------------------
-    if (_opt->corrSync == 0 || frontEpoData->tt - _corr_tt < _opt->corrSync) {
+    if (_opt->_corrWaitTime == 0.0 || frontEpoData->tt - _corr_tt >= _opt->_corrWaitTime) {
       processFrontEpoch();
       delete _epoData.front();
@@ -536 +539 @@
   QMutexLocker locker(&_mutex);
 
-  if (mountPoint != _opt->pppCorrMount) {
+  if (mountPoint != QString(_opt->_corrMount.c_str())) {
     return;
   }

trunk/BNC/src/PPP_free/bncpppclient.h

@@ -28 +28 @@
 #include <queue>
 #include "bncephuser.h"
-#include "RTCM/GPSDecoder.h"
+#include "GPSDecoder.h"
 
+
+namespace BNC_PPP {
+  
 class bncModel;
-class t_pppOpt;
+class t_pppOptions;
 
 class t_satData {
@@ -117 +120 @@
 
  public:
-  bncPPPclient(QByteArray staID, t_pppOpt* opt = 0, bool connectSlots = true);
+  bncPPPclient(QByteArray staID, t_pppOptions* opt = 0, bool connectSlots = true);
   ~bncPPPclient();
   void putNewObs(const t_obs& pp);
@@ -123 +126 @@
                          ColumnVector& vv);
   QByteArray staID() const {return _staID;}
-  const t_pppOpt* opt() const {return _opt;}
+  const t_pppOptions* opt() const {return _opt;}
   void emitNewMessage(QByteArray msg, bool showOnScreen) {
     emit newMessage(msg, showOnScreen);
@@ -160 +163 @@
   t_irc cmpToT(t_satData* satData);
 
-  t_pppOpt*               _opt;
+  t_pppOptions*           _opt;
   bool                    _optOwner;
   QByteArray              _staID;
@@ -171 +174 @@
 };
 
+}
+
 #endif