Changeset 3677 in ntrip

Timestamp:

Feb 12, 2012, 11:12:36 AM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

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

trunk/BNC/rnxobsfile.cpp

@@ -40 +40 @@
 
 #include <iostream>
+#include <iomanip>
 #include "rnxobsfile.h"
 #include "bncutils.h"
@@ -170 +171 @@
     readInt(line, 29, 3, numSat);
   
+    _currEpo.satObs.resize(numSat);
+
     // Read Satellite Numbers
     // ----------------------
@@ -181 +184 @@
       pos += 3;
 
-      _currEpo.prns << prn;
-      _currEpo.satObs[prn].ReSize(_header.nTypes());
+      _currEpo.satObs[iSat].prn = prn;
+      _currEpo.satObs[iSat].ReSize(_header.nTypes());
     }
 
@@ -190 +193 @@
       line = _stream->readLine();
       pos  = 0;
-      QString prn = _currEpo.prns[iSat];
+      QString prn = _currEpo.satObs[iSat].prn;
       for (int iType = 0; iType < _header.nTypes(); iType++) {
         if (iType > 0 && iType % 5 == 0) {
@@ -196 +199 @@
           pos  = 0;
         }
-        readDbl(line, pos,     14, _currEpo.satObs[prn][iType]);
-        readInt(line, pos + 14, 1, _currEpo.satObs[prn].lli);
-        readInt(line, pos + 15, 1, _currEpo.satObs[prn].snr);
+        readDbl(line, pos,     14, _currEpo.satObs[iSat][iType]);
+        readInt(line, pos + 14, 1, _currEpo.satObs[iSat].lli);
+        readInt(line, pos + 15, 1, _currEpo.satObs[iSat].snr);
         pos += 16;
       }
 
+      cout.setf(ios::fixed);
       cout << "prn: " << prn.toAscii().data() << " "
-           << _currEpo.satObs[prn][0] << endl;
+           << setprecision(3) << _currEpo.satObs[iSat][0] << endl;
     }
 

trunk/BNC/rnxobsfile.h

@@ -62 +62 @@
   class t_satObs : public ColumnVector {
    public:
-    int lli;
-    int snr;
+    QString prn;
+    int     lli;
+    int     snr;
   };
 
@@ -69 +70 @@
    public:
     void clear() {
-      prns.clear(); 
       satObs.clear();
     }
-    QStringList             prns;
-    QMap<QString, t_satObs> satObs;
+    QVector<t_satObs> satObs;
   };