Changeset 2711 in ntrip for trunk/BNC/bncpppclient.cpp

Timestamp:

Nov 18, 2010, 1:38:51 PM (13 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/bncpppclient.cpp (modified) (10 diffs)

trunk/BNC/bncpppclient.cpp

@@ -119 +119 @@
 //
 ////////////////////////////////////////////////////////////////////////////
-void bncPPPclient::putNewObs(t_obs* obs) {
+void bncPPPclient::putNewObs(const t_obs& obs) {
   QMutexLocker locker(&_mutex);
 
-  if (obs->satSys != 'G' && !_useGlonass) {
+  if (obs.satSys != 'G' && !_useGlonass) {
     return;
   }
@@ -130 +130 @@
   // Satellite Number
   // ----------------
-  if      (obs->satSys == 'G') {
-    QString prn = QString("G%1").arg(obs->satNum, 2, 10, QChar('0'));
+  if      (obs.satSys == 'G') {
+    QString prn = QString("G%1").arg(obs.satNum, 2, 10, QChar('0'));
     satData->prn = prn;
   }
-  else if (obs->satSys == 'R') {
-    QString prn = QString("R%1").arg(obs->satNum, 2, 10, QChar('0'));
+  else if (obs.satSys == 'R') {
+    QString prn = QString("R%1").arg(obs.satNum, 2, 10, QChar('0'));
     satData->prn = prn;
   }
@@ -142 +142 @@
   // -----------
   slipInfo& sInfo  = _slips[satData->prn];
-  if ( sInfo.slipCntL1 == obs->slip_cnt_L1  &&
-       sInfo.slipCntL2 == obs->slip_cnt_L2 ) {
+  if ( sInfo.slipCntL1 == obs.slip_cnt_L1  &&
+       sInfo.slipCntL2 == obs.slip_cnt_L2 ) {
     satData->slipFlag = false;
   }
@@ -149 +149 @@
     satData->slipFlag = true;
   }
-  sInfo.slipCntL1 = obs->slip_cnt_L1;
-  sInfo.slipCntL2 = obs->slip_cnt_L2;
+  sInfo.slipCntL1 = obs.slip_cnt_L1;
+  sInfo.slipCntL2 = obs.slip_cnt_L2;
 
   // Handle Code Biases
@@ -161 +161 @@
   // Set Code Observations
   // ---------------------  
-  if      (obs->P1) {
-    satData->P1         = obs->P1 + (bb ? bb->p1 : 0.0);
+  if      (obs.P1) {
+    satData->P1         = obs.P1 + (bb ? bb->p1 : 0.0);
     satData->codeTypeF1 = t_satData::P_CODE;
   }
-  else if (obs->C1) {
-    satData->P1         = obs->C1 + (bb ? bb->c1 : 0.0);
+  else if (obs.C1) {
+    satData->P1         = obs.C1 + (bb ? bb->c1 : 0.0);
     satData->codeTypeF1 = t_satData::C_CODE;
   }
@@ -174 +174 @@
   }
     
-  if      (obs->P2) {
-    satData->P2         = obs->P2 + (bb ? bb->p2 : 0.0);
+  if      (obs.P2) {
+    satData->P2         = obs.P2 + (bb ? bb->p2 : 0.0);
     satData->codeTypeF2 = t_satData::P_CODE;
   }
-  else if (obs->C2) {
-    satData->P2         = obs->C2;
+  else if (obs.C2) {
+    satData->P2         = obs.C2;
     satData->codeTypeF2 = t_satData::C_CODE;
   }
@@ -190 +190 @@
   double f2 = t_CST::freq2;
 
-  if (obs->satSys == 'R') {
-    f1 = 1602000000.0 + 562500.0 * obs->slotNum; 
-    f2 = 1246000000.0 + 437500.0 * obs->slotNum;
+  if (obs.satSys == 'R') {
+    f1 = 1602000000.0 + 562500.0 * obs.slotNum; 
+    f2 = 1246000000.0 + 437500.0 * obs.slotNum;
   }
 
@@ -204 +204 @@
   // Set Phase Observations
   // ----------------------  
-  if (obs->L1() && obs->L2()) {
-    satData->L1 = obs->L1() * t_CST::c / f1;
-    satData->L2 = obs->L2() * t_CST::c / f2;
+  if (obs.L1() && obs.L2()) {
+    satData->L1 = obs.L1() * t_CST::c / f1;
+    satData->L2 = obs.L2() * t_CST::c / f2;
   }
   else {
@@ -220 +220 @@
   // Add new Satellite to the epoch
   // ------------------------------
-  bncTime tt(obs->GPSWeek, obs->GPSWeeks);
+  bncTime tt(obs.GPSWeek, obs.GPSWeeks);
   
   if      (!_epoData) {
@@ -233 +233 @@
   }
 
-  if      (obs->satSys == 'G') {
+  if      (obs.satSys == 'G') {
     _epoData->satDataGPS[satData->prn] = satData;
   }
-  else if (obs->satSys == 'R') {
+  else if (obs.satSys == 'R') {
     _epoData->satDataGlo[satData->prn] = satData;
   }