OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

More robust handling of progress info when running from unit tests

Browse Source 
p4#: 20257
This commit is contained in:
Magne Sjaastad 2013-01-25 16:35:43 +01:00
parent 715e42b10b
commit 4e0cb26a82
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cafUserInterface/cafProgressInfo.cpp
View File

@ -245,9 +245,13 @@ static QString currentComposedLabel()
} }
static bool isWrongThread() static bool isUpdatePossible()
{ {
return !(progressDialog()->thread() == QThread::currentThread()); if (!qApp) return false;
if (!progressDialog()) return false;
return progressDialog()->thread() == QThread::currentThread();
} }
//================================================================================================== //==================================================================================================
/// ///
@ -263,9 +267,7 @@ static bool isWrongThread()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void ProgressInfoStatic::start(size_t maxProgressValue, const QString& title) void ProgressInfoStatic::start(size_t maxProgressValue, const QString& title)
{ {
if (!qApp) return; if (!isUpdatePossible()) return;
if (isWrongThread()) return;
if (!maxProgressStack().size()) if (!maxProgressStack().size())
{ {
@ -295,7 +297,7 @@ void ProgressInfoStatic::start(size_t maxProgressValue, const QString& title)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void ProgressInfoStatic::setProgressDescription(const QString& description) void ProgressInfoStatic::setProgressDescription(const QString& description)
{ {
if (isWrongThread()) return; if (!isUpdatePossible()) return;
descriptionStack().back() = description; descriptionStack().back() = description;
@ -308,7 +310,8 @@ void ProgressInfoStatic::setProgressDescription(const QString& description)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void ProgressInfoStatic::setProgress(size_t progressValue) void ProgressInfoStatic::setProgress(size_t progressValue)
{ {
if (isWrongThread()) return; if (!isUpdatePossible()) return;
if (progressValue == progressStack().back()) return; // Do nothing if no progress. if (progressValue == progressStack().back()) return; // Do nothing if no progress.
// Guard against the max value set for this level // Guard against the max value set for this level
@ -330,6 +333,8 @@ void ProgressInfoStatic::setProgress(size_t progressValue)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void ProgressInfoStatic::incrementProgress() void ProgressInfoStatic::incrementProgress()
{ {
if (!isUpdatePossible()) return;
assert(progressStack().size()); assert(progressStack().size());
ProgressInfoStatic::setProgress(progressStack().back() += progressSpanStack().back()); ProgressInfoStatic::setProgress(progressStack().back() += progressSpanStack().back());
} }
@ -340,6 +345,8 @@ void ProgressInfoStatic::incrementProgress()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void ProgressInfoStatic::setNextProgressIncrement(size_t nextStepSize) void ProgressInfoStatic::setNextProgressIncrement(size_t nextStepSize)
{ {
if (!isUpdatePossible()) return;
assert(progressSpanStack().size()); assert(progressSpanStack().size());
progressSpanStack().back() = nextStepSize; progressSpanStack().back() = nextStepSize;
@ -351,7 +358,7 @@ void ProgressInfoStatic::setNextProgressIncrement(size_t nextStepSize)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void ProgressInfoStatic::finished() void ProgressInfoStatic::finished()
{ {
if (isWrongThread()) return; if (!isUpdatePossible()) return;
assert(maxProgressStack().size() && progressStack().size() && progressSpanStack().size() && titleStack().size() && descriptionStack().size()); assert(maxProgressStack().size() && progressStack().size() && progressSpanStack().size() && titleStack().size() && descriptionStack().size());