Changeset 1268 in ntrip for trunk/BNC/RTCM

Timestamp:

Dec 2, 2008, 10:31:46 PM (16 years ago)

Author:

zdenek

Message:

* empty log message *

Location:

trunk/BNC/RTCM

Files:

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

trunk/BNC/RTCM/GPSDecoder.h

@@ -136 +136 @@
   }
 
-  QList<p_obs> _obsList;
-  QList<int> _typeList; // RTCMv3 message types
-  QList<int> _epochList; // Broadcast corrections
-  QStringList _antType; // RTCMv3 antenna descriptor
-  QList<double> _antList5; // RTCMv3 antenna XYZ
-  QList<double> _antList6; // RTCMv3 antenna XYZ & H
+  struct t_antInfo {
+    enum t_type { ARP, APC };
+
+    t_antInfo() {
+      xx = yy = zz = height = 0.0;
+      type = ARP;
+      height_f = false;
+      message  = 0;
+    };
+
+    double xx;
+    double yy;
+    double zz;
+    t_type type;
+    double height;
+    bool   height_f;
+    int    message;
+  };
+
+  QList<p_obs>     _obsList;
+  QList<int>       _typeList;  // RTCM   message types
+  QList<int>       _epochList; // Broadcast corrections
+  QStringList      _antType;   // RTCMv3 antenna descriptor
+  QList<t_antInfo> _antList;   // RTCM   antenna XYZ
 };
 

trunk/BNC/RTCM/RTCM2Decoder.cpp

@@ -124 +124 @@
       }
     }
+    
+    // Store message number
+    _typeList.push_back(_PP.ID());
 
     if ( _PP.ID()==18 || _PP.ID()==19 ) {   
@@ -178 +181 @@
     else if ( _PP.ID() == 22 ) {
       _msg22.extract(_PP);
+    }
+
+    // Output for RTCM scan
+    if ( _PP.ID() == 3 ) {
+      _antList.push_back(t_antInfo());
+
+      this->getStaCrd(_antList.back().xx, _antList.back().yy, _antList.back().zz);
+
+      _antList.back().type     = t_antInfo::APC;
+      _antList.back().message  = _PP.ID();
     }
   }