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
782644c3
Commit
782644c3
authored
Jan 18, 2017
by
Jacob Lamblin
Browse files
Correct bugs
parent
3985b12e
Changes
6
Hide whitespace changes
Inline
Side-by-side
src/drivers/caen_syx527/CAENSYx527Controller.cpp
View file @
782644c3
...
...
@@ -135,7 +135,7 @@ void CAENSYx527Controller::postConfiguration() {
}
deltav
=
0
;
statusall
=
true
;
statusconnection
=
fals
e
;
statusconnection
=
tru
e
;
registerRefresher
(
namechannel
,
&
CAENSYx527Controller
::
refreshChannelNameProperty
,
this
);
registerRefresher
(
power
,
&
CAENSYx527Controller
::
refreshPowerProperty
,
this
);
...
...
@@ -375,7 +375,7 @@ void CAENSYx527Controller::updateChannelStatus(int32 index) {
* updateStatus
*/
void
CAENSYx527Controller
::
updateStatusConnection
()
{
statusconnection
.
update
(
m_Driver
->
statusconnection
());
statusconnection
.
set
(
m_Driver
->
statusconnection
());
}
/*
* updateProgression
...
...
src/drivers/caen_syx527/gui/caen_syx527_controller/caen_syx527_controller.properties
View file @
782644c3
...
...
@@ -25,6 +25,7 @@ CaenSYx527.indexPrefix=Index
CaenSYx527.stringPrefix
=
String
CaenSYx527.deltavPrefix
=
Voltage to be added to every channel
CaenSYx527.statusallPrefix
=
Status for all channels (true if all channels ok)
CaenSYx527.statusconnectionPrefix
=
Connection status
#Button
CaenSYx527.ok
=
Ok
CaenSYx527.on
=
On
...
...
src/drivers/caen_syx527/gui/caen_syx527_controller/caen_syx527_controllerProperties.xml
View file @
782644c3
...
...
@@ -66,4 +66,8 @@
<property
name=
"statusall"
type=
"boolean"
max_length=
"3"
>
</property>
<property
name=
"statusconnection"
type=
"boolean"
max_length=
"4"
>
</property>
</controller>
src/drivers/caen_syx527/gui/caen_syx527_controller/caen_syx527_controllerView.xml
View file @
782644c3
...
...
@@ -4,6 +4,10 @@
<newLine/>
<label
role=
"CaenSYx527Controller1"
property=
"statusall"
hAlignment=
"center"
/>
<newLine/>
<simple_label
prefix=
"CaenSYx527.statusconnectionPrefix"
font_style=
"BOLD"
hAlignment=
"center"
/>
<newLine/>
<label
role=
"CaenSYx527Controller1"
property=
"statusconnection"
hAlignment=
"center"
/>
<newLine/>
<group
title=
"CaenSYx527.channelTitle"
key=
"groupForChannel"
>
<composite>
<group
title=
"CaenSYx527.selectTitle"
key=
"groupForSelect"
>
...
...
src/drivers/stereo_elec/gui/stereo_elec_controller/stereo_elec_controller.properties
View file @
782644c3
...
...
@@ -25,7 +25,8 @@ StereoElec.rate7Prefix=Channel 7
StereoElecAcquisition.runnamePrefix
=
Run
StereoElecAcquisition.t1acceptedPrefix
=
Accepted T1
StereoElecAcquisition.t1rejectedPrefix
=
Rejected T1
StereoElecAcquisition.fiforejectedPrefix
=
including FIFO r
ejected
StereoElecAcquisition.fiforejectedPrefix
=
R
ejected
FIFO
StereoElecAcquisition.t1rejectedfractionPrefix
=
Dead time
StereoElecAcquisition.t1rejectedfractionSuffix
=
%
StereoElecAcquisition.t2acceptedPrefix
=
T2 accepted (written in files)
StereoElecAcquisition.t2acceptedPrefix
=
T2 accepted
src/drivers/stereo_elec/gui/stereo_elec_controller/stereo_elec_controllerSpyView.xml
View file @
782644c3
...
...
@@ -3,10 +3,15 @@
<form_composite>
<positionnable_composite
x=
"10"
y=
"0"
width=
"180"
height=
"20"
>
<label
role=
"stereo_elec_controller1"
property=
"runname"
prefix=
"StereoElecAcquisition.runnamePrefix"
/>
<positionnable_composite
x=
"10"
y=
"0"
width=
"180"
height=
"100"
>
<table_composite
nbColumns=
"1"
>
<label
role=
"stereo_elec_controller1"
property=
"runname"
prefix=
"StereoElecAcquisition.runnamePrefix"
/>
<label
role=
"stereo_elec_controller1"
property=
"t1accepted"
prefix=
"StereoElecAcquisition.t1acceptedPrefix"
/>
<label
role=
"stereo_elec_controller1"
property=
"t1rejected"
prefix=
"StereoElecAcquisition.t1rejectedPrefix"
/>
<label
role=
"stereo_elec_controller1"
property=
"fiforejected"
prefix=
"StereoElecAcquisition.fiforejectedPrefix"
/>
<label
role=
"stereo_elec_controller1"
property=
"t1rejectedfraction"
prefix=
"StereoElecAcquisition.t1rejectedfractionPrefix"
suffix=
"%"
/>
<label
role=
"stereo_elec_controller1"
property=
"t2accepted"
prefix=
"StereoElecAcquisition.t2acceptedPrefix"
/>
</table_composite>
</positionnable_composite>
</form_composite>
...
...
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