Changeset 3688 in ntrip for trunk

Timestamp:

Feb 12, 2012, 2:07:57 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncpostprocess.cpp (modified) (4 diffs)
• bncpostprocess.h (modified) (3 diffs)
• corrfile.h (modified) (1 diff)

trunk/BNC/bncpostprocess.cpp

@@ -47 +47 @@
 #include "rnxobsfile.h"
 #include "rnxnavfile.h"
+#include "corrfile.h"
 
 using namespace std;
@@ -56 +57 @@
   _rnxObsFile = 0;
   _rnxNavFile = 0;
+  _corrFile   = 0;
   _pppClient  = 0;
 }
@@ -65 +67 @@
   delete _rnxNavFile;
   delete _rnxObsFile;
+  delete _corrFile;
   delete _opt;
 }
@@ -86 +89 @@
     _pppClient  = new bncPPPclient("POST", _opt, false);
 
-    connect(this, SIGNAL(newCorrections(QList<QString>)),
-            _pppClient, SLOT(slotNewCorrections(QList<QString>)));
+    if (!_opt->corrFileName.isEmpty()) {
+      _corrFile = new t_corrFile(_opt->corrFileName);
+      connect(_corrFile, SIGNAL(newCorrections(QList<QString>)),
+              _pppClient, SLOT(slotNewCorrections(QList<QString>)));
+    }
 
     connect(_pppClient, SIGNAL(newMessage(QByteArray,bool)), 

trunk/BNC/bncpostprocess.h

@@ -36 +36 @@
 class t_rnxObsFile;
 class t_rnxNavFile;
+class t_corrFile;
 
 class t_postProcessing : public QThread {
@@ -49 +50 @@
   void progress(int);
   void finished();
-  void newEphGPS(gpsephemeris gpseph);
-  void newEphGlonass(glonassephemeris glonasseph);
-  void newEphGalileo(galileoephemeris galileoeph);
-  void newCorrections(QList<QString>);
    
  public slots:
@@ -65 +62 @@
   t_rnxObsFile* _rnxObsFile;
   t_rnxNavFile* _rnxNavFile;
+  t_corrFile*   _corrFile;
 };
 

trunk/BNC/corrfile.h

@@ -29 +29 @@
 #include "bncconst.h"
 
-class t_corrFile {
+class t_corrFile : public QObject {
+ Q_OBJECT
+
  public:
   t_corrFile(QString fileName);
   ~t_corrFile();
+
+ signals:
+  void newCorrections(QList<QString>);
 
  private: