Changeset 6431 in ntrip

Timestamp:

Dec 25, 2014, 10:30:53 AM (9 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/orbComp

Files:

• sp3Comp.cpp (modified) (3 diffs)
• sp3Comp.h (modified) (1 diff)

trunk/BNC/src/orbComp/sp3Comp.cpp

@@ -49 +49 @@
 using namespace std;
 
-bool excludeSat(const t_prn& prn) {
-  if (prn == t_prn('R', 7)) {
-    return true;
-  }
-  else {
-    return false;
-  }
-}
-
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
@@ -71 +62 @@
   _log         = 0;
 
-  //// beg test
-  _excludeSats.insert(t_prn('R',  2));
-  _excludeSats.insert(t_prn('R',  3));
-  _excludeSats.insert(t_prn('R',  4));
-  _excludeSats.insert(t_prn('R',  5));
-  _excludeSats.insert(t_prn('R',  6));
-  _excludeSats.insert(t_prn('R',  7));
-  _excludeSats.insert(t_prn('R',  9));
-  _excludeSats.insert(t_prn('R', 10));
-  _excludeSats.insert(t_prn('R', 11));
-  _excludeSats.insert(t_prn('R', 12));
-  _excludeSats.insert(t_prn('R', 13));
-  _excludeSats.insert(t_prn('R', 14));
-  _excludeSats.insert(t_prn('R', 15));
-  _excludeSats.insert(t_prn('R', 16));
-  _excludeSats.insert(t_prn('R', 17));
-  _excludeSats.insert(t_prn('R', 18));
-  _excludeSats.insert(t_prn('R', 19));
-  _excludeSats.insert(t_prn('R', 20));
-  _excludeSats.insert(t_prn('R', 21));
-  _excludeSats.insert(t_prn('R', 22));
-  _excludeSats.insert(t_prn('R', 23));
-  _excludeSats.insert(t_prn('R', 24));
-  //// end test
+  _excludeSats = settings.value("sp3CompExclude").toString().split(QRegExp("[ ,]"), QString::SkipEmptyParts);
 }
 
@@ -435 +403 @@
 ////////////////////////////////////////////////////////////////////////////
 bool t_sp3Comp::excludeSat(const t_prn& prn) const {
-  if (_excludeSats.find(prn) != _excludeSats.end()) {
-    return true;
-  }
-  else {
-    return false;
-  }
-}
-
+  QStringListIterator it(_excludeSats);
+  while (it.hasNext()) {
+    string prnStr = it.next().toAscii().data();
+    if (prnStr == prn.toString() || prnStr == prn.toString().substr(0,1)) {
+      return true;
+    }
+  }
+  return false;
+}
+

trunk/BNC/src/orbComp/sp3Comp.h

@@ -87 +87 @@
   bool excludeSat(const t_prn& prn) const;
 
-  QStringList     _sp3FileNames;
-  QString         _logFileName;
-  QFile*          _logFile;
-  QTextStream*    _log;
-  std::set<t_prn> _excludeSats;
+  QStringList  _sp3FileNames;
+  QString      _logFileName;
+  QFile*       _logFile;
+  QTextStream* _log;
+  QStringList  _excludeSats;
 };