Commit 64d98df0 authored by Franck Cecillon's avatar Franck Cecillon
Browse files

mode 1D

parent 135d25c8
......@@ -2,8 +2,8 @@ ikon.setup=Setup
ikon.actual=Actual
ikon.divisors=Divisors
ikon.wanted_time=Time
ikon.actual_time=Time
ikon.wanted_time=Time(sec)
ikon.actual_time=Time(sec)
ikon.mode=Master
ikon.modeTimeCheckedValue=1
ikon.modeTimeUncheckedValue=0
......@@ -27,6 +27,19 @@ ikon.1mValue=2
ikon.005mLabel=0.05MHz
ikon.005mValue=3
ikon.vsspeedPrefix=VSSpeed
# Mode combo
ikon.vss1Label=5.775 (usec)
ikon.vss1Value=0
ikon.vss2Label=11.375 (usec)
ikon.vss2Value=1
ikon.vss3Label=22.575 (usec)
ikon.vss3Value=2
ikon.vss4Label=44.975 (usec)
ikon.vss4Value=3
ikon.gainPrefix=Pre-Amp Gain
# Mode combo
ikon.x1Label=X1
......@@ -58,8 +71,8 @@ ikon.imageValue=4
ikon.shutter=Shutter
ikon.shutmode=Mode
ikon.shutopentime=Open Time
ikon.shutclosetime=Close Time
ikon.shutopentime=Open Time(ms)
ikon.shutclosetime=Close Time(ms)
# Mode combo
ikon.FALabel=Auto
......
......@@ -7,7 +7,6 @@
<property name="gate_actual_time" type="Double" max_length="8" >
</property>
<property name="wanted_temperature" type="Double">
</property>
<property name="actual_Temperature" type="Double">
......@@ -28,6 +27,9 @@
</property>
<property name="bclamp" type="Long">
</property>
<property name="tempstatus" type="Long">
</property>
<property name="vsspeed" type="Long">
</property>
</controller>
......@@ -21,13 +21,16 @@
<table_composite nbColumns="3">
<combo role="IKon1" property="bind" prefix="ikon.bindPrefix"
valuesAndLabels="ikon.2048,ikon.1024,ikon.512" hAlignment="right" />
<!-- <combo role="IKon1" property="bind" prefix="ikon.bindPrefix" -->
<!-- valuesAndLabels="ikon.2048,ikon.1024,ikon.512" hAlignment="right" /> -->
<combo role="IKon1" property="hhspeed" prefix="ikon.hsspeedPrefix"
valuesAndLabels="ikon.5m,ikon.3m,ikon.1m,ikon.005m" hAlignment="right" />
<!-- <combo role="IKon1" property="vsspeed" prefix="ikon.vsspeedPrefix"
valuesAndLabels="ikon.vss1,ikon.vss2,ikon.vss3,ikon.vss4" hAlignment="right" />
-->
<combo role="IKon1" property="gain" prefix="ikon.gainPrefix"
valuesAndLabels="ikon.x4,ikon.x2,ikon.x1" hAlignment="right" />
</table_composite>
......@@ -65,6 +68,7 @@
<summary_content>
<table_composite nbColumns="2">
<label role="IKon1" property="actual_temperature" prefix="ikon.actual_temperature" />
<label role="IKon1" property="tempstatus" />
</table_composite>
</summary_content>
......
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