Changeset 6015 in ntrip for trunk/BNC/src

Timestamp:

Aug 20, 2014, 4:46:52 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• PPP/pppInclude.h (modified) (1 diff)
• PPP/pppSatObs.cpp (modified) (1 diff)
• bncantex.cpp (modified) (1 diff)
• bncantex.h (modified) (2 diffs)

trunk/BNC/src/PPP/pppInclude.h

@@ -122 +122 @@
 };
 
-class t_frequency {
- public:
-  enum type {dummy = 0, G1, G2, R1, R2, maxFr};
-
-  static std::string toString(type tt) {
-    if      (tt == G1) return "G1";
-    else if (tt == G2) return "G2";
-    else if (tt == R1) return "R1";
-    else if (tt == R2) return "R2";
-    return std::string();
-  }
-};
-
 class t_lc {
  public:

trunk/BNC/src/PPP/pppSatObs.cpp

@@ -218 +218 @@
   // -------------------------------------------
   if (PPP_CLIENT->antex()) {
-    t_frequency::type frq1 = t_frequency::G1;
-    t_frequency::type frq2 = t_frequency::G2;
-    if (_prn.system() == 'R') {
-      frq1 = t_frequency::R1;
-      frq2 = t_frequency::R2;
-    }
     bool found;
-    _model._antPco1 = PPP_CLIENT->antex()->rcvCorr(frq1, station->antName(),
-                                                _model._eleSat, found);
-    _model._antPco2 = PPP_CLIENT->antex()->rcvCorr(frq2, station->antName(),
-                                                _model._eleSat, found);
+    _model._antPco1 = PPP_CLIENT->antex()->rcvCorr(station->antName(), _model._eleSat, found);
+    _model._antPco2 = _model._antPco1;
   }
 

trunk/BNC/src/bncantex.cpp

@@ -283 +283 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-double bncAntex::rcvCorr(BNC_PPP::t_frequency::type /* frqType */, const std::string& antName,
-               double eleSat, bool& found) const {
+double bncAntex::rcvCorr(const std::string& antName, double eleSat, bool& found) const {
   return pco(QString(antName.c_str()), eleSat, found);
 }

trunk/BNC/src/bncantex.h

@@ -31 +31 @@
 #include "bncconst.h"
 #include "bnctime.h"
-#include "PPP/pppInclude.h"
 
 class bncAntex {
@@ -41 +40 @@
   void print() const;
   double pco(const QString& antName, double eleSat, bool& found) const;
-  double rcvCorr(BNC_PPP::t_frequency::type frqType, const std::string& antName,
-                 double eleSat, bool& found) const;
+  double rcvCorr(const std::string& antName, double eleSat, bool& found) const;
   t_irc  satCoMcorrection(const QString& prn, double Mjd, 
                           const ColumnVector& xSat, ColumnVector& dx);