Changeset 5416 in ntrip for trunk/GnssCenter

Timestamp:

Sep 10, 2013, 5:55:53 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/GnssCenter/map_stations

Files:

• map_stations.cpp (modified) (3 diffs)
• map_stations.h (modified) (2 diffs)
• thriftclient.cpp (modified) (4 diffs)
• thriftclient.h (modified) (5 diffs)

trunk/GnssCenter/map_stations/map_stations.cpp

@@ -28 +28 @@
 
 #include "map_stations.h"
+#include "thriftclient.h"
 
 using namespace std;
@@ -98 +99 @@
   // Thrift Client;
   // --------------
-  _thriftClient = new t_thriftClient;
-  connect(_thriftClient, SIGNAL(newThriftResult(t_thriftResult)),
-          this, SLOT(slotNewThriftResult(t_thriftResult)));
+  _thriftClient = new t_thriftClient(this);
   _thriftClient->start();
 }
@@ -164 +163 @@
 // 
 /////////////////////////////////////////////////////////////////////////////
-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::slotNewThriftResult(t_thriftResult* result) {
+  cout << result->_name << ' ' 
+       << result->_nGPS << ' ' << result->_nGLO << ' '
+       << result->_x << ' ' << result->_y << ' ' << result->_z << endl;
 }
 

trunk/GnssCenter/map_stations/map_stations.h

@@ -5 +5 @@
 #include <QWhatsThis>
 #include "plugininterface.h"
-#include "thriftclient.h"
 
 class QwtPlot;
 class QwtPlotZoomer;
 class t_thriftClient;
+class t_thriftResult;
 
 namespace GnssCenter {
@@ -21 +21 @@
  public slots:
   void slotNewPoint(const QString& name, double latDeg, double lonDeg);
-  void slotNewThriftResult(t_thriftResult);
+  void slotNewThriftResult(t_thriftResult*);
 
  private slots:

trunk/GnssCenter/map_stations/thriftclient.cpp

@@ -5 +5 @@
 
 #include "thriftclient.h"
+#include "map_stations.h"
 
 using namespace apache::thrift;
@@ -16 +17 @@
 // Constructor
 //////////////////////////////////////////////////////////////////////////////
-t_thriftClient::t_thriftClient() {
-  _stop = false;
-  qRegisterMetaType<t_thriftResult>("t_thriftResult");
+t_thriftClient::t_thriftClient(GnssCenter::t_map_stations* parent) {
+  _stop   = false;
+  _parent = parent;
 }
 
@@ -36 +37 @@
   shared_ptr<TTransport>  transport(new TBufferedTransport(socket)); 
   shared_ptr<TProtocol>   protocol(new TBinaryProtocol(transport));
-  shared_ptr<RtnetDataIf> dataHandler(new t_thriftClient());
+  shared_ptr<RtnetDataIf> dataHandler(new t_thriftClient(_parent));
   shared_ptr<TProcessor>  processor(new RtnetDataProcessor(dataHandler));
 
@@ -97 +98 @@
       result._z = _stationCrd[staRes.stationName]._z;
     }
-
-    emit newThriftResult(result);
-
-    cout << result._name << ' ' << result._nGPS << ' ' << result._nGLO << endl;
+    _parent->slotNewThriftResult(&result);
   }
 }

trunk/GnssCenter/map_stations/thriftclient.h

@@ -5 +5 @@
 #include <map>
 #include <QThread>
-#include <QMetaType>
 
 #include <transport/TSocket.h>
@@ -14 +13 @@
 
 using namespace com::gpssolutions::rtnet;
+
+namespace GnssCenter {
+  class t_map_stations;
+}
 
 class t_thriftResult {
@@ -33 +36 @@
 };
 
-class t_thriftClient : public QThread, public com::gpssolutions::rtnet::RtnetDataIf {
- Q_OBJECT
+class t_thriftClient : public QThread, public RtnetDataIf {
  public:
-  t_thriftClient();
+  t_thriftClient(GnssCenter::t_map_stations* parent);
   ~t_thriftClient();
   virtual void run();
@@ -42 +44 @@
 
   void startDataStream() {}
-  void registerRtnet(const RtnetInformation& info) {}
-  void handleZDAmb(const std::vector<ZDAmb>& ambList) {}
-  void handleDDAmbresBaselines(const std::vector<DDAmbresBaseline>& ambList) {}
+  void registerRtnet(const RtnetInformation&) {}
+  void handleZDAmb(const std::vector<ZDAmb>&) {}
+  void handleDDAmbresBaselines(const std::vector<DDAmbresBaseline>&) {}
   void handleSatelliteXYZ(const std::vector<SatelliteXYZ>& svXYZList);
   void handleStationInfo(const std::vector<StationInfo>& stationList);
-  void handleStationAuxInfo(const std::vector<StationAuxInfo>& stationAuxList) {}
-  void handleDGPSCorr(const std::vector<DGPSCorr>& dgpsList) {}
-  void handleSatelliteClock(const std::vector<SatelliteClock>& svList) {}
+  void handleStationAuxInfo(const std::vector<StationAuxInfo>&) {}
+  void handleDGPSCorr(const std::vector<DGPSCorr>&) {}
+  void handleSatelliteClock(const std::vector<SatelliteClock>&) {}
   void handleEpochResults(const RtnetEpoch& epoch);
-
- signals:
-  void newThriftResult(t_thriftResult);
 
  private:
@@ -64 +63 @@
   };
 
+  GnssCenter::t_map_stations*         _parent;
   std::map<std::string, t_stationCrd> _stationCrd;
-  bool _stop;
+  bool                                _stop;
 };