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

Timestamp:

Oct 11, 2014, 3:09:24 PM (11 years ago)

Author:

mervart

Message:

 

File:

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

trunk/BNC/src/rinex/rnxobsfile.h

@@ -41 +41 @@
 
  friend class t_rnxObsFile;
- friend class bncRinex;
 
  public:
@@ -51 +50 @@
   ~t_rnxObsHeader();
 
+  double      version() const {return _version;}
   t_irc       read(QTextStream* stream, int maxLines = 0);
   void        setDefault(const QString& markerName, int version);
@@ -58 +58 @@
   int         nTypes(char sys) const;
   QString     obsType(char sys, int index, double version = 0.0) const;
+  void        write(QTextStream* stream, const QMap<QString, QString>* txtMap = 0) const;
+  bncTime     startTime() const {return _startTime;}
+  void        setStartTime(const bncTime& startTime) {_startTime = startTime;}
+
+ private:
   QStringList obsTypesStrings() const;
-  void        write(QTextStream* stream, const QMap<QString, QString>* txtMap = 0) const;
-
- private:
-  float                         _version;
+  double                        _version;
   double                        _interval;
   QString                       _antennaNumber;
@@ -120 +122 @@
   ~t_rnxObsFile();
   
-  float          version() const {return _header._version;}
+  double         version() const {return _header._version;}
   double         interval() const {return _header._interval;}
   int            numSys() const {return _header.numSys();}
@@ -171 +173 @@
   static QString type3to2(char sys, const QString& typeV3);
 
+  static void writeEpoch(QTextStream* stream, const t_rnxObsHeader& header, const t_rnxEpo* epo) {
+    if (header.version() >= 3.0) {
+      writeEpochV3(stream, header, epo);
+    }
+    else {
+      writeEpochV2(stream, header, epo);
+    }
+  }
+
+ private:
   static void writeEpochV2(QTextStream* stream, const t_rnxObsHeader& header, const t_rnxEpo* epo);
   static void writeEpochV3(QTextStream* stream, const t_rnxObsHeader& header, const t_rnxEpo* epo);
-
- private:
   t_rnxObsFile() {};
   void openRead(const QString& fileName);
   void openWrite(const QString& fileName);
   void close();
-  void writeEpochV2(const t_rnxEpo* epo);
-  void writeEpochV3(const t_rnxEpo* epo);
   t_rnxEpo* nextEpochV2();
   t_rnxEpo* nextEpochV3();