Changeset 6018 in ntrip for trunk/BNC

Timestamp:

Aug 21, 2014, 9:02:57 AM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP

Files:

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

trunk/BNC/src/PPP/pppInclude.h

@@ -38 +38 @@
  public:
   t_frqObs() {
+    _freqType        = t_frequency::dummy;
     _freq            = 0.0;
     _code            = 0.0;          
@@ -51 +52 @@
     _biasJumpCounter = 0;
   }
-  std::string _rnxType2ch; 
-  double      _freq;
-  double      _code;          
-  bool        _codeValid;     
-  double      _phase;         
-  bool        _phaseValid;    
-  double      _doppler;       
-  bool        _dopplerValid;  
-  double      _snr;           
-  bool        _snrValid;      
-  bool        _slip;          
-  int         _slipCounter;   
-  int         _biasJumpCounter;
+  std::string       _rnxType2ch; 
+  t_frequency::type _freqType;
+  double            _freq;
+  double            _code;          
+  bool              _codeValid;     
+  double            _phase;         
+  bool              _phaseValid;    
+  double            _doppler;       
+  bool              _dopplerValid;  
+  double            _snr;           
+  bool              _snrValid;      
+  bool              _slip;          
+  int               _slipCounter;   
+  int               _biasJumpCounter;
 };
 

trunk/BNC/src/PPP/pppSatObs.cpp

@@ -95 +95 @@
           if (obs->_rnxType2ch == obsType && obs->_codeValid && obs->_phaseValid) {
             _obs[iFreq] = new t_frqObs(*obs);
+            _obs[iFreq]->_freqType = t_frequency::type(iFreq);
           }
         }

trunk/BNC/src/PPP/pppSatObs.h

@@ -16 +16 @@
   t_pppSatObs(const t_satObs& satObs);
   ~t_pppSatObs();
+  bool                isValid() const;
   const t_prn&        prn() const {return _prn;}
   const ColumnVector& xc() const {return _xcSat;}
@@ -28 +29 @@
   bool                modelSet() const {return _model._set;}
   void                printModel() const;
-  double              lc(t_lc::type tLC, double L1, double L2, 
-                         double C1, double C2, ColumnVector* coeff = 0) const;
+  double              lc(t_lc::type tLC); 
   double              lambda(t_lc::type tLC) const;
   double              sigma(t_lc::type tLC) const;