Changeset 622 in ntrip for trunk/BNC/RTCM

Timestamp:

Dec 16, 2007, 4:27:13 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC/RTCM

Files:

• GPSDecoder.h (modified) (2 diffs)
• RTCM2Decoder.cpp (modified) (2 diffs)

trunk/BNC/RTCM/GPSDecoder.h

@@ -29 +29 @@
 #include <QList>
 
-class Observation : public QObject{
-  public:
-  Observation() {
-    flags     = 0;
-    StatID[0] = '\0';
-    satSys    = 'G';
-    satNum    = 0;
-    slot      = 0;
-    GPSWeek   = 0;
-    GPSWeeks  = 0.0;
-    C1        = 0.0;
-    C2        = 0.0;
-    P1        = 0.0;
-    P2        = 0.0;
-    L1        = 0.0;
-    L2        = 0.0;
-    S1        = 0.0;
-    S2        = 0.0;
-    SNR1      = 0;
-    SNR2      = 0;
-  }
+class t_obsInternal {
+ public:
   int    flags;
   char   StatID[20+1];// Station ID
@@ -69 +50 @@
 };
 
-typedef QPointer<Observation> p_obs;
+class t_obs : public QObject{
+ public:
+
+  t_obs() {
+    _o.flags     = 0;
+    _o.StatID[0] = '\0';
+    _o.satSys    = 'G';
+    _o.satNum    = 0;
+    _o.slot      = 0;
+    _o.GPSWeek   = 0;
+    _o.GPSWeeks  = 0.0;
+    _o.C1        = 0.0;
+    _o.C2        = 0.0;
+    _o.P1        = 0.0;
+    _o.P2        = 0.0;
+    _o.L1        = 0.0;
+    _o.L2        = 0.0;
+    _o.S1        = 0.0;
+    _o.S2        = 0.0;
+    _o.SNR1      = 0;
+    _o.SNR2      = 0;
+  }
+
+  t_obsInternal _o;
+};
+
+typedef QPointer<t_obs> p_obs;
 
 class GPSDecoder {
-  public:
-    virtual void Decode(char* buffer, int bufLen) = 0;
-    virtual ~GPSDecoder() {}
-    QList<p_obs> _obsList;
+ public:
+  virtual void Decode(char* buffer, int bufLen) = 0;
+
+  virtual ~GPSDecoder() {
+    QListIterator<p_obs> it(_obsList);
+    while (it.hasNext()) {
+      delete it.next();
+    }
+  }
+
+  QList<p_obs> _obsList;
 };
 

trunk/BNC/RTCM/RTCM2Decoder.cpp

@@ -58 +58 @@
 
 RTCM2Decoder::~RTCM2Decoder() {
-  QListIterator<p_obs> it(_obsList);
-  while (it.hasNext()) {
-    delete it.next();
-  }
-  _obsList.clear();
 }
 
@@ -91 +86 @@
           
         for (int iSat=0; iSat < _ObsBlock.nSat; iSat++) {
-          Observation* obs = new Observation();
+          p_obs obs = new t_obs();
           if (_ObsBlock.PRN[iSat] > 100) {
-            obs->satNum = _ObsBlock.PRN[iSat] % 100;
-            obs->satSys = 'R';
+            obs->_o.satNum = _ObsBlock.PRN[iSat] % 100;
+            obs->_o.satSys = 'R';
           }
           else {
-            obs->satNum = _ObsBlock.PRN[iSat];
-            obs->satSys = 'G';
+            obs->_o.satNum = _ObsBlock.PRN[iSat];
+            obs->_o.satSys = 'G';
           }
-          obs->GPSWeek  = epochWeek;
-          obs->GPSWeeks = epochSecs;
-          obs->C1       = _ObsBlock.rng_C1[iSat];
-          obs->P1       = _ObsBlock.rng_P1[iSat];
-          obs->P2       = _ObsBlock.rng_P2[iSat];
-          obs->L1       = _ObsBlock.resolvedPhase_L1(iSat);
-          obs->L2       = _ObsBlock.resolvedPhase_L2(iSat);
+          obs->_o.GPSWeek  = epochWeek;
+          obs->_o.GPSWeeks = epochSecs;
+          obs->_o.C1       = _ObsBlock.rng_C1[iSat];
+          obs->_o.P1       = _ObsBlock.rng_P1[iSat];
+          obs->_o.P2       = _ObsBlock.rng_P2[iSat];
+          obs->_o.L1       = _ObsBlock.resolvedPhase_L1(iSat);
+          obs->_o.L2       = _ObsBlock.resolvedPhase_L2(iSat);
 
           _obsList.push_back(obs);