Changeset 8280 in ntrip for branches/BNC_2.12/src

Timestamp:

Feb 13, 2018, 7:48:31 AM (6 years ago)

Author:

stuerze

Message:

minor changes

Location:

branches/BNC_2.12/src

Files:

• bncfigureppp.h (modified) (1 diff)
• bncwindow.cpp (modified) (1 diff)
• rinex/rnxnavfile.h (modified) (3 diffs)
• rinex/rnxobsfile.h (modified) (1 diff)

branches/BNC_2.12/src/bncfigureppp.h

@@ -43 +43 @@
 
  private:
-  const static double _tRange = 300;
+  constexpr static double _tRange = 300;
 
   class pppPos {

branches/BNC_2.12/src/bncwindow.cpp

@@ -2684 +2684 @@
         QComboBox* system = new QComboBox();
         system->setEditable(false);
-        system->addItems(QString(",IGS14,ETRF2000,NAD83,GDA94,SIRGAS95,SIRGAS2000,DREF91,Custom").split(","));
+        system->addItems(QString(",IGS14,ETRF2000,NAD83,GDA2020,SIRGAS2000,DREF91,Custom").split(","));
         system->setFrame(false);
         system->setCurrentIndex(system->findText(hlp[iCol]));

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

@@ -39 +39 @@
  public:
   enum e_inpOut {input, output};
-  static const double defaultRnxNavVersion2 = 2.11;
-  static const double defaultRnxNavVersion3 = 3.03;
+  static constexpr double defaultRnxNavVersion2 = 2.11;
+  static constexpr double defaultRnxNavVersion3 = 3.03;
 
  private:
@@ -52 +52 @@
     QStringList _comments;
   };
- 
+
  public:
   t_rnxNavFile(const QString& fileName, e_inpOut inpOut);
@@ -62 +62 @@
   bool   glonass() const {return _header._glonass;}
   QStringList comments() const {return _header._comments;}
-  void   setGlonass(bool glo) {_header._glonass = glo;} 
+  void   setGlonass(bool glo) {_header._glonass = glo;}
   void   writeHeader(const QMap<QString, QString>* txtMap = 0);
   void   writeEph(const t_eph* eph);

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

@@ -43 +43 @@
 
  public:
-  static const double  defaultRnxObsVersion2 = 2.11;
-  static const double  defaultRnxObsVersion3 = 3.03;
-  static const QString defaultSystems;
+  static constexpr double  defaultRnxObsVersion2 = 2.11;
+  static constexpr double  defaultRnxObsVersion3 = 3.03;
 
   t_rnxObsHeader();