Changeset 3672 in ntrip

Timestamp:

Feb 12, 2012, 9:37:03 AM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• rnxobsfile.cpp (modified) (2 diffs)
• rnxobsfile.h (modified) (2 diffs)

trunk/BNC/rnxobsfile.cpp

@@ -48 +48 @@
 ////////////////////////////////////////////////////////////////////////////
 t_rnxObsFile::t_rnxObsHeader::t_rnxObsHeader() {
-  _antNEU[0] = _antNEU[1] = _antNEU[2] = 0.0;
-  _xyz[0]    = _xyz[1]    = _xyz[2]    = 0.0;
-  _version   = 0.0;
+  _antNEU.ReSize(3); 
+  _xyz.ReSize(3);    
+  _antNEU  = 0.0;
+  _xyz     = 0.0;
+  _version = 0.0;
 }
 
@@ -88 +90 @@
       QTextStream in(value.toAscii(), QIODevice::ReadOnly);
       in >> _antNEU[2] >> _antNEU[1] >> _antNEU[0];
+    }
+    else if (key == "# / TYPES OF OBSERV") {
+      QTextStream in(value.toAscii(), QIODevice::ReadOnly);
+      int nTypes;
+      in >> nTypes;
+      for (int ii = 0; ii < nTypes; ii++) {
+        QString hlp;
+        in >> hlp;
+        _obsTypes << hlp;
+      }
     }
   }

trunk/BNC/rnxobsfile.h

@@ -27 +27 @@
 
 #include <QtCore>
+#include "newmat.h"
 #include "bncconst.h"
 
@@ -39 +40 @@
     ~t_rnxObsHeader();
     t_irc read(QTextStream* stream);
+    float version() const {return _version;}
+    int   nTypes() const {return _obsTypes.size();}
+    const QString& obsType(int index) const {return _obsTypes.at(index);}
+    const QString& antennaName() const {return _antennaName;}
+    const QString& markerName() const {return _markerName;}
+    const ColumnVector& xyz() const {return _xyz;}
+    const ColumnVector& antNEU() const {return _antNEU;}
    private:
-    float   _version;
-    QString _antennaName;
-    QString _markerName;
-    double  _antNEU[3];
-    double  _xyz[3];
+    float        _version;
+    QString      _antennaName;
+    QString      _markerName;
+    ColumnVector _antNEU;
+    ColumnVector _xyz;
+    QStringList  _obsTypes;
   };