Changeset 5815 in ntrip

Timestamp:

Aug 6, 2014, 12:06:58 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• bncantex.cpp (modified) (3 diffs)
• bncantex.h (modified) (1 diff)
• bncmodel.cpp (modified) (5 diffs)
• bncmodel.h (modified) (2 diffs)
• bncwindow.cpp (modified) (2 diffs)
• bncwindow.h (modified) (2 diffs)
• ephemeris.cpp (modified) (2 diffs)
• ephemeris.h (modified) (3 diffs)

trunk/BNC/src/bncantex.cpp

@@ -45 +45 @@
 #include "PPP/pppModel.h"
 
-using namespace BNC;
 using namespace std;
 
@@ -237 +236 @@
     sz /= sqrt(DotProduct(sz,sz));
 
-    ColumnVector xSun = t_astro::Sun(Mjd);
+    ColumnVector xSun = BNC_PPP::t_astro::Sun(Mjd);
     xSun /= sqrt(DotProduct(xSun,xSun));
   
@@ -284 +283 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-double bncAntex::rcvCorr(BNC::t_frequency::type /* frqType */, const std::string& antName,
+double bncAntex::rcvCorr(BNC_PPP::t_frequency::type /* frqType */, const std::string& antName,
                double eleSat, bool& found) const {
   return pco(QString(antName.c_str()), eleSat, found);

trunk/BNC/src/bncantex.h

@@ -41 +41 @@
   void print() const;
   double pco(const QString& antName, double eleSat, bool& found) const;
-  double rcvCorr(BNC::t_frequency::type frqType, const std::string& antName,
+  double rcvCorr(BNC_PPP::t_frequency::type frqType, const std::string& antName,
                  double eleSat, bool& found) const;
   t_irc  satCoMcorrection(const QString& prn, double Mjd, 

trunk/BNC/src/bncmodel.cpp

@@ -54 +54 @@
 #include "pppopt.h"
 
-using namespace BNC;
 using namespace std;
 
@@ -188 +187 @@
   }
 
-  _tides = new t_tides;
+  _tides = new BNC_PPP::t_tides;
 
   // Bancroft Coordinates
@@ -346 +345 @@
   satData->rho = (satData->xx - xRec).norm_Frobenius();
 
-  double tropDelay = t_tropo::delay_saast(xRec, satData->eleSat) + 
+  double tropDelay = BNC_PPP::t_tropo::delay_saast(xRec, satData->eleSat) + 
                      trp() / sin(satData->eleSat);
 
@@ -613 +612 @@
     else if (par->type == bncParam::TROPO) {
       ColumnVector xyz(3); xyz(1) = x(); xyz(2) = y(); xyz(3) = z();
-      double aprTrp = t_tropo::delay_saast(xyz, M_PI/2.0);
+      double aprTrp = BNC_PPP::t_tropo::delay_saast(xyz, M_PI/2.0);
       strB << "\n    trp     = " << par->prn.toAscii().data()
            << setw(7) << setprecision(3) << aprTrp << " "
@@ -894 +893 @@
     ColumnVector sz = -rSat / rSat.norm_Frobenius();
 
-    ColumnVector xSun = t_astro::Sun(Mjd);
+    ColumnVector xSun = BNC_PPP::t_astro::Sun(Mjd);
     xSun /= xSun.norm_Frobenius();
 

trunk/BNC/src/bncmodel.h

@@ -38 +38 @@
 class t_pppOpt;
 class bncPPPclient;
-namespace BNC {
+namespace BNC_PPP {
 class t_tides;
 }
@@ -161 +161 @@
   QStringList           _outlierGlo;
   bncAntex*             _antex;
-  BNC::t_tides*         _tides;
+  BNC_PPP::t_tides*     _tides;
 };
 

trunk/BNC/src/bncwindow.cpp

@@ -75 +75 @@
 #include "PPP/pppMain.h"
 
-using namespace BNC;
 using namespace std;
 
@@ -100 +99 @@
   _runningPostProcessingReqc = false;
   _postProcessing            = 0;
-  _pppMain                   = new t_pppMain();
+  _pppMain                   = new BNC_PPP::t_pppMain();
 
   _pppSPPComboBox     = 0; // necessary for enableStartStop()

trunk/BNC/src/bncwindow.h

@@ -57 +57 @@
 class t_postProcessing;
 
-namespace BNC {
+namespace BNC_PPP {
 class t_pppMain;
 }
@@ -278 +278 @@
 
     t_pppWidgets         _pppWidgets;
-    BNC::t_pppMain*      _pppMain;
+    BNC_PPP::t_pppMain*  _pppMain;
 };
 

trunk/BNC/src/ephemeris.cpp

@@ -14 +14 @@
 #include "PPP/pppInclude.h"
 
-using namespace BNC;
 using namespace std;
 
@@ -44 +43 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void t_eph::setOrbCorr(const BNC::t_orbCorr* orbCorr) {
+void t_eph::setOrbCorr(const BNC_PPP::t_orbCorr* orbCorr) {
   delete _orbCorr; 
-  _orbCorr = new t_orbCorr(*orbCorr);
+  _orbCorr = new BNC_PPP::t_orbCorr(*orbCorr);
 }
 
 // 
 ////////////////////////////////////////////////////////////////////////////
-void t_eph::setClkCorr(const BNC::t_clkCorr* clkCorr) {
+void t_eph::setClkCorr(const BNC_PPP::t_clkCorr* clkCorr) {
   delete _clkCorr; 
-  _clkCorr = new t_clkCorr(*clkCorr);
+  _clkCorr = new BNC_PPP::t_clkCorr(*clkCorr);
 }
 

trunk/BNC/src/ephemeris.h

@@ -13 +13 @@
 }
 
-namespace BNC {
+namespace BNC_PPP {
   class t_orbCorr;
   class t_clkCorr;
@@ -59 +59 @@
   t_irc getCrd(const bncTime& tt, ColumnVector& xc,
                ColumnVector& vv, bool useCorr) const;
-  void setOrbCorr(const BNC::t_orbCorr* orbCorr);
-  void setClkCorr(const BNC::t_clkCorr* clkCorr);
+  void setOrbCorr(const BNC_PPP::t_orbCorr* orbCorr);
+  void setClkCorr(const BNC_PPP::t_clkCorr* clkCorr);
   virtual int slotNum() const {return 0;}
 
@@ -74 +74 @@
   QDateTime       _receptDateTime;
   bool            _ok;
-  BNC::t_orbCorr* _orbCorr;
-  BNC::t_clkCorr* _clkCorr;
+  BNC_PPP::t_orbCorr* _orbCorr;
+  BNC_PPP::t_clkCorr* _clkCorr;
 };