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
CamiTK
CamiTK Community Edition
Commits
469d1379
Commit
469d1379
authored
Jun 15, 2018
by
Emmanuel Promayon
Browse files
UPDATED code cleaning
parent
54f84de6
Changes
3
Hide whitespace changes
Inline
Side-by-side
sdk/libraries/core/action/Action.cpp
View file @
469d1379
...
...
@@ -186,7 +186,7 @@ Action::ApplyStatus Action::trigger(QWidget* parent) {
if
(
targetComponents
.
size
()
>
0
||
getComponent
().
isEmpty
())
{
if
(
isEmbedded
)
{
// if there are no parents to use use the action viewer
if
(
!
parent
)
{
if
(
parent
==
nullptr
)
{
ActionViewer
::
getInstance
()
->
embedActionWidget
(
this
);
}
else
{
...
...
sdk/libraries/core/action/Action.h
View file @
469d1379
...
...
@@ -241,7 +241,7 @@ public slots:
* The parent widget is used if the action is embedded, see class description for more information about the algorithm.
* This method cannot be redefined in inherited class.
*/
ApplyStatus
trigger
(
QWidget
*
parent
=
NULL
);
ApplyStatus
trigger
(
QWidget
*
parent
=
nullptr
);
/**
* This method is called when the action has to be applied on the target list (get the target lists using getTargets())
...
...
sdk/libraries/core/viewer/ActionViewer.cpp
View file @
469d1379
...
...
@@ -231,7 +231,7 @@ void ActionViewer::updateActionViewer(UpdateReason reason) {
ActionList
actionset
=
Application
::
getActions
(
Application
::
getSelectedComponents
(),
tagLineEdit
->
text
());
if
(
!
actionset
.
isEmpty
())
{
if
(
1
==
actionset
.
size
())
{
if
(
actionset
.
size
()
==
1
)
{
action
=
*
(
actionset
.
begin
());
nameComboBox
->
setCurrentIndex
(
nameComboBox
->
findText
(
action
->
getName
()));
updateActionViewer
(
ActionNameChanged
);
...
...
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