Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Instrument Control
Protos
Nomad 3D
nomad-3d-editor
Commits
fccec922
Commit
fccec922
authored
Mar 08, 2019
by
legoc
Browse files
Cancel and OK for Axis edition do not call updateScene
parent
7d564626
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/main/java/fr/ill/ics/n3d/gui/EditorMenuBar.java
View file @
fccec922
...
...
@@ -799,14 +799,9 @@ public class EditorMenuBar extends MenuBar {
updateModified
(
true
);
}
// Hide the axes.
selectedAxis
.
setVisible
(
false
);
Nomad3DEditor
.
getInstance
().
getModel
().
clearSelection
();
// We can imagine to not update the entire scene here but it is easier to do it.
// We would need to experiment how to do it properly.
updateScene
();
Nomad3DEditor
.
getInstance
().
getModel
().
selectComponentTreeItem
(
selectedComponent
,
true
);
valueThread
.
interrupt
();
addStage
.
close
();
});
...
...
@@ -815,17 +810,13 @@ public class EditorMenuBar extends MenuBar {
cancelButton
.
setCancelButton
(
true
);
cancelButton
.
setOnAction
(
cancelEvent
->
{
Nomad3DEditor
.
getInstance
().
getAxisBuilder
().
stop
(
modified
);
initialAxis
.
setVisible
(
false
);
// Hide the axes.
selectedAxis
.
setVisible
(
false
);
// Reset the initial axis.
selectedComponent
.
setAxis
(
initialAxis
);
Nomad3DEditor
.
getInstance
().
getModel
().
clearSelection
();
selectedComponent
.
resetAxis
(
initialAxis
);
// We can imagine to not update the entire scene here but it is easier to do it.
// We would need to experiment how to do it properly.
updateScene
();
Nomad3DEditor
.
getInstance
().
getModel
().
selectComponentTreeItem
(
selectedComponent
,
true
);
valueThread
.
interrupt
();
addStage
.
close
();
});
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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