Changeset 3675 in ntrip

Timestamp:

Feb 12, 2012, 10:39:03 AM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

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

trunk/BNC/bncpostprocess.cpp

@@ -108 +108 @@
   // Read Observations
   // -----------------
-  while (_rnxObsFile->getEpoch() == success) {
+  const t_rnxObsFile::t_epo* epo = 0;
+  while ( (epo = _rnxObsFile->nextEpoch()) != 0) {
 
   }

trunk/BNC/rnxobsfile.cpp

@@ -130 +130 @@
 // Retrieve single Epoch
 ////////////////////////////////////////////////////////////////////////////
-t_irc t_rnxObsFile::getEpoch() {
+const t_rnxObsFile::t_epo* t_rnxObsFile::nextEpoch() {
   if (version() < 3.0) {
-    return getEpochV2();
+    return nextEpochV2();
   }
   else {
-    return getEpochV3();
+    return nextEpochV3();
   }
 }
@@ -141 +141 @@
 // Retrieve single Epoch (RINEX Version 3)
 ////////////////////////////////////////////////////////////////////////////
-t_irc t_rnxObsFile::getEpochV3() {
-  return failure; // TODO
+const t_rnxObsFile::t_epo* t_rnxObsFile::nextEpochV3() {
+  return 0; // TODO
 }
 
 // Retrieve single Epoch (RINEX Version 2)
 ////////////////////////////////////////////////////////////////////////////
-t_irc t_rnxObsFile::getEpochV2() {
+const t_rnxObsFile::t_epo* t_rnxObsFile::nextEpochV2() {
   while (_stream->status() == QTextStream::Ok && !_stream->atEnd()) {
     QString line = _stream->readLine();
@@ -174 +174 @@
       }
       QString prn = line.mid(pos, 3);
+      
       cout << "prn = " << prn.toAscii().data() << endl;
       pos += 3;
@@ -179 +180 @@
 
     //// beg test
-    return failure;
+    return 0;
     //// end test
   }
 
-  return success;
+  return &_currEpo;
 }

trunk/BNC/rnxobsfile.h

@@ -60 +60 @@
   ~t_rnxObsFile();
 
+  class t_epo {
+   public:
+    QMap<QString, ColumnVector> satObs;
+  };
+
   float version() const {return _header.version();}
-  t_irc getEpoch(); 
+  const t_epo* nextEpoch(); 
 
  private:
-  t_irc getEpochV2();
-  t_irc getEpochV3();
+  const t_epo* nextEpochV2();
+  const t_epo* nextEpochV3();
 
   t_rnxObsHeader _header;
   QFile*         _file;
   QTextStream*   _stream;
+  t_epo          _currEpo;
 };