Changeset 5863 in ntrip for trunk/BNC/src/rinex

Timestamp:

Aug 8, 2014, 10:43:23 AM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/rinex

Files:

• reqcanalyze.cpp (modified) (3 diffs)
• reqcanalyze.h (modified) (1 diff)

trunk/BNC/src/rinex/reqcanalyze.cpp

@@ -48 +48 @@
 #include "reqcedit.h"
 #include "bncutils.h"
-#include "bncpostprocess.h"
 #include "graphwin.h"
 #include "polarplot.h"
@@ -58 +57 @@
 
 const double SLIPTRESH = 10.0; // cycle-slip threshold (meters)
+
+// Set Observations from RINEX File
+////////////////////////////////////////////////////////////////////////////
+void t_reqcAnalyze::setObsFromRnx(const t_rnxObsFile* rnxObsFile,
+                                  const t_rnxObsFile::t_rnxEpo* epo, 
+                                  const t_rnxObsFile::t_rnxSat& rnxSat, 
+                                  t_obs& obs) {
+
+  strncpy(obs.StatID, rnxObsFile->markerName().toAscii().constData(),
+          sizeof(obs.StatID));
+
+  obs.satSys   = rnxSat.satSys;
+  obs.satNum   = rnxSat.satNum;
+  obs.GPSWeek  = epo->tt.gpsw();
+  obs.GPSWeeks = epo->tt.gpssec();
+
+  for (int iType = 0; iType < rnxObsFile->nTypes(obs.satSys); iType++) {
+    QString type = rnxObsFile->obsType(obs.satSys,iType).toAscii();
+    obs.setMeasdata(type, rnxObsFile->version(), rnxSat.obs[iType]);
+    if      (type.indexOf("L1") == 0) {
+      obs.snrL1  = rnxSat.snr[iType];
+      obs.slipL1 = (rnxSat.lli[iType] & 1);
+    }
+    else if (type.indexOf("L2") == 0) {
+      obs.snrL2  = rnxSat.snr[iType];
+      obs.slipL2 = (rnxSat.lli[iType] & 1);
+    }
+    else if (type.indexOf("L5") == 0) {
+      obs.snrL5  = rnxSat.snr[iType];
+      obs.slipL5 = (rnxSat.lli[iType] & 1);
+    }
+  }
+}
 
 // Constructor
@@ -239 +271 @@
         const t_rnxObsFile::t_rnxSat& rnxSat = _currEpo->rnxSat[iObs];
         t_obs obs;
-        t_postProcessing::setObsFromRnx(obsFile, _currEpo, rnxSat, obs);
+        setObsFromRnx(obsFile, _currEpo, rnxSat, obs);
   
         QString prn = QString("%1%2").arg(obs.satSys)

trunk/BNC/src/rinex/reqcanalyze.h

@@ -169 +169 @@
                    QVector<t_polarPoint*>* dataSNR2);
 
+  void setObsFromRnx(const t_rnxObsFile* rnxObsFile,
+                     const t_rnxObsFile::t_rnxEpo* epo, 
+                    const t_rnxObsFile::t_rnxSat& rnxSat, 
+                    t_obs& obs);
+
   QString                    _logFileName;
   QFile*                     _logFile;