Changeset 5499 in ntrip

Timestamp:

Sep 23, 2013, 10:11:50 AM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/GnssCenter/monitor

Files:

• monitor.cpp (modified) (1 diff)
• thriftclient.cpp (modified) (1 diff)
• thriftclient.h (modified) (2 diffs)

trunk/GnssCenter/monitor/monitor.cpp

@@ -303 +303 @@
           for (unsigned jj = 0; jj < _results->size(); jj++) {
             const t_thriftResult* result = _results->at(jj);
-            for (unsigned is = 0; is < result->_prns.size(); is++) {
-              if (result->_prns[is] == sat->_prn) {
-                numSta += 1;
-              }
+            if (result->_prns.find(sat->_prn) != result->_prns.end()) {
+              numSta += 1;
             }
           }

trunk/GnssCenter/monitor/thriftclient.cpp

@@ -142 +142 @@
     }
 
-    for (unsigned is = 0; is < staRes.svPosList.size(); is++) {
-      const SatelliteEleAzi& sat = staRes.svPosList[is];
-      string prn = id2prn(sat.constellation, sat.ID);
-      const double eleMask = 10.0;
-      if (sat.elevation > eleMask) {
-        res->_prns.push_back(prn);
+    for (unsigned ic = 0; ic < staRes.residList.size(); ic++) {
+      const ResidualInfo& info = staRes.residList[ic];
+      for (unsigned is = 0; is < info.svResid.size(); is++) {
+        const SvResidualInfo& sat = info.svResid[is];
+        string prn = id2prn(sat.constellation, sat.ID);
+        res->_prns.insert(prn);
       }
     }

trunk/GnssCenter/monitor/thriftclient.h

@@ -4 +4 @@
 #include <string>
 #include <map>
+#include <set>
 #include <QString>
 #include <QThread>
@@ -32 +33 @@
   }
   ~t_thriftResult() {}
-  std::string              _name;
-  int                      _nGPS;  
-  int                      _nGLO;
-  double                   _x;
-  double                   _y;
-  double                   _z;
-  std::vector<std::string> _prns;
+  std::string           _name;
+  int                   _nGPS;  
+  int                   _nGLO;
+  double                _x;
+  double                _y;
+  double                _z;
+  std::set<std::string> _prns;
 };