Changeset 5431 in ntrip


Ignore:
Timestamp:
Sep 12, 2013, 5:57:31 PM (8 years ago)
Author:
mervart
Message:
 
Location:
trunk/GnssCenter/map_stations
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/GnssCenter/map_stations/map_stations.cpp

    r5430 r5431  
    6868/////////////////////////////////////////////////////////////////////////////
    6969t_map_stations::~t_map_stations() {
    70   if (_thriftClient) {
    71     _thriftClient->stopAndDestroy();
    72   }
     70  slotStopThrift();
    7371  if (_results) {
    7472    while (!_results->empty()) {
     
    8583  if (!_thriftClient) {
    8684    _thriftClient = new t_thriftClient(this);
     85    connect(_thriftClient, SIGNAL(finished()), this, SLOT(slotThriftFinished()));
    8786    _thriftClient->start();
    8887    slotPlotResults();
     
    9897/////////////////////////////////////////////////////////////////////////////
    9998void t_map_stations::slotStopThrift() {
    100   if (_thriftClient && _thriftClient->isRunning()) {
    101     _thriftClient->stopAndDestroy();
     99  qDebug() << "slotStopThrift" << _thriftClient;
     100  if (_thriftClient) {
     101    _thriftClient->stop();
    102102    _thriftClient = 0;
    103103  }
     104}
     105
     106//
     107/////////////////////////////////////////////////////////////////////////////
     108void t_map_stations::slotThriftFinished() {
     109  qDebug() << "slotThriftFinished" << _thriftClient;
     110  sender()->deleteLater();
     111  _thriftClient = 0;
    104112}
    105113
  • trunk/GnssCenter/map_stations/map_stations.h

    r5430 r5431  
    2626  void slotStartThrift();
    2727  void slotStopThrift();
     28  void slotThriftFinished();
    2829  void slotPlotResults();
    2930
  • trunk/GnssCenter/map_stations/thriftclient.cpp

    r5427 r5431  
    6262    cerr << "Unknown exception" << endl;
    6363  }
    64   this->terminate();
    65   this->deleteLater();
    6664}
    6765
  • trunk/GnssCenter/map_stations/thriftclient.h

    r5428 r5431  
    6868  ~t_thriftClient();
    6969  virtual void run();
    70   void stopAndDestroy() {
     70  void stop() {
    7171    QMutexLocker locker(&_mutex);
    7272    _stop = true;
Note: See TracChangeset for help on using the changeset viewer.