Changeset 3642 in ntrip for trunk

Timestamp:

Jan 24, 2012, 11:44:54 AM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncpostprocess.cpp (modified) (4 diffs)
• bncpostprocess.h (modified) (2 diffs)
• pppopt.cpp (modified) (1 diff)
• pppopt.h (modified) (1 diff)

trunk/BNC/bncpostprocess.cpp

@@ -42 +42 @@
 #include "bncpostprocess.h"
 #include "bncsettings.h"
+#include "pppopt.h"
 
 using namespace std;
@@ -48 +49 @@
 ////////////////////////////////////////////////////////////////////////////
 t_postProcessing::t_postProcessing(QObject* parent) : QThread(parent) {
-  bncSettings settings;
-  _input.obsFileName  = settings.value("postObsFile").toString();
-  _input.navFileName  = settings.value("postNavFile").toString();
-  _input.corrFileName = settings.value("postcorrFile").toString();
+  _opt = new t_pppOpt();
 }
 
@@ -58 +56 @@
 t_postProcessing::~t_postProcessing() {
   cout << "~t_postProcessing" << endl;
+  delete _opt;
 }
 
@@ -64 +63 @@
 void t_postProcessing::run() {
 
-  cout << "obsFile: "  << _input.obsFileName.toAscii().data()  << endl;
-  cout << "navFile: "  << _input.navFileName.toAscii().data()  << endl;
-  cout << "corrFile: " << _input.corrFileName.toAscii().data() << endl;
+  cout << "obsFile: "  << _opt->obsFileName.toAscii().data()  << endl;
+  cout << "navFile: "  << _opt->navFileName.toAscii().data()  << endl;
+  cout << "corrFile: " << _opt->corrFileName.toAscii().data() << endl;
 
   int MAXI = 5;

trunk/BNC/bncpostprocess.h

@@ -29 +29 @@
 #include "bncconst.h"
 
-class t_postInput {
- public:
-  QString    obsFileName;
-  QString    navFileName;
-  QString    corrFileName;
-};
+class t_pppOpt;
 
 class t_postProcessing : public QThread {
@@ -53 +48 @@
  
  private:
-  t_postInput _input;
+  t_pppOpt* _opt;
 };
 

trunk/BNC/pppopt.cpp

@@ -77 +77 @@
   antexFile    = settings.value("pppAntex").toString();
   antennaName  = settings.value("pppAntenna").toString();
+  obsFileName  = settings.value("postObsFile").toString();
+  navFileName  = settings.value("postNavFile").toString();
+  corrFileName = settings.value("postcorrFile").toString();
 
   pppMode      = settings.value("pppSPP").toString() == "PPP";

trunk/BNC/pppopt.h

@@ -54 +54 @@
   QString antexFile;
   QString antennaName;
+  QString obsFileName;
+  QString navFileName;
+  QString corrFileName;
   bool    pppMode;
   bool    rnxAppend;