Changeset 5863 in ntrip for trunk

Timestamp:

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

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• PPP/pppRunPostProc.cpp (modified) (1 diff)
• PPP/pppRunPostProc.h (modified) (1 diff)
• bncmain.cpp (modified) (2 diffs)
• bncwindow.h (modified) (1 diff)
• rinex/reqcanalyze.cpp (modified) (3 diffs)
• rinex/reqcanalyze.h (modified) (1 diff)

trunk/BNC/src/PPP/pppRunPostProc.cpp

@@ -103 +103 @@
   else {
     BNC_CORE->slotMessage(msg, false);
-  }
-}
-
-// Set Observations from RINEX File
-////////////////////////////////////////////////////////////////////////////
-void t_postProcessing::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);
-    }
   }
 }

trunk/BNC/src/PPP/pppRunPostProc.h

@@ -44 +44 @@
  public:
   t_postProcessing(QObject* parent, int maxSpeed, int speed);
-  static void setObsFromRnx(const t_rnxObsFile* rnxObsFile,
-                            const t_rnxObsFile::t_rnxEpo* epo, 
-                            const t_rnxObsFile::t_rnxSat& rnxSat, 
-                            t_obs& obs);
-
   ~t_postProcessing();
 

trunk/BNC/src/bncmain.cpp

@@ -52 +52 @@
 #include "upload/bncephuploadcaster.h"
 #ifdef USE_POSTPROCESSING
-#  include "rinex/bncpostprocess.h"
 #  include "rinex/reqcedit.h"
 #  include "rinex/reqcanalyze.h"
@@ -160 +159 @@
 #ifdef USE_POSTPROCESSING
 
-  // Post-Processing PPP
-  // -------------------
-  else if (settings.value("pppSPP").toString() == "Post-Processing") {
-    BNC_CORE->setMode(t_bncCore::batchPostProcessing);
-    t_postProcessing* postProcessing = new t_postProcessing(0, 0, 0);
-    postProcessing->start();
-  }
-
   // Post-Processing reqc edit
   // -------------------------
-  else if (settings.value("reqcAction").toString() == "Edit/Concatenate") {
+  if (settings.value("reqcAction").toString() == "Edit/Concatenate") {
     BNC_CORE->setMode(t_bncCore::batchPostProcessing);
     t_reqcEdit* reqcEdit = new t_reqcEdit(0);

trunk/BNC/src/bncwindow.h

@@ -86 +86 @@
     void slotMapPPPClosed();
     void slotStart();
-    void slotFinishedPostProcessingPPP();
     void slotFinishedPostProcessingReqc();
     void slotStop();

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;