Changeset 8286 in ntrip for branches/BNC_2.12

Timestamp:

Feb 23, 2018, 10:10:12 AM (6 years ago)

Author:

stuerze

Message:

minor changes

Location:

branches/BNC_2.12/src

Files:

• bnccore.cpp (modified) (6 diffs)
• rinex/reqcedit.cpp (modified) (4 diffs)
• rinex/rnxnavfile.h (modified) (1 diff)
• rinex/rnxobsfile.cpp (modified) (6 diffs)
• rinex/rnxobsfile.h (modified) (2 diffs)

branches/BNC_2.12/src/bnccore.cpp

@@ -391 +391 @@
         line.sprintf(
           "%9.2f%11sN: GNSS NAV DATA    M: Mixed%12sRINEX VERSION / TYPE\n",
-          t_rnxNavFile::defaultRnxNavVersion3, "", "");
+          defaultRnxNavVersion3, "", "");
         *_ephStreamGPS << line;
 
@@ -404 +404 @@
           *_ephStreamGPS << it.next().trimmed().left(60).leftJustified(60) << "COMMENT\n";
         }
-        
+
         line.sprintf("%60sEND OF HEADER\n", "");
         *_ephStreamGPS << line;
@@ -418 +418 @@
         QString line;
         line.sprintf("%9.2f%11sN: GPS NAV DATA%25sRINEX VERSION / TYPE\n",
-                     t_rnxNavFile::defaultRnxNavVersion2, "", "");
+                     defaultRnxNavVersion2, "", "");
         *_ephStreamGPS << line;
 
@@ -431 +431 @@
           *_ephStreamGPS << it.next().trimmed().left(60).leftJustified(60) << "COMMENT\n";
         }
-        
+
         line.sprintf("%60sEND OF HEADER\n", "");
         *_ephStreamGPS << line;
@@ -440 +440 @@
         QString line;
         line.sprintf("%9.2f%11sG: GLONASS NAV DATA%21sRINEX VERSION / TYPE\n",
-                     t_rnxNavFile::defaultRnxNavVersion2, "", "");
+                     defaultRnxNavVersion2, "", "");
         *_ephStreamGlonass << line;
 
@@ -467 +467 @@
 void t_bncCore::printEph(const t_eph& eph, bool printFile) {
 
-  QString strV2 = eph.toString(t_rnxNavFile::defaultRnxNavVersion2);
-  QString strV3 = eph.toString(t_rnxObsHeader::defaultRnxObsVersion3);
+  QString strV2 = eph.toString(defaultRnxNavVersion2);
+  QString strV3 = eph.toString(defaultRnxObsVersion3);
 
   if     (_rinexVers == 2 && eph.type() == t_eph::GLONASS) {

branches/BNC_2.12/src/rinex/reqcedit.cpp

@@ -64 +64 @@
   int version     = settings.value("reqcRnxVersion").toInt();
   if (version < 3) {
-    _rnxVersion = t_rnxObsHeader::defaultRnxObsVersion2;
+    _rnxVersion = defaultRnxObsVersion2;
   }
   else {
-    _rnxVersion = t_rnxObsHeader::defaultRnxObsVersion3;
+    _rnxVersion = defaultRnxObsVersion3;
   }
   _samplingRate   = settings.value("reqcSampling").toInt();
@@ -533 +533 @@
     return;
   }
-  
+
   // Concatenate all comments
   // ------------------------
@@ -552 +552 @@
   }
   comments.removeDuplicates();
-  
+
   // Read Ephemerides
   // ----------------
@@ -578 +578 @@
 
   if ( (haveGPS && haveGlonass) || _rnxVersion >= 3.0) {
-    outNavFile.setVersion(t_rnxNavFile::defaultRnxNavVersion3);
+    outNavFile.setVersion(defaultRnxNavVersion3);
   }
   else {
-    outNavFile.setVersion(t_rnxNavFile::defaultRnxNavVersion2);
+    outNavFile.setVersion(defaultRnxNavVersion2);
   }
 

branches/BNC_2.12/src/rinex/rnxnavfile.h

@@ -35 +35 @@
 class t_eph;
 
+#define defaultRnxNavVersion2 2.11
+#define defaultRnxNavVersion3 3.03
+
 class t_rnxNavFile {
 
  public:
   enum e_inpOut {input, output};
-  static constexpr double defaultRnxNavVersion2 = 2.11;
-  static constexpr double defaultRnxNavVersion3 = 3.03;
-
  private:
   class t_rnxNavHeader {

branches/BNC_2.12/src/rinex/rnxobsfile.cpp

@@ -166 +166 @@
     else if (key == "# / TYPES OF OBSERV") {
       if (_version == 0.0) {
-        _version = t_rnxObsHeader::defaultRnxObsVersion2;
+        _version = defaultRnxObsVersion2;
       }
       QTextStream* in = new QTextStream(value.toAscii(), QIODevice::ReadOnly);
@@ -190 +190 @@
     else if (key == "SYS / # / OBS TYPES") {
       if (_version == 0.0) {
-        _version = t_rnxObsHeader::defaultRnxObsVersion3;
+        _version = defaultRnxObsVersion3;
       }
       QTextStream* in = new QTextStream(value.toAscii(), QIODevice::ReadOnly);
@@ -307 +307 @@
 
   if (version <= 2) {
-    _version = t_rnxObsHeader::defaultRnxObsVersion2;
+    _version = defaultRnxObsVersion2;
   }
   else {
-    _version = t_rnxObsHeader::defaultRnxObsVersion3;
+    _version = defaultRnxObsVersion3;
   }
 
@@ -359 +359 @@
                    << "C6I" << "L6I" << "S6I"
                    << "C7I" << "L7I" << "S7I";
-                   
+
     _obsTypes['I'] << "C5A" << "L5A" << "S5A"
                    << "C9A" << "L9A" << "S9A";
@@ -374 +374 @@
 
   if (version <= 2) {
-    _version = t_rnxObsHeader::defaultRnxObsVersion2;
+    _version = defaultRnxObsVersion2;
   }
   else {
-    _version = t_rnxObsHeader::defaultRnxObsVersion3;
+    _version = defaultRnxObsVersion3;
   }
   _interval        = header._interval;
@@ -447 +447 @@
                        << "C6I" << "L6I" << "S6I"
                        << "C7I" << "L7I" << "S7I";
-                       
+
         _obsTypes['I'] << "C5A" << "L5A" << "S5A"
                        << "C9A" << "L9A" << "S9A";

branches/BNC_2.12/src/rinex/rnxobsfile.h

@@ -38 +38 @@
 #include "satObs.h"
 
+#define defaultRnxObsVersion2 2.11
+#define defaultRnxObsVersion3 3.03
+
 class t_rnxObsHeader {
 
@@ -43 +46 @@
 
  public:
-  static constexpr double  defaultRnxObsVersion2 = 2.11;
-  static constexpr double  defaultRnxObsVersion3 = 3.03;
-
+ 
   t_rnxObsHeader();
   ~t_rnxObsHeader();