Changeset 3683 in ntrip

Timestamp:

Feb 12, 2012, 12:19:45 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

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

trunk/BNC/bncpostprocess.cpp

@@ -100 +100 @@
   // ----------------
   t_eph* eph = 0;
-  while (_rnxNavFile->getNextEph(eph) == success) {
+  while ( (eph = _rnxNavFile->getNextEph()) != 0 ) {
     if (_pppClient->putNewEph(eph) != success) {
       delete eph; eph = 0;
@@ -109 +109 @@
   // -----------------
   const t_rnxObsFile::t_epo* epo = 0;
-  while ( (epo = _rnxObsFile->nextEpoch()) != 0) {
+  while ( (epo = _rnxObsFile->nextEpoch()) != 0 ) {
     for (int iObs = 0; iObs < epo->satObs.size(); iObs++) {
       const t_rnxObsFile::t_satObs& satObs = epo->satObs[iObs];

trunk/BNC/rnxnavfile.cpp

@@ -104 +104 @@
 // Read Next Ephemeris
 ////////////////////////////////////////////////////////////////////////////
-t_irc t_rnxNavFile::getNextEph(t_eph* eph) {
+t_eph* t_rnxNavFile::getNextEph() {
 
-  eph = 0;
+  t_eph* eph = 0;
 
   while (_stream->status() == QTextStream::Ok && !_stream->atEnd()) {
@@ -146 +146 @@
     }
     if (eph && eph->ok()) {
-      return success;
+      return eph;
     }
   }
 
   delete eph;
-  eph = 0;
-  return failure;
+  return 0;
 }

trunk/BNC/rnxnavfile.h

@@ -50 +50 @@
   t_rnxNavFile(QString fileName);
   ~t_rnxNavFile();
-  t_irc getNextEph(t_eph* eph);
+  t_eph* getNextEph();
   float version() const {return _header.version();}
   bool  glonass() const {return _header.glonass();}