Skip to content

Commit 71d5755

Browse files
ChsudeeptaChsudeepta
authored
Merge pull request #1767 from ISISComputingGroup/DG645LitronFixes
Dg645 litron timing control fixes (Merge support first)
2 parents 6264549 + a9808db commit 71d5755

File tree

1 file changed

+169
-13
lines changed

1 file changed

+169
-13
lines changed

‎base/uk.ac.stfc.isis.ibex.opis/resources/litronlasertimer.opi‎

Lines changed: 169 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
<transparent>false</transparent>
155155
<visible>true</visible>
156156
<widget_type>Grouping Container</widget_type>
157-
<width>385</width>
157+
<width>409</width>
158158
<wuid>601b1d13:193cfd9f297:-7f3d</wuid>
159159
<x>12</x>
160160
<y>90</y>
@@ -292,7 +292,7 @@ $(pv_value)</tooltip>
292292
<transparent>false</transparent>
293293
<visible>true</visible>
294294
<widget_type>Text Input</widget_type>
295-
<width>79</width>
295+
<width>104</width>
296296
<wuid>601b1d13:193cfd9f297:-7e32</wuid>
297297
<x>77</x>
298298
<y>3</y>
@@ -349,15 +349,15 @@ $(pv_value)</tooltip>
349349
<transparent>false</transparent>
350350
<visible>true</visible>
351351
<widget_type>Text Input</widget_type>
352-
<width>79</width>
352+
<width>104</width>
353353
<wuid>601b1d13:193cfd9f297:-7e2a</wuid>
354354
<x>77</x>
355355
<y>39</y>
356356
</widget>
357357
<widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
358358
<actions hook="false" hook_all="false">
359359
<action type="WRITE_PV">
360-
<pv_name>$(PV_ROOT)ERROR.PROC</pv_name>
360+
<pv_name>$(PV_ROOT)SET.PROC</pv_name>
361361
<value>1</value>
362362
<timeout>10</timeout>
363363
<confirm_message></confirm_message>
@@ -405,7 +405,7 @@ $(pv_value)</tooltip>
405405
<widget_type>Action Button</widget_type>
406406
<width>67</width>
407407
<wuid>601b1d13:193cfd9f297:-7d93</wuid>
408-
<x>83</x>
408+
<x>95</x>
409409
<y>72</y>
410410
</widget>
411411
<widget typeId="org.csstudio.opibuilder.widgets.LED" version="1.0.0">
@@ -463,7 +463,7 @@ $(pv_value)</tooltip>
463463
<widget_type>LED</widget_type>
464464
<width>20</width>
465465
<wuid>601b1d13:193cfd9f297:-7766</wuid>
466-
<x>234</x>
466+
<x>276</x>
467467
<y>42</y>
468468
</widget>
469469
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -504,7 +504,7 @@ $(pv_value)</tooltip>
504504
<width>43</width>
505505
<wrap_words>true</wrap_words>
506506
<wuid>601b1d13:193cfd9f297:-775e</wuid>
507-
<x>174</x>
507+
<x>216</x>
508508
<y>36</y>
509509
</widget>
510510
<widget typeId="org.csstudio.opibuilder.widgets.combo" version="1.0.0">
@@ -546,7 +546,7 @@ $(pv_value)</tooltip>
546546
<widget_type>Combo</widget_type>
547547
<width>96</width>
548548
<wuid>-16127485:193da73ca1c:-7da2</wuid>
549-
<x>234</x>
549+
<x>276</x>
550550
<y>4</y>
551551
</widget>
552552
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
@@ -587,9 +587,71 @@ $(pv_value)</tooltip>
587587
<width>37</width>
588588
<wrap_words>true</wrap_words>
589589
<wuid>-16127485:193da73ca1c:-7d9f</wuid>
590-
<x>186</x>
590+
<x>228</x>
591591
<y>6</y>
592592
</widget>
593+
<widget typeId="org.csstudio.opibuilder.widgets.TextUpdate" version="1.0.0">
594+
<actions hook="false" hook_all="false" />
595+
<alarm_pulsing>false</alarm_pulsing>
596+
<auto_size>false</auto_size>
597+
<backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
598+
<background_color>
599+
<color name="ISIS_Label_Background" red="240" green="240" blue="240" />
600+
</background_color>
601+
<border_alarm_sensitive>true</border_alarm_sensitive>
602+
<border_color>
603+
<color red="0" green="128" blue="255" />
604+
</border_color>
605+
<border_style>0</border_style>
606+
<border_width>1</border_width>
607+
<enabled>true</enabled>
608+
<font>
609+
<opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
610+
</font>
611+
<forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
612+
<foreground_color>
613+
<color red="0" green="0" blue="0" />
614+
</foreground_color>
615+
<format_type>0</format_type>
616+
<height>20</height>
617+
<horizontal_alignment>0</horizontal_alignment>
618+
<name>Text Update</name>
619+
<precision>0</precision>
620+
<precision_from_pv>true</precision_from_pv>
621+
<pv_name></pv_name>
622+
<pv_value />
623+
<rotation_angle>0.0</rotation_angle>
624+
<rules>
625+
<rule name="Rule" prop_id="text" out_exp="false">
626+
<exp bool_exp="pv0 == 0">
627+
<value>OK</value>
628+
</exp>
629+
<exp bool_exp="pv0 ==1">
630+
<value>ERROR</value>
631+
</exp>
632+
<pv trig="true">$(PV_ROOT)ERROR</pv>
633+
</rule>
634+
</rules>
635+
<scale_options>
636+
<width_scalable>true</width_scalable>
637+
<height_scalable>true</height_scalable>
638+
<keep_wh_ratio>false</keep_wh_ratio>
639+
</scale_options>
640+
<scripts />
641+
<show_units>true</show_units>
642+
<text>######</text>
643+
<tooltip>$(pv_name)
644+
$(pv_value)</tooltip>
645+
<transparent>false</transparent>
646+
<vertical_alignment>1</vertical_alignment>
647+
<visible>true</visible>
648+
<widget_type>Text Update</widget_type>
649+
<width>43</width>
650+
<wrap_words>false</wrap_words>
651+
<wuid>5ac8a65c:1946aea07b9:-7f9f</wuid>
652+
<x>302</x>
653+
<y>42</y>
654+
</widget>
593655
</widget>
594656
<widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
595657
<actions hook="false" hook_all="false" />
@@ -667,7 +729,7 @@ $(pv_value)</tooltip>
667729
<transparent>false</transparent>
668730
<visible>true</visible>
669731
<widget_type>Grouping Container</widget_type>
670-
<width>229</width>
732+
<width>283</width>
671733
<wuid>601b1d13:193cfd9f297:-7d7f</wuid>
672734
<x>12</x>
673735
<y>228</y>
@@ -758,7 +820,7 @@ $(pv_value)</tooltip>
758820
<vertical_alignment>1</vertical_alignment>
759821
<visible>true</visible>
760822
<widget_type>Text Update</widget_type>
761-
<width>78</width>
823+
<width>127</width>
762824
<wrap_words>false</wrap_words>
763825
<wuid>601b1d13:193cfd9f297:-7d7d</wuid>
764826
<x>108</x>
@@ -851,7 +913,7 @@ $(pv_value)</tooltip>
851913
<vertical_alignment>1</vertical_alignment>
852914
<visible>true</visible>
853915
<widget_type>Text Update</widget_type>
854-
<width>78</width>
916+
<width>127</width>
855917
<wrap_words>false</wrap_words>
856918
<wuid>601b1d13:193cfd9f297:-7d7b</wuid>
857919
<x>108</x>
@@ -944,11 +1006,105 @@ $(pv_value)</tooltip>
9441006
<vertical_alignment>1</vertical_alignment>
9451007
<visible>true</visible>
9461008
<widget_type>Text Update</widget_type>
947-
<width>78</width>
1009+
<width>127</width>
9481010
<wrap_words>false</wrap_words>
9491011
<wuid>601b1d13:193cfd9f297:-7d6f</wuid>
9501012
<x>108</x>
9511013
<y>78</y>
9521014
</widget>
9531015
</widget>
1016+
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
1017+
<actions hook="false" hook_all="false" />
1018+
<auto_size>true</auto_size>
1019+
<background_color>
1020+
<color red="255" green="255" blue="255" />
1021+
</background_color>
1022+
<border_color>
1023+
<color red="0" green="128" blue="255" />
1024+
</border_color>
1025+
<border_style>0</border_style>
1026+
<border_width>1</border_width>
1027+
<enabled>true</enabled>
1028+
<font>
1029+
<opifont.name fontName="Arial" height="14" style="1" pixels="false">Header2</opifont.name>
1030+
</font>
1031+
<foreground_color>
1032+
<color name="Major" red="255" green="0" blue="0" />
1033+
</foreground_color>
1034+
<height>22</height>
1035+
<horizontal_alignment>1</horizontal_alignment>
1036+
<name>Label_2</name>
1037+
<rules>
1038+
<rule name="Rule" prop_id="visible" out_exp="false">
1039+
<exp bool_exp="pv0!=0">
1040+
<value>false</value>
1041+
</exp>
1042+
<pv trig="true">$(PV_ROOT)MODE</pv>
1043+
</rule>
1044+
</rules>
1045+
<scale_options>
1046+
<width_scalable>true</width_scalable>
1047+
<height_scalable>true</height_scalable>
1048+
<keep_wh_ratio>false</keep_wh_ratio>
1049+
</scale_options>
1050+
<scripts />
1051+
<text>AUTO MODE IS UNTESTED</text>
1052+
<tooltip></tooltip>
1053+
<transparent>true</transparent>
1054+
<vertical_alignment>1</vertical_alignment>
1055+
<visible>true</visible>
1056+
<widget_type>Label</widget_type>
1057+
<width>251</width>
1058+
<wrap_words>false</wrap_words>
1059+
<wuid>5ac8a65c:1946aea07b9:-7f87</wuid>
1060+
<x>432</x>
1061+
<y>96</y>
1062+
</widget>
1063+
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
1064+
<actions hook="false" hook_all="false" />
1065+
<auto_size>true</auto_size>
1066+
<background_color>
1067+
<color red="255" green="255" blue="255" />
1068+
</background_color>
1069+
<border_color>
1070+
<color red="0" green="128" blue="255" />
1071+
</border_color>
1072+
<border_style>0</border_style>
1073+
<border_width>1</border_width>
1074+
<enabled>true</enabled>
1075+
<font>
1076+
<opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
1077+
</font>
1078+
<foreground_color>
1079+
<color name="Major" red="255" green="0" blue="0" />
1080+
</foreground_color>
1081+
<height>15</height>
1082+
<horizontal_alignment>1</horizontal_alignment>
1083+
<name>Label_3</name>
1084+
<rules>
1085+
<rule name="Rule" prop_id="visible" out_exp="false">
1086+
<exp bool_exp="pv0!=0">
1087+
<value>false</value>
1088+
</exp>
1089+
<pv trig="true">$(PV_ROOT)MODE</pv>
1090+
</rule>
1091+
</rules>
1092+
<scale_options>
1093+
<width_scalable>true</width_scalable>
1094+
<height_scalable>true</height_scalable>
1095+
<keep_wh_ratio>false</keep_wh_ratio>
1096+
</scale_options>
1097+
<scripts />
1098+
<text>Contact Experiment Controls if you would like to use this</text>
1099+
<tooltip></tooltip>
1100+
<transparent>true</transparent>
1101+
<vertical_alignment>1</vertical_alignment>
1102+
<visible>true</visible>
1103+
<widget_type>Label</widget_type>
1104+
<width>300</width>
1105+
<wrap_words>false</wrap_words>
1106+
<wuid>5ac8a65c:1946aea07b9:-7f7f</wuid>
1107+
<x>432</x>
1108+
<y>119</y>
1109+
</widget>
9541110
</display>

0 commit comments

Comments
 (0)