Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
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
5205b418
Commit
5205b418
authored
Jul 28, 2021
by
Bordais Anaelle
Browse files
Small change
parent
cb0664bf
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/main/java/fr/ill/ics/n3d/gui/EditorMenuBar.java
View file @
5205b418
...
...
@@ -302,7 +302,7 @@ public class EditorMenuBar extends MenuBar {
return
Math
.
round
(
radius
.
get
()*
1000
)/
1000.0
;
}
public
CameraControls
getCam
()
{
public
CameraControls
get
Original
Cam
()
{
return
originalCamera
;
}
...
...
@@ -2840,6 +2840,7 @@ public class EditorMenuBar extends MenuBar {
// In order to put the parameters in the table
CameraTableEntry
fictiveCam
=
new
CameraTableEntry
(
cam
);
data
.
add
(
fictiveCam
);
System
.
out
.
println
(
"Cam add : "
+
cam
.
getTransform
());
});
...
...
@@ -2864,9 +2865,12 @@ public class EditorMenuBar extends MenuBar {
// Define our new TableRow
TableRow
<
CameraTableEntry
>
row
=
new
TableRow
<>();
row
.
setOnMouseClicked
(
event
->
{
CameraControls
cam
=
Nomad3DEditor
.
getInstance
().
getControls
();
cam
=
table
.
getSelectionModel
().
getSelectedItem
().
getCam
();
cam
.
update
();
cam
=
table
.
getSelectionModel
().
getSelectedItem
().
getOriginalCam
();
cam
.
update
();
//update();
});
return
row
;
});
...
...
@@ -2899,7 +2903,7 @@ public class EditorMenuBar extends MenuBar {
this
.
getMenus
().
addAll
(
this
.
file
,
this
.
edit
,
this
.
view
,
this
.
selection
,
this
.
cameraView
,
this
.
help
);
//---------------------------------------------- FIN RAJOUTE
}
private
void
applyValue
(
String
value
)
{
...
...
@@ -2954,7 +2958,7 @@ public class EditorMenuBar extends MenuBar {
String
text
=
"Current Value "
;
if
(
type
==
Axis
.
Type
.
ROTATION
)
{
text
+=
"
�
"
;
text
+=
""
;
}
else
if
(
type
==
Axis
.
Type
.
TRANSLATION
)
{
text
+=
"mm"
;
}
...
...
Write
Preview
Markdown
is supported
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