Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dtk
dtk
Commits
10f88c26
Commit
10f88c26
authored
Jun 07, 2016
by
NICLAUSSE Nicolas
Browse files
fix bug with evaluator toolbar when the evaluation is cancelled
parent
fe5edf9d
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/dtkComposer/dtkComposerEvaluatorToolBar.cpp
View file @
10f88c26
...
...
@@ -115,6 +115,7 @@ void dtkComposerEvaluatorToolBar::setComposerWidget(dtkComposerWidget *composer)
d
->
composer
=
composer
;
connect
(
d
->
run_action
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
onEvaluatorStarted
()));
connect
(
d
->
composer
->
evaluator
(),
SIGNAL
(
evaluationStopped
()),
this
,
SLOT
(
onEvaluatorFinished
()));
connect
(
d
->
composer
,
SIGNAL
(
evaluationStopped
()),
this
,
SLOT
(
onEvaluatorFinished
()));
connect
(
d
->
composer
->
evaluator
(),
SIGNAL
(
evaluationPaused
(
dtkComposerGraphNode
*
)),
this
,
SLOT
(
onEvaluatorPaused
(
dtkComposerGraphNode
*
)));
connect
(
d
->
step_action
,
SIGNAL
(
triggered
()),
d
->
composer
,
SLOT
(
step
()));
...
...
src/dtkComposer/dtkComposerWidget.cpp
View file @
10f88c26
...
...
@@ -244,6 +244,8 @@ void dtkComposerWidget::run(void)
if
(
d
->
scene
->
checkImplementations
())
{
QtConcurrent
::
run
(
d
->
evaluator
,
&
dtkComposerEvaluator
::
run
,
false
);
}
else
{
emit
evaluationStopped
();
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment