Commit ebca6aa3 authored by Cristina Cocho's avatar Cristina Cocho

Hide actualNumSlot and wantedTime in SampleSequencer commandBox when it is not...

Hide actualNumSlot and wantedTime in SampleSequencer commandBox when it is not running. Always show diaphragm positions in D22Settings commandBox. Number of lines of D22Settings commandBox reduced to 3
parent d8000a8c
<plugin>
<controller type="sample_sequencer" role="sample_sequencer1"/>
<controller type="acquisition" role="acquisition1"/>
<property_switcher role="sample_sequencer1" property="commandStatus" switcher_key="statusSwitcher"/>
<number_of_lines nb_lines="2"/>
<dynamic_property role="sample_sequencer1" property="wanted_acquisition_time" save_value="true"/>
<dynamic_property role="sample_sequencer1" property="thickness" save_value="true"/>
......@@ -12,7 +13,9 @@
<label role="sample_sequencer1" prefix="sample_sequencer.totalTimeLabel" property="total_time" save_value="true"/>
<label role="sample_sequencer1" property="time_type" spaceBefore="false" save_value="true"/>
<newLine/>
<label role="sample_sequencer1" prefix="sample_sequencer.actual_numSlot" property="actual_numSlot" font_style="BOLD"/>
<label role="acquisition1" prefix="sample_sequencer.durationPrefix" property="wanted_time" font_style="BOLD"/>
<label role="acquisition1" property="time_type" font_style="BOLD" spaceBefore="false"/>
<switchable_composite switcher_key="statusSwitcher" switch_values="2">
<label role="sample_sequencer1" prefix="sample_sequencer.actual_numSlot" property="actual_numSlot" font_style="BOLD"/>
<label role="acquisition1" prefix="sample_sequencer.durationPrefix" property="wanted_time" font_style="BOLD"/>
<label role="acquisition1" property="time_type" font_style="BOLD" spaceBefore="false"/>
</switchable_composite>
</plugin>
\ No newline at end of file
......@@ -18,8 +18,7 @@
<property role="d22settings1" property="wanted_byPosition" save_value="true"/>
<property role="d22settings1" property="attr" save_value="true"/>
<number_of_lines nb_lines="4" />
<property_switcher role="d22settings1" property="diaphragm_mode" switcher_key="d22setting.diaphragm_modeSwitcher" />
<number_of_lines nb_lines="3"/>
<label role="d22settings1" property="wanted_detPosition" prefix="d22settings.detPrefix" suffix="d22settings.meterSuffix" />
<label role="d22settings1" property="wanted_dtrPosition" prefix="d22settings.dtrPrefix" suffix="d22settings.millimeterSuffix" />
<label role="d22settings1" property="wanted_colSetupPosition" prefix="d22settings.colPrefix" suffix="d22settings.colSuffix" />
......@@ -30,18 +29,16 @@
<label role="d22settings1" property="wanted_byPosition" prefix="d22settings.byPrefix" suffix="d22settings.millimeterSuffix" />
<label role="d22settings1" property="attr" prefix="d22settings.attPrefix" valuesAndLabels="d22settings.disk0,d22settings.disk1,d22settings.disk2,d22settings.disk3"/>
<newLine />
<switchable_composite switcher_key="d22setting.diaphragm_modeSwitcher" switch_values="2">
<group title="d22settings.diaphragmTitle">
<label role="d22settings1" property="position_dia1" prefix="d22settings.dia1Prefix" valuesAndLabels="d22settings.diaPos1,d22settings.diaPos2,d22settings.diaPos3,d22settings.diaPos4"/>
<label role="d22settings1" property="position_dia2" prefix="d22settings.dia2Prefix" valuesAndLabels="d22settings.diaPos1,d22settings.diaPos2,d22settings.diaPos3,d22settings.diaPos4"/>
<label role="d22settings1" property="position_dia3" prefix="d22settings.dia3Prefix" valuesAndLabels="d22settings.diaPos1,d22settings.diaPos2,d22settings.diaPos3,d22settings.diaPos4"/>
<label role="d22settings1" property="position_dia4" prefix="d22settings.dia4Prefix" valuesAndLabels="d22settings.diaPos1,d22settings.diaPos2,d22settings.diaPos3,d22settings.diaPos4"/>
<label role="d22settings1" property="position_dia5" prefix="d22settings.dia5Prefix" valuesAndLabels="d22settings.diaPos1,d22settings.diaPos2,d22settings.diaPos3,d22settings.diaPos4"/>
<label role="d22settings1" property="position_dia6" prefix="d22settings.dia6Prefix" valuesAndLabels="d22settings.diaPos1,d22settings.diaPos2,d22settings.diaPos3,d22settings.diaPos4"/>
<label role="d22settings1" property="position_dia7" prefix="d22settings.dia7Prefix" valuesAndLabels="d22settings.diaPos1,d22settings.diaPos2,d22settings.diaPos3,d22settings.diaPos4"/>
<label role="d22settings1" property="position_dia8" prefix="d22settings.dia8Prefix" valuesAndLabels="d22settings.diaPos1,d22settings.diaPos2,d22settings.diaPos3,d22settings.diaPos4"/>
</group>
</switchable_composite>
<group title="d22settings.diaphragmTitle">
<label role="d22settings1" property="position_dia1" prefix="d22settings.dia1Prefix" valuesAndLabels="d22settings.diaPos1,d22settings.diaPos2,d22settings.diaPos3,d22settings.diaPos4"/>
<label role="d22settings1" property="position_dia2" prefix="d22settings.dia2Prefix" valuesAndLabels="d22settings.diaPos1,d22settings.diaPos2,d22settings.diaPos3,d22settings.diaPos4"/>
<label role="d22settings1" property="position_dia3" prefix="d22settings.dia3Prefix" valuesAndLabels="d22settings.diaPos1,d22settings.diaPos2,d22settings.diaPos3,d22settings.diaPos4"/>
<label role="d22settings1" property="position_dia4" prefix="d22settings.dia4Prefix" valuesAndLabels="d22settings.diaPos1,d22settings.diaPos2,d22settings.diaPos3,d22settings.diaPos4"/>
<label role="d22settings1" property="position_dia5" prefix="d22settings.dia5Prefix" valuesAndLabels="d22settings.diaPos1,d22settings.diaPos2,d22settings.diaPos3,d22settings.diaPos4"/>
<label role="d22settings1" property="position_dia6" prefix="d22settings.dia6Prefix" valuesAndLabels="d22settings.diaPos1,d22settings.diaPos2,d22settings.diaPos3,d22settings.diaPos4"/>
<label role="d22settings1" property="position_dia7" prefix="d22settings.dia7Prefix" valuesAndLabels="d22settings.diaPos1,d22settings.diaPos2,d22settings.diaPos3,d22settings.diaPos4"/>
<label role="d22settings1" property="position_dia8" prefix="d22settings.dia8Prefix" valuesAndLabels="d22settings.diaPos1,d22settings.diaPos2,d22settings.diaPos3,d22settings.diaPos4"/>
</group>
<construction>
<simple_image prefix="LEFT_TO_RIGHT_ARROW" />
<label role="d22settings1" property="wanted_wavelengthPosition" suffix="d22settings.angstromSuffix" />
......
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