Changeset 3680 in ntrip

Timestamp:

Feb 12, 2012, 11:42:49 AM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

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

trunk/BNC/bncpostprocess.cpp

@@ -110 +110 @@
   const t_rnxObsFile::t_epo* epo = 0;
   while ( (epo = _rnxObsFile->nextEpoch()) != 0) {
-
+    for (int iObs = 0; iObs < epo->satObs.size(); iObs++) {
+      const t_rnxObsFile::t_satObs& satObs = epo->satObs[iObs];
+      t_obs obs;
+      strncpy(obs.StatID, _rnxObsFile->markerName().toAscii().constData(),
+              sizeof(obs.StatID));
+      obs.satSys   = satObs.prn.toAscii().data()[0];
+      obs.satNum   = satObs.prn.mid(1).toInt();
+      obs.GPSWeek  = epo->tt.gpsw();
+      obs.GPSWeeks = epo->tt.gpssec();
+    }
   }
 

trunk/BNC/rnxobsfile.cpp

@@ -153 +153 @@
 const t_rnxObsFile::t_epo* t_rnxObsFile::nextEpochV2() {
   while (_stream->status() == QTextStream::Ok && !_stream->atEnd()) {
+
     QString line = _stream->readLine();
+
     if (line.isEmpty()) {
       continue;
     }
+
     QTextStream in(line.toAscii());
+
+    // Epoch Time
+    // ----------
     int    year, month, day, hour, min, flag;
     double sec;
@@ -167 +173 @@
       year += 1900;
     }
-
+    _currEpo.tt.set(year, month, day, hour, min, sec);
+
+    // Number of Satellites
+    // --------------------
     int numSat;
     readInt(line, 29, 3, numSat);

trunk/BNC/rnxobsfile.h

@@ -29 +29 @@
 #include "newmat.h"
 #include "bncconst.h"
+#include "bnctime.h"
 
 class t_pppOpt;
@@ -60 +61 @@
   ~t_rnxObsFile();
 
+  int   nTypes() const {return _header.nTypes();}
+  const QString& obsType(int index) const {return _header.obsType(index);}
+  const QString& antennaName() const {return _header.antennaName();}
+  const QString& markerName() const {return _header.markerName();}
+  const ColumnVector& xyz() const {return _header.xyz();}
+  const ColumnVector& antNEU() const {return _header.antNEU();}
+
   class t_satObs : public ColumnVector {
    public:
@@ -72 +80 @@
       satObs.clear();
     }
+    bncTime           tt;
     QVector<t_satObs> satObs;
   };