Changeset 3676 in ntrip

Timestamp:

Feb 12, 2012, 11:03:46 AM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• rnxobsfile.cpp (modified) (3 diffs)
• rnxobsfile.h (modified) (1 diff)

trunk/BNC/rnxobsfile.cpp

@@ -131 +131 @@
 ////////////////////////////////////////////////////////////////////////////
 const t_rnxObsFile::t_epo* t_rnxObsFile::nextEpoch() {
+
+  _currEpo.clear();
+
   if (version() < 3.0) {
     return nextEpochV2();
@@ -167 +170 @@
     readInt(line, 29, 3, numSat);
   
+    // Read Satellite Numbers
+    // ----------------------
     int pos = 32;
     for (int iSat = 0; iSat < numSat; iSat++) {
@@ -174 +179 @@
       }
       QString prn = line.mid(pos, 3);
-      
-      cout << "prn = " << prn.toAscii().data() << endl;
       pos += 3;
+
+      _currEpo.prns << prn;
+      _currEpo.satObs[prn].ReSize(_header.nTypes());
+    }
+
+    // Read Observation Records
+    // ------------------------
+    for (int iSat = 0; iSat < numSat; iSat++) {
+      line = _stream->readLine();
+      pos  = 0;
+      QString prn = _currEpo.prns[iSat];
+      for (int iType = 0; iType < _header.nTypes(); iType++) {
+        if (iType > 0 && iType % 5 == 0) {
+          line = _stream->readLine();
+          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);
+        pos += 16;
+      }
+
+      cout << "prn: " << prn.toAscii().data() << " "
+           << _currEpo.satObs[prn][0] << endl;
     }
 

trunk/BNC/rnxobsfile.h

@@ -60 +60 @@
   ~t_rnxObsFile();
 
+  class t_satObs : public ColumnVector {
+   public:
+    int lli;
+    int snr;
+  };
+
   class t_epo {
    public:
-    QMap<QString, ColumnVector> satObs;
+    void clear() {
+      prns.clear(); 
+      satObs.clear();
+    }
+    QStringList             prns;
+    QMap<QString, t_satObs> satObs;
   };