Changeset 3717 in ntrip for trunk/BNC/rinex

Timestamp:

Feb 23, 2012, 5:59:52 PM (13 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/rinex/rnxobsfile.h (modified) (5 diffs)

trunk/BNC/rinex/rnxobsfile.h

@@ -26 +26 @@
 #define RNXOBSFILE_H
 
+#include <QString>
+
 #include <fstream>
-#include <string>
 #include <vector>
 #include <map>
@@ -58 +59 @@
   };
 
-  t_rnxObsFile(const std::string& fileName);
+  t_rnxObsFile(const QString& fileName);
   ~t_rnxObsFile();
   
@@ -64 +65 @@
   double              interval() const {return _header._interval;}
   int                 nTypes(char sys) const {return _header.nTypes(sys);}
-  const std::string&  fileName() const {return _fileName;}
-  const std::string&  obsType(char sys, int index) const {return _header.obsType(sys, index);}
-  const std::string&  antennaName() const {return _header._antennaName;}
-  const std::string&  markerName() const {return _header._markerName;}
+  const QString&      fileName() const {return _fileName;}
+  const QString&      obsType(char sys, int index) const {return _header.obsType(sys, 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;}
@@ -82 +83 @@
  protected:
   t_rnxObsFile() {};
-  void open(const std::string& fileName);
+  void open(const QString& fileName);
   void close();
 
@@ -91 +92 @@
     ~t_rnxObsHeader();
 
-    t_irc               read(std::ifstream* stream, int maxLines = 0);
-    int                 nTypes(char sys) const;
-    const std::string&  obsType(char sys, int index) const;
+    t_irc           read(std::ifstream* stream, int maxLines = 0);
+    int             nTypes(char sys) const;
+    const QString&  obsType(char sys, int index) const;
  
-    static const std::string                  _emptyStr;
-    float                                     _version;
-    double                                    _interval;
-    std::string                               _antennaName;
-    std::string                               _markerName;
-    ColumnVector                              _antNEU;
-    ColumnVector                              _antXYZ;
-    ColumnVector                              _antBSG;
-    ColumnVector                              _xyz;
-    std::vector<std::string>                  _obsTypesV2;
-    std::map<char, std::vector<std::string> > _obsTypesV3;
-    int                                       _wlFactorsL1[MAXPRN_GPS+1];
-    int                                       _wlFactorsL2[MAXPRN_GPS+1];
+    static const QString                  _emptyStr;
+    float                                 _version;
+    double                                _interval;
+    QString                               _antennaName;
+    QString                               _markerName;
+    ColumnVector                          _antNEU;
+    ColumnVector                          _antXYZ;
+    ColumnVector                          _antBSG;
+    ColumnVector                          _xyz;
+    std::vector<QString>                  _obsTypesV2;
+    std::map<char, std::vector<QString> > _obsTypesV3;
+    int                                   _wlFactorsL1[MAXPRN_GPS+1];
+    int                                   _wlFactorsL2[MAXPRN_GPS+1];
   };
 
   const t_rnxEpo* nextEpochV2();
   const t_rnxEpo* nextEpochV3();
-  void handleEpochFlag(int flag, const std::string& line);
+  void handleEpochFlag(int flag, const QString& line);
 
-  std::string    _fileName;
+  QString        _fileName;
   t_rnxObsHeader _header;
   std::ifstream* _stream;