Skip to content

Commit 48be4b1

Browse files
FreddieAkeroydFreddieAkeroyd
authored
Merge pull request #1588 from ISISComputingGroup/event_updates
Add event spectra files
2 parents e5703d5 + f5a2187 commit 48be4b1

File tree

3 files changed

+1018
-5
lines changed

3 files changed

+1018
-5
lines changed

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

Lines changed: 197 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@
5151
<horizontal_tabs>true</horizontal_tabs>
5252
<macros>
5353
<include_parent_macros>true</include_parent_macros>
54+
<Q>$(HEXAGON)</Q>
55+
<CHAN>C0</CHAN>
5456
</macros>
5557
<minimum_tab_height>10</minimum_tab_height>
5658
<name>Tabbed Container</name>
@@ -108,7 +110,7 @@
108110
<color red="0" green="0" blue="0" />
109111
</tab_3_foreground_color>
110112
<tab_3_icon_path></tab_3_icon_path>
111-
<tab_3_title>Channel 1</tab_3_title>
113+
<tab_3_title>Event Spec 0</tab_3_title>
112114
<tab_4_background_color>
113115
<color red="255" green="255" blue="255" />
114116
</tab_4_background_color>
@@ -120,7 +122,7 @@
120122
<color red="0" green="0" blue="0" />
121123
</tab_4_foreground_color>
122124
<tab_4_icon_path></tab_4_icon_path>
123-
<tab_4_title>Energy Spec 1</tab_4_title>
125+
<tab_4_title>Channel 1</tab_4_title>
124126
<tab_5_background_color>
125127
<color red="255" green="255" blue="255" />
126128
</tab_5_background_color>
@@ -132,8 +134,32 @@
132134
<color red="0" green="0" blue="0" />
133135
</tab_5_foreground_color>
134136
<tab_5_icon_path></tab_5_icon_path>
135-
<tab_5_title>HV 1</tab_5_title>
136-
<tab_count>6</tab_count>
137+
<tab_5_title>Energy Spec 1</tab_5_title>
138+
<tab_6_background_color>
139+
<color red="255" green="255" blue="255" />
140+
</tab_6_background_color>
141+
<tab_6_enabled>true</tab_6_enabled>
142+
<tab_6_font>
143+
<opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
144+
</tab_6_font>
145+
<tab_6_foreground_color>
146+
<color red="0" green="0" blue="0" />
147+
</tab_6_foreground_color>
148+
<tab_6_icon_path></tab_6_icon_path>
149+
<tab_6_title>HV 1</tab_6_title>
150+
<tab_7_background_color>
151+
<color red="255" green="255" blue="255" />
152+
</tab_7_background_color>
153+
<tab_7_enabled>true</tab_7_enabled>
154+
<tab_7_font>
155+
<opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
156+
</tab_7_font>
157+
<tab_7_foreground_color>
158+
<color red="0" green="0" blue="0" />
159+
</tab_7_foreground_color>
160+
<tab_7_icon_path></tab_7_icon_path>
161+
<tab_7_title>Event Spec 1</tab_7_title>
162+
<tab_count>8</tab_count>
137163
<tooltip></tooltip>
138164
<visible>true</visible>
139165
<widget_type>Tabbed Container</widget_type>
@@ -390,6 +416,89 @@
390416
<y>16</y>
391417
</widget>
392418
</widget>
419+
<widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0.0">
420+
<actions hook="false" hook_all="false" />
421+
<background_color>
422+
<color red="240" green="240" blue="240" />
423+
</background_color>
424+
<border_color>
425+
<color red="0" green="128" blue="255" />
426+
</border_color>
427+
<border_style>0</border_style>
428+
<border_width>1</border_width>
429+
<enabled>true</enabled>
430+
<fc>false</fc>
431+
<font>
432+
<opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
433+
</font>
434+
<foreground_color>
435+
<color red="192" green="192" blue="192" />
436+
</foreground_color>
437+
<height>662</height>
438+
<lock_children>false</lock_children>
439+
<macros>
440+
<include_parent_macros>true</include_parent_macros>
441+
</macros>
442+
<name>Event Spec 0</name>
443+
<rules />
444+
<scale_options>
445+
<width_scalable>true</width_scalable>
446+
<height_scalable>true</height_scalable>
447+
<keep_wh_ratio>false</keep_wh_ratio>
448+
</scale_options>
449+
<scripts />
450+
<show_scrollbar>true</show_scrollbar>
451+
<tooltip></tooltip>
452+
<transparent>true</transparent>
453+
<visible>false</visible>
454+
<widget_type>Grouping Container</widget_type>
455+
<width>845</width>
456+
<wuid>282ef270:189e1fea679:-7bda</wuid>
457+
<x>1</x>
458+
<y>1</y>
459+
<widget typeId="org.csstudio.opibuilder.widgets.linkingContainer" version="1.0.0">
460+
<actions hook="false" hook_all="false" />
461+
<background_color>
462+
<color red="240" green="240" blue="240" />
463+
</background_color>
464+
<border_color>
465+
<color red="0" green="128" blue="255" />
466+
</border_color>
467+
<border_style>3</border_style>
468+
<border_width>1</border_width>
469+
<enabled>true</enabled>
470+
<font>
471+
<opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
472+
</font>
473+
<foreground_color>
474+
<color red="192" green="192" blue="192" />
475+
</foreground_color>
476+
<group_name></group_name>
477+
<height>612</height>
478+
<macros>
479+
<include_parent_macros>true</include_parent_macros>
480+
<Q>$(HEXAGON)</Q>
481+
<CHAN>C0</CHAN>
482+
</macros>
483+
<name>Linking Container</name>
484+
<opi_file>CAEN_hexagon_eventspec.opi</opi_file>
485+
<resize_behaviour>0</resize_behaviour>
486+
<rules />
487+
<scale_options>
488+
<width_scalable>true</width_scalable>
489+
<height_scalable>true</height_scalable>
490+
<keep_wh_ratio>false</keep_wh_ratio>
491+
</scale_options>
492+
<scripts />
493+
<tooltip></tooltip>
494+
<visible>true</visible>
495+
<widget_type>Linking Container</widget_type>
496+
<width>725</width>
497+
<wuid>282ef270:189e1fea679:-7bd6</wuid>
498+
<x>20</x>
499+
<y>19</y>
500+
</widget>
501+
</widget>
393502
<widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0.0">
394503
<actions hook="false" hook_all="false" />
395504
<background_color>
@@ -590,7 +699,7 @@
590699
<show_scrollbar>true</show_scrollbar>
591700
<tooltip></tooltip>
592701
<transparent>true</transparent>
593-
<visible>true</visible>
702+
<visible>false</visible>
594703
<widget_type>Grouping Container</widget_type>
595704
<width>845</width>
596705
<wuid>3f75a06:17db542637e:-71f6</wuid>
@@ -639,6 +748,89 @@
639748
<y>11</y>
640749
</widget>
641750
</widget>
751+
<widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0.0">
752+
<actions hook="false" hook_all="false" />
753+
<background_color>
754+
<color red="240" green="240" blue="240" />
755+
</background_color>
756+
<border_color>
757+
<color red="0" green="128" blue="255" />
758+
</border_color>
759+
<border_style>0</border_style>
760+
<border_width>1</border_width>
761+
<enabled>true</enabled>
762+
<fc>false</fc>
763+
<font>
764+
<opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
765+
</font>
766+
<foreground_color>
767+
<color red="192" green="192" blue="192" />
768+
</foreground_color>
769+
<height>662</height>
770+
<lock_children>false</lock_children>
771+
<macros>
772+
<include_parent_macros>true</include_parent_macros>
773+
</macros>
774+
<name>Event Spec 1</name>
775+
<rules />
776+
<scale_options>
777+
<width_scalable>true</width_scalable>
778+
<height_scalable>true</height_scalable>
779+
<keep_wh_ratio>false</keep_wh_ratio>
780+
</scale_options>
781+
<scripts />
782+
<show_scrollbar>true</show_scrollbar>
783+
<tooltip></tooltip>
784+
<transparent>true</transparent>
785+
<visible>true</visible>
786+
<widget_type>Grouping Container</widget_type>
787+
<width>845</width>
788+
<wuid>282ef270:189e1fea679:-783b</wuid>
789+
<x>1</x>
790+
<y>1</y>
791+
<widget typeId="org.csstudio.opibuilder.widgets.linkingContainer" version="1.0.0">
792+
<actions hook="false" hook_all="false" />
793+
<background_color>
794+
<color red="240" green="240" blue="240" />
795+
</background_color>
796+
<border_color>
797+
<color red="0" green="128" blue="255" />
798+
</border_color>
799+
<border_style>3</border_style>
800+
<border_width>1</border_width>
801+
<enabled>true</enabled>
802+
<font>
803+
<opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
804+
</font>
805+
<foreground_color>
806+
<color red="192" green="192" blue="192" />
807+
</foreground_color>
808+
<group_name></group_name>
809+
<height>612</height>
810+
<macros>
811+
<include_parent_macros>true</include_parent_macros>
812+
<Q>$(HEXAGON)</Q>
813+
<CHAN>C1</CHAN>
814+
</macros>
815+
<name>Linking Container</name>
816+
<opi_file>CAEN_hexagon_eventspec.opi</opi_file>
817+
<resize_behaviour>0</resize_behaviour>
818+
<rules />
819+
<scale_options>
820+
<width_scalable>true</width_scalable>
821+
<height_scalable>true</height_scalable>
822+
<keep_wh_ratio>false</keep_wh_ratio>
823+
</scale_options>
824+
<scripts />
825+
<tooltip></tooltip>
826+
<visible>true</visible>
827+
<widget_type>Linking Container</widget_type>
828+
<width>725</width>
829+
<wuid>282ef270:189e1fea679:-7833</wuid>
830+
<x>30</x>
831+
<y>12</y>
832+
</widget>
833+
</widget>
642834
</widget>
643835
<widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
644836
<actions hook="false" hook_all="false">

0 commit comments

Comments
 (0)