Changeset 5763 in ntrip for trunk/BNC/src/PPP

Timestamp:

Aug 4, 2014, 8:41:20 AM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP

Files:

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

trunk/BNC/src/PPP/ppp.h

@@ -10 +10 @@
 
 namespace BNC {
+
+class pppExcept {
+ public:
+  pppExcept(const char* msg) {
+    _msg = msg;
+  }
+  ~pppExcept() {}
+  std::string what() {return _msg;}
+ private:
+  std::string _msg;
+};
 
 enum e_pppMode {

trunk/BNC/src/PPP/pppClient.cpp

@@ -371 +371 @@
   station->setDClk(xyzc[3]);
 
-  // US Restriction
-  // -------------- 
-  station->checkRestriction(time);
-
   // Tides
   // -----
@@ -445 +441 @@
     return finish(failure);
   }
-  catch (string& msg) {
-    LOG << "Exception: " << msg << endl;
-    return finish(failure);
-  }
-  catch (logic_error exc) {
-    LOG << exc.what() << endl;
-    return finish(failure);
-  }
-  catch (const char* msg) {
-    LOG << msg << endl;
+  catch (pppExcept msg) {
+    LOG << msg.what() << endl;
     return finish(failure);
   }

trunk/BNC/src/PPP/pppMain.cpp

@@ -135 +135 @@
 
     if (hlp.size() < 9) {
-      throw "pppMain: wrong option staTable";
+      throw pppExcept("pppMain: wrong option staTable");
     }
 

trunk/BNC/src/PPP/pppThread.cpp

@@ -74 +74 @@
     QThread::exec();
   }
-  catch (const char* msg) {
-    cout << msg << endl;
+  catch (pppExcept exc) {
+    cout << exc.what() << endl;
   }
   cout << _opt->_roverName << " exit" << endl;

trunk/BNC/src/PPP/station.cpp

@@ -81 +81 @@
 }
 
-// 
-//////////////////////////////////////////////////////////////////////////////
-void t_station::checkRestriction(const bncTime& tt) {
-
-  const double maxSpeed  = 515.0;   // [m/s^2]
-  const double maxHeight = 18200.0; // [m]
-
-  if (_ellApr(3) > maxHeight) {
-    throw "t_station: height restriction";
-  }
-
-  if (tt.valid()) {
-    if (_timeCheck.valid()) {
-      double dt = tt - _timeCheck;
-      if (dt > 0.0) {
-        double vel = (_xyzApr - _xyzCheck).norm_Frobenius() / dt;
-        if (vel > maxSpeed) {
-          throw "t_station: speed restriction";
-        }
-      }
-    }
-    _timeCheck = tt;
-    _xyzCheck  = _xyzApr;
-  }
-}

trunk/BNC/src/PPP/station.h

@@ -30 +30 @@
   double dClk() const {return _dClk;}
   double windUp(const bncTime& time, t_prn prn, const ColumnVector& rSat) const;
-  void checkRestriction(const bncTime& tt);
 
  private: