Changeset 5431 in ntrip for trunk

Timestamp:

Sep 12, 2013, 5:57:31 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/GnssCenter/map_stations

Files:

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

trunk/GnssCenter/map_stations/map_stations.cpp

@@ -68 +68 @@
 /////////////////////////////////////////////////////////////////////////////
 t_map_stations::~t_map_stations() {
-  if (_thriftClient) { 
-    _thriftClient->stopAndDestroy();
-  }
+  slotStopThrift();
   if (_results) {
     while (!_results->empty()) {
@@ -85 +83 @@
   if (!_thriftClient) {
     _thriftClient = new t_thriftClient(this);
+    connect(_thriftClient, SIGNAL(finished()), this, SLOT(slotThriftFinished()));
     _thriftClient->start();
     slotPlotResults();
@@ -98 +97 @@
 /////////////////////////////////////////////////////////////////////////////
 void t_map_stations::slotStopThrift() {
-  if (_thriftClient && _thriftClient->isRunning()) {
-    _thriftClient->stopAndDestroy();
+  qDebug() << "slotStopThrift" << _thriftClient;
+  if (_thriftClient) {
+    _thriftClient->stop();
     _thriftClient = 0;
   }
+}
+
+// 
+/////////////////////////////////////////////////////////////////////////////
+void t_map_stations::slotThriftFinished() {
+  qDebug() << "slotThriftFinished" << _thriftClient;
+  sender()->deleteLater();
+  _thriftClient = 0;
 }
 

trunk/GnssCenter/map_stations/map_stations.h

@@ -26 +26 @@
   void slotStartThrift();
   void slotStopThrift();
+  void slotThriftFinished();
   void slotPlotResults();
 

trunk/GnssCenter/map_stations/thriftclient.cpp

@@ -62 +62 @@
     cerr << "Unknown exception" << endl;
   }
-  this->terminate();
-  this->deleteLater();
 }
 

trunk/GnssCenter/map_stations/thriftclient.h

@@ -68 +68 @@
   ~t_thriftClient();
   virtual void run();
-  void stopAndDestroy() {
+  void stop() {
     QMutexLocker locker(&_mutex);
     _stop = true;