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
NomadSpecialModules
Commits
5822627d
Commit
5822627d
authored
Jan 29, 2020
by
Guanghan Song
Browse files
added spy view for lss_simulation and updated information for spy AutoConfig
parent
9f83c043
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/controllers/lss/d22autoconfig/D22AutoConfig.cpp
View file @
5822627d
...
@@ -343,19 +343,24 @@ void AutoConfig::start() {
...
@@ -343,19 +343,24 @@ void AutoConfig::start() {
commandProgression
=
50
;
commandProgression
=
50
;
if
(
status
==
"ERROR"
)
{
if
(
status
==
"ERROR"
)
{
commandStatus
.
setError
();
log
(
Level
::
s_Error
)
<<
"No prediction"
<<
endlog
;
log
(
Level
::
s_Error
)
<<
"No prediction"
<<
endlog
;
wantedDistance
=
distance
.
get
(
0
);
wantedWavelength
=
wavelength
.
get
(
0
);
wantedCollimation
=
collimation
.
get
(
0
);
commandStatus
.
setError
();
}
}
else
{
else
{
log
(
Level
::
s_Debug
)
<<
"Apply"
<<
endlog
;
log
(
Level
::
s_Debug
)
<<
"Apply"
<<
endlog
;
apply
();
apply
();
commandStatus
.
setIdle
();
}
}
// End progression.
// End progression.
commandProgression
=
100
;
commandProgression
=
100
;
commandStatus
.
setIdle
();
log
(
Level
::
s_Info
)
<<
"Finished auto settings"
<<
endlog
;
log
(
Level
::
s_Info
)
<<
"Finished auto settings"
<<
endlog
;
}
}
...
...
src/controllers/lss/remotelsssimulation/gui/remote_lss_simulationPlugin.xml
View file @
5822627d
...
@@ -4,5 +4,6 @@
...
@@ -4,5 +4,6 @@
<settings
view=
"remote_lss_simulationView.xml"
/>
<settings
view=
"remote_lss_simulationView.xml"
/>
<command
view=
"remote_lss_simulationCommandView.xml"
/>
<command
view=
"remote_lss_simulationCommandView.xml"
/>
<spy
view=
"remote_lss_simulationSpyView.xml"
/>
</controller_plugin_config>
</controller_plugin_config>
src/controllers/lss/remotelsssimulation/gui/remote_lss_simulationSpyView.xml
0 → 100644
View file @
5822627d
<plugin>
<controller
type=
"remote_lss_simulation"
role=
"remote_lss_simulation1"
/>
<property_switcher
role=
"remote_lss_simulation1"
property=
"use_simulated_data"
switcher_key=
"use_simulated_dataSwitcher"
/>
<switchable_composite
switch_values=
"true"
switcher_key=
"use_simulated_dataSwitcher"
>
<label
role=
"remote_lss_simulation1"
property=
"display_sample_model_name"
prefix=
"remote_lss_simulation.display_model_namePrefix"
/>
<newLine/>
<dynamic_composite
role=
"remote_lss_simulation1"
properties=
"display_sample_parameters_names,display_sample_parameters_values"
>
<composite>
<label
role=
"remote_lss_simulation1"
property=
"display_sample_parameters_names"
/>
<label
role=
"remote_lss_simulation1"
property=
"display_sample_parameters_values"
/>
</composite>
</dynamic_composite>
</switchable_composite>
</plugin>
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