Changeset 2240 in ntrip

Timestamp:

Jan 12, 2010, 3:17:44 PM (14 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncmodel.cpp (modified) (1 diff)
• bncmodel.h (modified) (3 diffs)
• bncpppclient.cpp (modified) (6 diffs)
• bncpppclient.h (modified) (2 diffs)

trunk/BNC/bncmodel.cpp

@@ -353 +353 @@
   }
 
-  cout << satData->prn.toAscii().data() << "  "
-       << clk << " " << satData->rho + clk - satData->clk + tropDelay << endl;
-
   return satData->rho + clk - satData->clk + tropDelay;
 }

trunk/BNC/bncmodel.h

@@ -38 +38 @@
 class bncParam {
  public:
-  enum parType {CRD_X, CRD_Y, CRD_Z, RECCLK, TROPO, AMB_L3};
+  enum parType {CRD_X, CRD_Y, CRD_Z, RECCLK_GPS, RECCLK_GLO, TROPO, AMB_L3};
   bncParam(parType typeIn, int indexIn, const QString& prn);
   ~bncParam();
-  double partial(t_satData* satData, const QString& prnIn);
+  double partial(t_satData* satData, bool phase);
   bool isCrd() const {
     return (type == CRD_X || type == CRD_Y || type == CRD_Z);
+  }
+  bool isClk() const {
+    return (type == RECCLK_GPS|| type == RECCLK_GLO);
   }
   parType  type;
@@ -59 +62 @@
   t_irc cmpBancroft(t_epoData* epoData);
   t_irc update(t_epoData* epoData);
-  bncTime time() const {return _time;}
-  double x()   const {return _params[0]->xx;}
-  double y()   const {return _params[1]->xx;}
-  double z()   const {return _params[2]->xx;}
-  double clk() const {return _params[3]->xx;}
-  double trp() const {return _estTropo ? _params[4]->xx : 0.0;}
-  
+  bncTime time()  const {return _time;}
+  double x()      const {return _params[0]->xx;}
+  double y()      const {return _params[1]->xx;}
+  double z()      const {return _params[2]->xx;}
+  double clkGPS() const {
+    for (int ii = 0; ii < _params.size(); ++ii) {
+      bncParam* pp = _params[ii];
+      if (pp->type == bncParam::RECCLK_GPS) {
+        return pp->xx;
+      }
+    }
+    return 0.0;
+  }
+  double clkGlo() const {
+    for (int ii = 0; ii < _params.size(); ++ii) {
+      bncParam* pp = _params[ii];
+      if (pp->type == bncParam::RECCLK_GLO) {
+        return pp->xx;
+      }
+    }
+    return 0.0;
+  }
+  double trp() const {
+    for (int ii = 0; ii < _params.size(); ++ii) {
+      bncParam* pp = _params[ii];
+      if (pp->type == bncParam::TROPO) {
+        return pp->xx;
+      }
+    }
+    return 0.0;
+  }
+
  signals:
   void newMessage(QByteArray msg, bool showOnScreen);
@@ -92 +120 @@
   QFile*             _nmeaFile;
   QTextStream*       _nmeaStream;
+  bool               _useGlonass;
 };
 

trunk/BNC/bncpppclient.cpp

@@ -183 +183 @@
   if      (obs->satSys == 'G') {
     QString prn = QString("G%1").arg(obs->satNum, 2, 10, QChar('0'));
+    satData->prn = prn;
     _epoData->satDataGPS[prn] = satData;
   }
   else if (obs->satSys == 'R') {
     QString prn = QString("R%1").arg(obs->satNum, 2, 10, QChar('0'));
+    satData->prn = prn;
     _epoData->satDataGlo[prn] = satData;
   }
@@ -321 +323 @@
                               ColumnVector& xc, ColumnVector& vv, bool& corr) {
 
-  const bool   CORR_REQUIRED = true;
+  const bool   CORR_REQUIRED = false;
   const double MAXAGE        = 120.0;
 
@@ -367 +369 @@
 // Correct Time of Transmission
 ////////////////////////////////////////////////////////////////////////////
-t_irc bncPPPclient::cmpToT(const QString& prn, t_satData* satData) {
+t_irc bncPPPclient::cmpToT(t_satData* satData) {
 
   double prange = satData->P3;
@@ -382 +384 @@
     ColumnVector vv(3);
     bool corr = false;
-    if (getSatPos(ToT, prn, xc, vv, corr) != success) {
+    if (getSatPos(ToT, satData->prn, xc, vv, corr) != success) {
       return failure;
     }
@@ -413 +415 @@
     t_satData* satData = iGPS.value();
 
-    if (cmpToT(prn, satData) != success) {
+    if (cmpToT(satData) != success) {
       delete satData;
       iGPS.remove();
@@ -426 +428 @@
     t_satData* satData = iGlo.value();
 
-    if (cmpToT(prn, satData) != success) {
+    if (cmpToT(satData) != success) {
       delete satData;
       iGlo.remove();

trunk/BNC/bncpppclient.h

@@ -40 +40 @@
  public:
   enum codeType {P_CODE, C_CODE};
+  QString      prn;
   double       P1;
   double       P2;
@@ -117 +118 @@
   void processEpoch();
   void applyCorr(const t_corr* cc, ColumnVector& xc, ColumnVector& vv);
-  t_irc cmpToT(const QString& prn, t_satData* satData);
+  t_irc cmpToT(t_satData* satData);
 
   QByteArray             _staID;