Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
vEXP
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Scientific Software
vEXP
Commits
b150463c
Commit
b150463c
authored
5 years ago
by
legoc
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into energy-display
parents
4677ec8c
54d898b5
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
js/client/views/3D/trajectory-view.js
+9
-2
9 additions, 2 deletions
js/client/views/3D/trajectory-view.js
with
9 additions
and
2 deletions
js/client/views/3D/trajectory-view.js
+
9
−
2
View file @
b150463c
...
@@ -25,6 +25,7 @@ class TrajectoryView3D extends View3D {
...
@@ -25,6 +25,7 @@ class TrajectoryView3D extends View3D {
// Create a fake trajectory line to visualize.
// Create a fake trajectory line to visualize.
this
.
_visualLine
=
new
TrajectoryLine
(
this
.
_type
,
this
.
_scene
,
new
THREE
.
Vector3
(),
new
THREE
.
Vector3
(),
new
THREE
.
Vector3
(),
11
,
matrix
.
bMatrix
);
this
.
_visualLine
=
new
TrajectoryLine
(
this
.
_type
,
this
.
_scene
,
new
THREE
.
Vector3
(),
new
THREE
.
Vector3
(),
new
THREE
.
Vector3
(),
11
,
matrix
.
bMatrix
);
this
.
_visualLine
.
setVisibility
(
false
);
this
.
_visualLine
.
setVisibility
(
false
);
this
.
_drawLine
=
false
;
dragControls
.
addEventListener
(
'
dragstart
'
,
(
event
)
=>
{
dragControls
.
addEventListener
(
'
dragstart
'
,
(
event
)
=>
{
...
@@ -73,8 +74,10 @@ class TrajectoryView3D extends View3D {
...
@@ -73,8 +74,10 @@ class TrajectoryView3D extends View3D {
dragControls
.
addEventListener
(
'
drag
'
,
(
event
)
=>
{
dragControls
.
addEventListener
(
'
drag
'
,
(
event
)
=>
{
// Use the point from the scattering view.
if
(
this
.
_drawLine
)
{
this
.
_visualLine
.
end
=
this
.
getPoint
(
this
.
_type
);
// Use the point from the scattering view.
this
.
_visualLine
.
end
=
this
.
getPoint
(
this
.
_type
);
}
});
});
document
.
addEventListener
(
'
mousedown
'
,
(
event
)
=>
{
document
.
addEventListener
(
'
mousedown
'
,
(
event
)
=>
{
...
@@ -88,6 +91,10 @@ class TrajectoryView3D extends View3D {
...
@@ -88,6 +91,10 @@ class TrajectoryView3D extends View3D {
this
.
_visualLine
.
start
=
this
.
_visualStart
;
this
.
_visualLine
.
start
=
this
.
_visualStart
;
this
.
_visualLine
.
end
=
this
.
_visualStart
;
this
.
_visualLine
.
end
=
this
.
_visualStart
;
this
.
_visualLine
.
setVisibility
(
true
);
this
.
_visualLine
.
setVisibility
(
true
);
this
.
_drawLine
=
true
;
}
else
{
this
.
_drawLine
=
false
;
}
}
});
});
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment