sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename overloaded signal, flip remaining connects to new style

Browse Source
This commit is contained in:
Nyall Dawson 2016-11-03 17:40:38 +10:00
parent f71c78e14f
commit 252f2e1102
5 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python/core/qgstaskmanager.sip
View File

@ -347,6 +347,11 @@ class QgsTaskManager : QObject
//! @param progress percent of progress, from 0.0 - 100.0
void progressChanged( long taskId, double progress );
//! Will be emitted when only a single task remains to complete
//! and that task has reported a progress change
//! @param progress percent of progress, from 0.0 - 100.0
void finalTaskProgressChanged( double progress );
//! Will be emitted when a task reports a status change
//! @param taskId ID of task
//! @param status new task status

2
src/core/qgstaskmanager.cpp
View File

@ -352,7 +352,7 @@ void QgsTaskManager::taskProgressChanged( double progress )
emit progressChanged( id, progress );
if ( mActiveTasks.count() == 1 )
{
emit progressChanged( progress );
emit finalTaskProgressChanged( progress );
}
}

2
src/core/qgstaskmanager.h
View File

@ -379,7 +379,7 @@ class CORE_EXPORT QgsTaskManager : public QObject
//! Will be emitted when only a single task remains to complete
//! and that task has reported a progress change
//! @param progress percent of progress, from 0.0 - 100.0
void progressChanged( double progress );
void finalTaskProgressChanged( double progress );
//! Will be emitted when a task reports a status change
//! @param taskId ID of task

18
src/gui/qgstaskmanagerwidget.cpp
View File

@ -75,10 +75,10 @@ QgsTaskManagerModel::QgsTaskManagerModel( QgsTaskManager *manager, QObject *pare
mRowToTaskIdMap.insert( i, mManager->taskId( task ) );
}
connect( mManager, SIGNAL( taskAdded( long ) ), this, SLOT( taskAdded( long ) ) );
connect( mManager, SIGNAL( taskAboutToBeDeleted( long ) ), this, SLOT( taskDeleted( long ) ) );
connect( mManager, SIGNAL( progressChanged( long, double ) ), this, SLOT( progressChanged( long, double ) ) );
connect( mManager, SIGNAL( statusChanged( long, int ) ), this, SLOT( statusChanged( long, int ) ) );
connect( mManager, &QgsTaskManager::taskAdded, this, &QgsTaskManagerModel::taskAdded );
connect( mManager, &QgsTaskManager::taskAboutToBeDeleted, this, &QgsTaskManagerModel::taskDeleted );
connect( mManager, &QgsTaskManager::progressChanged, this, &QgsTaskManagerModel::progressChanged );
connect( mManager, &QgsTaskManager::statusChanged, this, &QgsTaskManagerModel::statusChanged );
}
QModelIndex QgsTaskManagerModel::index( int row, int column, const QModelIndex &parent ) const
@ -412,13 +412,13 @@ QgsTaskManagerStatusBarWidget::QgsTaskManagerStatusBarWidget( QgsTaskManager *ma
mFloatingWidget->setAnchorPoint( QgsFloatingWidget::BottomMiddle );
mFloatingWidget->setAnchorWidgetPoint( QgsFloatingWidget::TopMiddle );
mFloatingWidget->hide();
connect( this, SIGNAL( clicked( bool ) ), this, SLOT( toggleDisplay() ) );
connect( this, &QgsTaskManagerStatusBarWidget::clicked, this, &QgsTaskManagerStatusBarWidget::toggleDisplay );
hide();
connect( manager, SIGNAL( taskAdded( long ) ), this, SLOT( showButton() ) );
connect( manager, SIGNAL( allTasksFinished() ), this, SLOT( allFinished() ) );
connect( manager, SIGNAL( progressChanged( double ) ), this, SLOT( overallProgressChanged( double ) ) );
connect( manager, SIGNAL( countActiveTasksChanged( int ) ), this, SLOT( countActiveTasksChanged( int ) ) );
connect( manager, &QgsTaskManager::taskAdded, this, &QgsTaskManagerStatusBarWidget::showButton );
connect( manager, &QgsTaskManager::allTasksFinished, this, &QgsTaskManagerStatusBarWidget::allFinished );
connect( manager, &QgsTaskManager::finalTaskProgressChanged, this, &QgsTaskManagerStatusBarWidget::overallProgressChanged );
connect( manager, &QgsTaskManager::countActiveTasksChanged, this, &QgsTaskManagerStatusBarWidget::countActiveTasksChanged );
}
QSize QgsTaskManagerStatusBarWidget::sizeHint() const

4
tests/src/core/testqgstaskmanager.cpp
View File

@ -361,8 +361,8 @@ void TestQgsTaskManager::progressChanged()
manager.addTask( task );
manager.addTask( task2 );
QSignalSpy spy( &manager, SIGNAL( progressChanged( long, double ) ) );
QSignalSpy spy2( &manager, SIGNAL( progressChanged( double ) ) );
QSignalSpy spy( &manager, &QgsTaskManager::progressChanged );
QSignalSpy spy2( &manager, &QgsTaskManager::finalTaskProgressChanged );
task->emitProgressChanged( 50.0 );
QCOMPARE( task->progress(), 50.0 );