Changeset 5884 in ntrip for trunk/BNC/src

Timestamp:

Aug 8, 2014, 4:04:09 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• GPSDecoder.cpp (modified) (2 diffs)
• GPSDecoder.h (modified) (2 diffs)
• PPP/pppThread.cpp (modified) (1 diff)
• bnccore.h (modified) (1 diff)
• rinex/reqcanalyze.cpp (modified) (1 diff)

trunk/BNC/src/GPSDecoder.cpp

@@ -44 +44 @@
 #include "GPSDecoder.h"
 #include "bncsettings.h"
+#include "bncrinex.h"
 
 extern "C" {
@@ -55 +56 @@
 GPSDecoder::GPSDecoder() {
   _rnx = 0;
+}
+
+// Destructor
+//////////////////////////////////////////////////////////////////////////////
+GPSDecoder::~GPSDecoder() {
+  delete _rnx;
 }
 

trunk/BNC/src/GPSDecoder.h

@@ -29 +29 @@
 #include <vector>
 #include <string>
-#include <QList>
-#include <QStringList>
+
+#include <QtCore>
 
 #include "bncconst.h"
-#include "bncrinex.h"
+#include "bnctime.h"
 
 extern "C" {
 #include "rtcm3torinex.h"
 }
+
+class bncRinex;
 
 class t_obs {
@@ -102 +104 @@
  public:
   GPSDecoder();
-
-  virtual ~GPSDecoder() {delete _rnx;}
+  virtual ~GPSDecoder();
 
   virtual t_irc Decode(char* buffer, int bufLen, 

trunk/BNC/src/PPP/pppThread.cpp

@@ -80 +80 @@
     }
     else {
-      _ppRun->processFiles();
+      _pppRun->processFiles();
     }
   }

trunk/BNC/src/bnccore.h

@@ -28 +28 @@
 #include <QtGui>
 
+#include "bnctime.h"
 #include "bnccaster.h"
 #include "bncrawfile.h"

trunk/BNC/src/rinex/reqcanalyze.cpp

@@ -238 +238 @@
         const t_rnxObsFile::t_rnxSat& rnxSat = _currEpo->rnxSat[iObs];
         t_obs obs;
-        setObsFromRnx(obsFile, _currEpo, rnxSat, obs);
+        t_rnxObsFile::setObsFromRnx(obsFile, _currEpo, rnxSat, obs);
   
         QString prn = QString("%1%2").arg(obs.satSys)