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
Scientific Software
vEXP
Commits
7ac58531
Commit
7ac58531
authored
Feb 26, 2021
by
legoc
Browse files
Improved the renaming of the trajectories
parent
37e3009a
Changes
4
Show whitespace changes
Inline
Side-by-side
js/client/server-state.js
View file @
7ac58531
...
...
@@ -680,8 +680,15 @@ class TrajectoriesData {
size
--
;
}
// If size is equals,
then the trajectories do not need to be updated
.
// If size is equals,
update the names
.
if
(
size
===
0
)
{
// Update the names because the numor is set during the execution of the trajectory and not at the beginning.
for
(
let
id
in
trajectoriesModel
)
{
let
traj
=
trajectoriesModel
[
id
];
this
.
_trajectories
[
id
].
_name
=
traj
.
name
;
}
return
false
;
}
...
...
js/client/views/panels/trajectory-view.js
View file @
7ac58531
...
...
@@ -305,11 +305,13 @@ class TrajectoryPanelView {
}
setTrajectoryName
(
id
,
name
)
{
let
rowNode
=
this
.
_trajectoryGrid
.
api
.
getRowNode
(
id
);
if
(
rowNode
!==
undefined
&&
rowNode
!==
null
)
{
rowNode
.
setDataValue
(
'
name
'
,
name
);
// Find the line: iterate over the nodes.
this
.
_trajectoryGrid
.
api
.
forEachNode
((
node
)
=>
{
if
(
node
.
data
.
id
===
id
)
{
node
.
setDataValue
(
'
name
'
,
name
);
}
});
}
/**
...
...
js/server/nomad-data-accessor.js
View file @
7ac58531
...
...
@@ -179,6 +179,7 @@ class NomadDataAccessor {
this
.
_fxScan
=
data
.
fxScan
;
this
.
_ssScan
=
data
.
ssScan
;
this
.
_nameScan
=
data
.
nameScan
.
toString
();
this
.
_startingTime
=
data
.
startingTime
;
...
...
js/server/vexp-controller.js
View file @
7ac58531
...
...
@@ -166,9 +166,15 @@ class VEXPController {
this
.
_fxScan
=
this
.
_dataAccessor
.
fxScan
;
this
.
_ssScan
=
this
.
_dataAccessor
.
ssScan
;
if
(
this
.
_dataAccessor
.
nameScan
===
"
0
"
)
{
this
.
_nameScan
=
"
?
"
;
}
else
{
this
.
_nameScan
=
this
.
_dataAccessor
.
nameScan
;
this
.
_startingTime
=
this
.
_dataAccessor
.
startingTime
;
}
this
.
_startingTime
=
this
.
_dataAccessor
.
startingTime
;
this
.
_dataScan
=
data
.
dataScan
;
// Update the matrix.
...
...
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