Changeset 5825 in ntrip

Timestamp:

Aug 6, 2014, 1:31:33 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP

Files:

• pppClient.cpp (modified) (1 diff)
• pppInclude.h (modified) (2 diffs)
• pppMain.cpp (modified) (2 diffs)
• pppThread.cpp (modified) (2 diffs)

trunk/BNC/src/PPP/pppClient.cpp

@@ -444 +444 @@
     return finish(failure);
   }
-  catch (pppExcept msg) {
+  catch (t_except msg) {
     LOG << msg.what() << endl;
     return finish(failure);

trunk/BNC/src/PPP/pppInclude.h

@@ -11 +11 @@
 namespace BNC_PPP {
 
-class pppExcept {
+class t_except {
  public:
-  pppExcept(const char* msg) {
+  t_except(const char* msg) {
     _msg = msg;
   }
-  ~pppExcept() {}
+  ~t_except() {}
   std::string what() {return _msg;}
  private:
@@ -96 +96 @@
 };
 
-class t_bias {
+class t_frqBias {
  public:
-  std::string _rnxType3ch;
-  double      _value;
+  t_frqBias() {
+    _code       = 0.0;          
+    _codeValid  = false;     
+    _phase      = 0.0;         
+    _phaseValid = false;    
+  }
+  std::string _rnxType2ch;
+  double      _code;          
+  bool        _codeValid;     
+  double      _phase;         
+  bool        _phaseValid;    
 };
 
-class t_satBiases {
+class t_satBias {
  public:
-  t_prn               _prn;
-  bncTime             _time;
-  int                 _nx;
-  int                 _jumpCount;
-  std::vector<t_bias> _biases;
+  t_prn                  _prn;
+  bncTime                _time;
+  int                    _nx;
+  int                    _jumpCount;
+  std::vector<t_frqBias> _bias;
 };
 

trunk/BNC/src/PPP/pppMain.cpp

@@ -79 +79 @@
     }
   }
-  catch (pppExcept exc) {
+  catch (t_except exc) {
     _running = true;
     stop();
@@ -140 +140 @@
 
     if (hlp.size() < 9) {
-      throw pppExcept("pppMain: wrong option staTable");
+      throw t_except("pppMain: wrong option staTable");
     }
 

trunk/BNC/src/PPP/pppThread.cpp

@@ -76 +76 @@
     QThread::exec();
   }
-  catch (pppExcept exc) {
+  catch (t_except exc) {
     _pppRun = 0;
     emit newMessage(QByteArray(exc.what().c_str()), true);
@@ -107 +107 @@
   }
   else {
-    throw pppExcept("t_pppRun: post-processing not yet implemented");
+    throw t_except("t_pppRun: post-processing not yet implemented");
   }
 }