Changeset 5424 in ntrip

Timestamp:

Sep 12, 2013, 4:59:56 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/GnssCenter/map_stations

Files:

• thriftclient.cpp (modified) (4 diffs)
• thriftclient.h (modified) (3 diffs)

trunk/GnssCenter/map_stations/thriftclient.cpp

@@ -38 +38 @@
   shared_ptr<TTransport>  transport(new TBufferedTransport(socket)); 
   shared_ptr<TProtocol>   protocol(new TBinaryProtocol(transport));
-  shared_ptr<RtnetDataIf> dataHandler(new t_thriftClient(_parent));
+  shared_ptr<RtnetDataIf> dataHandler(new t_thriftHandler(_parent));
   shared_ptr<TProcessor>  processor(new RtnetDataProcessor(dataHandler));
 
@@ -56 +56 @@
 }
 
+// Constructor
+//////////////////////////////////////////////////////////////////////////////
+t_thriftHandler::t_thriftHandler(GnssCenter::t_map_stations* parent) {
+  _parent = parent;
+}
+
+// Destructor
+//////////////////////////////////////////////////////////////////////////////
+t_thriftHandler::~t_thriftHandler() {
+}
+
 // Handle Satellite Positions
 //////////////////////////////////////////////////////////////////////////////
-void t_thriftClient::
+void t_thriftHandler::
 handleSatelliteXYZ(const vector<SatelliteXYZ>& svXYZList) {
   cout.setf(ios::fixed);
@@ -73 +84 @@
 // Handle Station Info
 //////////////////////////////////////////////////////////////////////////////
-void t_thriftClient::
+void t_thriftHandler::
 handleStationInfo(const vector<StationInfo>& stationList) {
   for (unsigned ii = 0; ii < stationList.size(); ii++) {
@@ -83 +94 @@
 }
 
-// Handle Eoch Results
+// Handle Epoch Results
 //////////////////////////////////////////////////////////////////////////////
-void t_thriftClient::
+void t_thriftHandler::
 handleEpochResults(const RtnetEpoch& epoch) {
   for (unsigned ii = 0; ii < epoch.stationResultList.size(); ii++) {

trunk/GnssCenter/map_stations/thriftclient.h

@@ -36 +36 @@
 };
 
-class t_thriftClient : public QThread, public RtnetDataIf {
+
+class t_thriftHandler : public RtnetDataIf {
  public:
-  t_thriftClient(GnssCenter::t_map_stations* parent);
-  ~t_thriftClient();
-  virtual void run();
-  void stop() {_stop = true;}
-
+  t_thriftHandler(GnssCenter::t_map_stations* parent);
+  ~t_thriftHandler();
   void startDataStream() {}
   void registerRtnet(const RtnetInformation&) {}
@@ -53 +51 @@
   void handleSatelliteClock(const std::vector<SatelliteClock>&) {}
   void handleEpochResults(const RtnetEpoch& epoch);
-
  private:
-
   class t_stationCrd {
    public:
@@ -62 +58 @@
     double _z;
   };
-
   GnssCenter::t_map_stations*         _parent;
   std::map<std::string, t_stationCrd> _stationCrd;
-  bool                                _stop;
+};
+
+class t_thriftClient : public QThread {
+ public:
+  t_thriftClient(GnssCenter::t_map_stations* parent);
+  ~t_thriftClient();
+  virtual void run();
+  void stop() {_stop = true;}
+
+ private:
+  GnssCenter::t_map_stations* _parent;
+  bool                        _stop;
 };