Changeset 6135 in ntrip for trunk/BNC/src

Timestamp:

Sep 13, 2014, 9:04:30 AM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• PPP/pppClient.h (modified) (1 diff)
• PPP/pppSatObs.h (modified) (2 diffs)
• pppInclude.h (modified) (2 diffs)
• satObs.h (added)

trunk/BNC/src/PPP/pppClient.h

@@ -8 +8 @@
 #include "pppOptions.h"
 #include "pppModel.h"
+#include "satObs.h"
 
 class bncAntex;

trunk/BNC/src/PPP/pppSatObs.h

@@ -1 @@
-#ifndef SATOBS_H
-#define SATOBS_H
+#ifndef PPPSATOBS_H
+#define PPPSATOBS_H
 
 #include <string>
@@ -6 +6 @@
 #include <newmat.h>
 #include "pppInclude.h"
+#include "satObs.h"
 #include "bnctime.h"
 

trunk/BNC/src/pppInclude.h

@@ -10 +10 @@
 #include "ephemeris.h"
 #include "t_prn.h"
+#include "satObs.h"
 
 namespace BNC_PPP {
@@ -34 +35 @@
   std::string  _log;          
   bool         _error;        
-};
-
-class t_frqObs  {
- public:
-  t_frqObs() {
-    _code            = 0.0;          
-    _codeValid       = false;     
-    _phase           = 0.0;         
-    _phaseValid      = false;    
-    _doppler         = 0.0;       
-    _dopplerValid    = false;  
-    _snr             = 0.0;           
-    _snrValid        = false;      
-    _slip            = false;          
-    _slipCounter     = 0;   
-    _biasJumpCounter = 0;
-  }
-  std::string       _rnxType2ch; 
-  double            _code;          
-  bool              _codeValid;     
-  double            _phase;         
-  bool              _phaseValid;    
-  double            _doppler;       
-  bool              _dopplerValid;  
-  double            _snr;           
-  bool              _snrValid;      
-  bool              _slip;          
-  int               _slipCounter;   
-  int               _biasJumpCounter;
-};
-
-class t_satObs {
- public:
-  t_satObs() {}
-  ~t_satObs() {for (unsigned ii = 0; ii < _obs.size(); ii++) delete _obs[ii];}
-  t_prn                  _prn;
-  bncTime                _time;
-  std::vector<t_frqObs*> _obs;
 };