Changeset 7169 in ntrip for trunk/BNC/src/rinex

Timestamp:

Aug 5, 2015, 2:29:18 PM (9 years ago)

Author:

stuerze

Message:

harmonization of data type for SSR IOD

Location:

trunk/BNC/src/rinex

Files:

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

trunk/BNC/src/rinex/corrfile.h

@@ -39 +39 @@
   ~t_corrFile();
   void syncRead(const bncTime& tt);
-  const QMap<QString, unsigned long>& corrIODs() const {return _corrIODs;}
+  const QMap<QString, unsigned int>& corrIODs() const {return _corrIODs;}
 
  signals:
@@ -49 +49 @@
 
  private:
-  std::ifstream                _stream;
-  std::string                  _lastLine;
-  bncTime                      _lastEpoTime;
-  QMap<QString, unsigned long> _corrIODs;
+  std::ifstream               _stream;
+  std::string                 _lastLine;
+  bncTime                     _lastEpoTime;
+  QMap<QString, unsigned int> _corrIODs;
 };
 

trunk/BNC/src/rinex/rnxnavfile.cpp

@@ -212 +212 @@
 ////////////////////////////////////////////////////////////////////////////
 t_eph* t_rnxNavFile::getNextEph(const bncTime& tt, 
-                                const QMap<QString, unsigned long>* corrIODs) {
+                                const QMap<QString, unsigned int>* corrIODs) {
 
   // Get Ephemeris according to IOD
   // ------------------------------
   if (corrIODs) {
-    QMapIterator<QString, unsigned long> itIOD(*corrIODs);
+    QMapIterator<QString, unsigned int> itIOD(*corrIODs);
     while (itIOD.hasNext()) {
       itIOD.next();
       QString prn = itIOD.key();
-      unsigned long iod = itIOD.value();
+      unsigned int iod = itIOD.value();
       vector<t_eph*>::iterator it = _ephs.begin();
       while (it != _ephs.end()) {

trunk/BNC/src/rinex/rnxnavfile.h

@@ -55 +55 @@
   t_rnxNavFile(const QString& fileName, e_inpOut inpOut);
   ~t_rnxNavFile();
-  t_eph* getNextEph(const bncTime& tt, const QMap<QString, unsigned long>* corrIODs);
+  t_eph* getNextEph(const bncTime& tt, const QMap<QString, unsigned int>* corrIODs);
   const std::vector<t_eph*> ephs() const {return _ephs;}
   double version() const {return _header._version;}