Changeset 5427 in ntrip

Timestamp:

Sep 12, 2013, 5:25:18 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/GnssCenter/map_stations

Files:

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

trunk/GnssCenter/map_stations/map_stations.cpp

@@ -57 +57 @@
   // --------------
   _thriftClient = 0;
+  _results      = 0;
 }
 
@@ -83 +84 @@
 // 
 /////////////////////////////////////////////////////////////////////////////
-void t_map_stations::slotNewThriftResult(t_thriftResult* result) {
-  cout << result->_name << ' ' 
-       << result->_nGPS << ' ' << result->_nGLO << ' '
-       << result->_x << ' ' << result->_y << ' ' << result->_z << endl;
+void t_map_stations::putThriftResults(std::vector<t_thriftResult*>* results) {
+  if (_results) {
+    while (!_results->empty()) {
+      delete _results->back();
+      _results->pop_back();
+    }
+    delete _results;
+  }
+  _results = results;
+  // beg test
+  for (unsigned ii = 0; ii < _results->size(); ii++) {
+    const t_thriftResult* result = _results->at(ii);
+    cout << result->_name << ' ' 
+         << result->_nGPS << ' ' << result->_nGLO << ' '
+         << result->_x << ' ' << result->_y << ' ' << result->_z << endl;
+  }
+  // end test
 }

trunk/GnssCenter/map_stations/map_stations.h

@@ -21 +21 @@
   ~t_map_stations();
 
- public slots:
-  void slotNewThriftResult(t_thriftResult*);
+  void putThriftResults(std::vector<t_thriftResult*>* results);
 
  private slots:
@@ -28 +27 @@
 
  private:
-  t_worldPlot*    _plot;
-  t_thriftClient* _thriftClient;
+  t_worldPlot*                  _plot;
+  t_thriftClient*               _thriftClient;
+  std::vector<t_thriftResult*>* _results;
 };
 

trunk/GnssCenter/map_stations/thriftclient.cpp

@@ -108 +108 @@
 void t_thriftHandler::
 handleEpochResults(const RtnetEpoch& epoch) {
+  vector<t_thriftResult*>* results = new vector<t_thriftResult*>;
   for (unsigned ii = 0; ii < epoch.stationResultList.size(); ii++) {
     const StationResults& staRes = epoch.stationResultList[ii];
-    t_thriftResult result;
-    
-    result._name = staRes.stationName;
-    result._nGPS = staRes.nsv_gps_used;
-    result._nGLO = staRes.nsv_glonass_used;
+    t_thriftResult* res = new t_thriftResult;
+    res->_name = staRes.stationName;
+    res->_nGPS = staRes.nsv_gps_used;
+    res->_nGLO = staRes.nsv_glonass_used;
     if (_stationCrd.find(staRes.stationName) != _stationCrd.end()) {
-      result._x = _stationCrd[staRes.stationName]._x;
-      result._y = _stationCrd[staRes.stationName]._y;
-      result._z = _stationCrd[staRes.stationName]._z;
+      res->_x = _stationCrd[staRes.stationName]._x;
+      res->_y = _stationCrd[staRes.stationName]._y;
+      res->_z = _stationCrd[staRes.stationName]._z;
     }
-    _parent->slotNewThriftResult(&result);
+    results->push_back(res);
   }
+  _parent->putThriftResults(results);
 }