Commit fa7189be authored by Franck Cecillon's avatar Franck Cecillon

Merge branch 'V3.2_191' of https://code.ill.fr/instrument-control/nomad-modules.git into V3.2_191

parents 9ae93a5d 557b0057
......@@ -58,7 +58,7 @@ CryostatOrangeController::CryostatOrangeController(const string& name) :
cvSensor.init(this, SAVE, "sensor");
cvMode.init(this, SAVE, "mode");
cvState.init(this, SAVE, "state");
cvOpenPressure.init(this, SAVE, "open_pressure");
cvOpenPressure.init(this, SAVE, "open_pressure","OpenPress");
cvClosedPressure.init(this, SAVE, "closed_pressure");
cvNormalPressure.init(this, SAVE, "normal_pressure");
cvCoolingDelta.init(this, SAVE, "cooling_delta");
......
......@@ -7,16 +7,16 @@ d11setting1.dia4Prefix=n~degree4
d11setting1.dia5Prefix=n~degree5
d11setting1.diaphragmTitle=Diaphragms
d11setting1.collimationTitle=Collimation
d11setting1.dia1PrefixCommand=Dia. 1:
d11setting1.dia2PrefixCommand=Dia. 2:
d11setting1.dia3PrefixCommand=Dia. 3:
d11setting1.dia4PrefixCommand=Dia. 4:
d11setting1.dia5PrefixCommand=Dia. 5:
d11setting1.diaphragm1PrefixCommand=Dia. n~degree1:
d11setting1.diaphragm2PrefixCommand=Dia. n~degree2:
d11setting1.diaphragm3PrefixCommand=Dia. n~degree3:
d11setting1.diaphragm4PrefixCommand=Dia. n~degree4:
d11setting1.diaphragm5PrefixCommand=Dia. n~degree5:
d11setting1.dia1PrefixCommand=no.1:
d11setting1.dia2PrefixCommand=no.2:
d11setting1.dia3PrefixCommand=no.3:
d11setting1.dia4PrefixCommand=no.4:
d11setting1.dia5PrefixCommand=no.5:
d11setting1.diaphragm1PrefixCommand=Dia. no.1:
d11setting1.diaphragm2PrefixCommand=Dia. no.2:
d11setting1.diaphragm3PrefixCommand=Dia. no.3:
d11setting1.diaphragm4PrefixCommand=Dia. no.4:
d11setting1.diaphragm5PrefixCommand=Dia. no.5:
d11setting.wantedWavelengthPrefix=Wanted
d11setting.actualWavelengthPrefix=Actual
d11setting.wavelengthPrefix=Wavelength
......@@ -61,11 +61,4 @@ d11setting.attenuators_2_and_3Label=2+3
d11setting.attenuators_1_2_and_3Value=7
d11setting.attenuators_1_2_and_3Label=1+2+3
d11setting.wantedBeamstopPrefix=Beamstop
\ No newline at end of file
......@@ -16,11 +16,11 @@
</group>
<newLine/>
<group title="d11setting1.diaphragmTitle">
<property_combo role="d11setting1" property="diaphragm_wanted_position_1" prefix="d11collimationsetting1.dia1PrefixCommand"/>
<property_combo role="d11setting1" property="diaphragm_wanted_position_2" prefix="d11collimationsetting1.dia2PrefixCommand" key="dia2Combo"/>
<property_combo role="d11setting1" property="diaphragm_wanted_position_3" prefix="d11collimationsetting1.dia3PrefixCommand" key="dia3Combo"/>
<property_combo role="d11setting1" property="diaphragm_wanted_position_4" prefix="d11collimationsetting1.dia4PrefixCommand" key="dia4Combo"/>
<property_combo role="d11setting1" property="diaphragm_wanted_position_5" prefix="d11collimationsetting1.dia5PrefixCommand" key="dia5Combo"/>
<property_combo role="d11setting1" property="diaphragm_wanted_position_1" prefix="d11setting1.dia1PrefixCommand"/>
<property_combo role="d11setting1" property="diaphragm_wanted_position_2" prefix="d11setting1.dia2PrefixCommand" key="dia2Combo"/>
<property_combo role="d11setting1" property="diaphragm_wanted_position_3" prefix="d11setting1.dia3PrefixCommand" key="dia3Combo"/>
<property_combo role="d11setting1" property="diaphragm_wanted_position_4" prefix="d11setting1.dia4PrefixCommand" key="dia4Combo"/>
<property_combo role="d11setting1" property="diaphragm_wanted_position_5" prefix="d11setting1.dia5PrefixCommand" key="dia5Combo"/>
</group>
<newLine/>
<group title="d11setting.wavelengthPrefix">
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment