Changeset 4264 in ntrip

Timestamp:

Jun 22, 2012, 11:23:02 AM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• RTCM/GPSDecoder.h (modified) (1 diff)
• bncpppclient.cpp (modified) (6 diffs)
• bncrinex.cpp (modified) (1 diff)

trunk/BNC/RTCM/GPSDecoder.h

@@ -71 +71 @@
   ~t_obs() {}
 
-  double L1() const {return (L1P != 0.0 ? L1P : L1C);}
-  double L2() const {return (L2P != 0.0 ? L2P : L2C);}
-  double S1() const {return (L1P != 0.0 ? S1P : S1C);}
-  double S2() const {return (L2P != 0.0 ? S2P : S2C);}
+  double p1() const {return (P1  != 0.0 ? P1  : C1);}
+  double p2() const {return (P2  != 0.0 ? P2  : C2);}
+  double l1() const {return (L1P != 0.0 ? L1P : L1C);}
+  double l2() const {return (L2P != 0.0 ? L2P : L2C);}
+  double s1() const {return (L1P != 0.0 ? S1P : S1C);}
+  double s2() const {return (L2P != 0.0 ? S2P : S2C);}
 
   char   StatID[20+1]; // Station ID

trunk/BNC/bncpppclient.cpp

@@ -160 +160 @@
   // --------------------
   if      (obs.satSys == 'G') {
-    if ( (obs.P1 || obs.C1) && (obs.P2 || obs.C2) && obs.L1() && obs.L2() ) {
+    if ( (obs.P1 || obs.C1) && (obs.P2 || obs.C2) && obs.l1() && obs.l2() ) {
       double f1 = t_CST::freq1;
       double f2 = t_CST::freq2;
@@ -177 +177 @@
         satData->P2 = obs.C2;
       }
-      satData->L1      = obs.L1() * t_CST::c / f1;
-      satData->L2      = obs.L2() * t_CST::c / f2;
+      satData->L1      = obs.l1() * t_CST::c / f1;
+      satData->L2      = obs.l2() * t_CST::c / f2;
       satData->P3      = c1 * satData->P1 + c2 * satData->P2;
       satData->L3      = c1 * satData->L1 + c2 * satData->L2;
@@ -193 +193 @@
   // ------------------------
   else if (obs.satSys == 'R') {
-    if ( (obs.P1 || obs.C1) && (obs.P2 || obs.C2) && obs.L1() && obs.L2() ) {
+    if ( (obs.P1 || obs.C1) && (obs.P2 || obs.C2) && obs.l1() && obs.l2() ) {
       double f1 = 1602000000.0 + 562500.0 * obs.slotNum; 
       double f2 = 1246000000.0 + 437500.0 * obs.slotNum;
@@ -210 +210 @@
         satData->P2 = obs.C2;
       }
-      satData->L1      = obs.L1() * t_CST::c / f1;
-      satData->L2      = obs.L2() * t_CST::c / f2;
+      satData->L1      = obs.l1() * t_CST::c / f1;
+      satData->L2      = obs.l2() * t_CST::c / f2;
       satData->P3      = c1 * satData->P1 + c2 * satData->P2;
       satData->L3      = c1 * satData->L1 + c2 * satData->L2;
@@ -226 +226 @@
   // ------------------------
   else if (obs.satSys == 'E') {
-    if ( obs.C1 && obs.C5 && obs.L1() && obs.L5) {
+    if ( obs.C1 && obs.C5 && obs.l1() && obs.L5) {
       double f1 = t_CST::freq1;
       double f5 = t_CST::freq5;
@@ -234 +234 @@
       satData->P1      = obs.C1;
       satData->P5      = obs.C5;
-      satData->L1      = obs.L1() * t_CST::c / f1;
+      satData->L1      = obs.l1() * t_CST::c / f1;
       satData->L5      = obs.L5 * t_CST::c / f5;
       satData->P3      = c1 * satData->P1 + c5 * satData->P5;

trunk/BNC/bncrinex.cpp

@@ -655 +655 @@
       _out << setw(14) << setprecision(3) << obs.C1    << ' '  << ' '
            << setw(14) << setprecision(3) << obs.P1    << ' '  << ' '
-           << setw(14) << setprecision(3) << obs.L1()  << lli1 << ' '
-           << setw(14) << setprecision(3) << obs.S1()  << ' '  << ' '
+           << setw(14) << setprecision(3) << obs.l1()  << lli1 << ' '
+           << setw(14) << setprecision(3) << obs.s1()  << ' '  << ' '
            << setw(14) << setprecision(3) << obs.C2    << ' '  << ' ' << endl
            << setw(14) << setprecision(3) << obs.P2    << ' '  << ' ' 
-           << setw(14) << setprecision(3) << obs.L2()  << lli2 << ' '
-           << setw(14) << setprecision(3) << obs.S2()  << endl;
+           << setw(14) << setprecision(3) << obs.l2()  << lli2 << ' '
+           << setw(14) << setprecision(3) << obs.s2()  << endl;
     }
   }