Changeset 3107 in ntrip for trunk

Timestamp:

Mar 22, 2011, 9:58:12 AM (14 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncmodel.cpp (modified) (7 diffs)
• bncmodel.h (modified) (2 diffs)

trunk/BNC/bncmodel.cpp

@@ -143 +143 @@
   _staID   = staID;
 
+  connect(this, SIGNAL(newMessage(QByteArray,bool)), 
+          ((bncApp*)qApp), SLOT(slotMessage(const QByteArray,bool)));
+
   bncSettings settings;
 
@@ -189 +192 @@
   }
 
-  connect(this, SIGNAL(newMessage(QByteArray,bool)), 
-          ((bncApp*)qApp), SLOT(slotMessage(const QByteArray,bool)));
-
+  // Several options
+  // ---------------
   _usePhase = false;
   if ( Qt::CheckState(settings.value("pppUsePhase").toInt()) == Qt::Checked) {
@@ -202 +204 @@
   }
 
-  _xcBanc.ReSize(4);  _xcBanc  = 0.0;
-  _ellBanc.ReSize(3); _ellBanc = 0.0;
-
-  int nextPar = 0;
-  _params.push_back(new bncParam(bncParam::CRD_X,  ++nextPar, ""));
-  _params.push_back(new bncParam(bncParam::CRD_Y,  ++nextPar, ""));
-  _params.push_back(new bncParam(bncParam::CRD_Z,  ++nextPar, ""));
-  _params.push_back(new bncParam(bncParam::RECCLK, ++nextPar, ""));
-  if (_estTropo) {
-    _params.push_back(new bncParam(bncParam::TROPO, ++nextPar, ""));
-  }
+  _useGalileo = false;
   if ( Qt::CheckState(settings.value("pppGalileo").toInt()) == Qt::Checked) {
-    _params.push_back(new bncParam(bncParam::GALILEO_OFFSET, ++nextPar, ""));
+    _useGalileo = true;
   }
 
@@ -237 +229 @@
   }
 
+  // Antenna Name, ANTEX File
+  // ------------------------
   _antex = 0;
   QString antexFileName = settings.value("pppAntex").toString();
@@ -248 +242 @@
     else {
       _antennaName = settings.value("pppAntenna").toString();
+    }
+  }
+
+  // Bancroft Coordinates
+  // --------------------
+  _xcBanc.ReSize(4);  _xcBanc  = 0.0;
+  _ellBanc.ReSize(3); _ellBanc = 0.0;
+}
+
+// Reset
+////////////////////////////////////////////////////////////////////////////
+void bncModel::reset() {
+
+  for (int iPar = 1; iPar <= _params.size(); iPar++) {
+    delete _params[iPar-1];
+  }
+  _params.clear();
+
+  int nextPar = 0;
+  _params.push_back(new bncParam(bncParam::CRD_X,  ++nextPar, ""));
+  _params.push_back(new bncParam(bncParam::CRD_Y,  ++nextPar, ""));
+  _params.push_back(new bncParam(bncParam::CRD_Z,  ++nextPar, ""));
+  _params.push_back(new bncParam(bncParam::RECCLK, ++nextPar, ""));
+  if (_estTropo) {
+    _params.push_back(new bncParam(bncParam::TROPO, ++nextPar, ""));
+  }
+  if (_useGalileo) {
+    _params.push_back(new bncParam(bncParam::GALILEO_OFFSET, ++nextPar, ""));
+  }
+
+  _QQ.ReSize(_params.size()); 
+  _QQ = 0.0;
+  for (int iPar = 1; iPar <= _params.size(); iPar++) {
+    bncParam* pp = _params[iPar-1];
+    pp->xx = 0.0;
+    if      (pp->isCrd()) {
+      _QQ(iPar,iPar) = _sigCrd0 * _sigCrd0; 
+    }
+    else if (pp->type == bncParam::RECCLK) {
+      _QQ(iPar,iPar) = _sigClk0 * _sigClk0; 
+    }
+    else if (pp->type == bncParam::TROPO) {
+      _QQ(iPar,iPar) = _sigTrp0 * _sigTrp0; 
+    }
+    else if (pp->type == bncParam::GALILEO_OFFSET) {
+      _QQ(iPar,iPar) = _sigGalileoOffset0 * _sigGalileoOffset0; 
     }
   }
@@ -428 +468 @@
   _time = epoData->tt; // current epoch time
 
-  const double MAXSOLGAP = 60.0;
+  const double MAXSOLGAP = 10.0;
 
   bool firstCrd = false;
@@ -434 +474 @@
     firstCrd = true;
     _startTime = epoData->tt;
-
-    unsigned nPar = _params.size();
-    _QQ.ReSize(nPar); 
-    _QQ = 0.0;
-    for (int iPar = 1; iPar <= _params.size(); iPar++) {
-      bncParam* pp = _params[iPar-1];
-      pp->xx = 0.0;
-      if      (pp->isCrd()) {
-        _QQ(iPar,iPar) = _sigCrd0 * _sigCrd0; 
-      }
-      else if (pp->type == bncParam::RECCLK) {
-        _QQ(iPar,iPar) = _sigClk0 * _sigClk0; 
-      }
-      else if (pp->type == bncParam::TROPO) {
-        _QQ(iPar,iPar) = _sigTrp0 * _sigTrp0; 
-      }
-      else if (pp->type == bncParam::GALILEO_OFFSET) {
-        _QQ(iPar,iPar) = _sigGalileoOffset0 * _sigGalileoOffset0; 
-      }
-    }
+    reset();
   }
 

trunk/BNC/bncmodel.h

@@ -93 +93 @@
 
  private:
+  void   reset();
   void   cmpEle(t_satData* satData);
   void   addAmb(t_satData* satData);
@@ -138 +139 @@
   bool                  _usePhase;
   bool                  _estTropo;
+  bool                  _useGalileo;
   QByteArray            _log;
   QFile*                _nmeaFile;