Skip to content

Commit

Permalink
Update CSS Screens
Browse files Browse the repository at this point in the history
Make 2 master screens:
IOC.opi and IOC2.opi
IOC.opi is for the SolAxis or 8 axis simulator,
IOC2.opi is for the 2 axis slit system, which has 4 logical
motorRecord axes.

Simplify eemcuAxis.opi, so that it show the user important fields,
the old version is kept under eemcuAxis-advanced.opi.
  • Loading branch information
tboegi committed Nov 11, 2016
1 parent a0405f0 commit 556c92d
Show file tree
Hide file tree
Showing 7 changed files with 11,106 additions and 5,739 deletions.
93 changes: 0 additions & 93 deletions epics/m-epics-eemcu/Boy/CPU.opi

This file was deleted.

File renamed without changes.
154 changes: 135 additions & 19 deletions epics/m-epics-eemcu/Boy/CPU2x.opi → epics/m-epics-eemcu/Boy/IOC2.opi
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<height>600</height>
<macros>
<include_parent_macros>true</include_parent_macros>
<P>IOC:</P>
<P>IOC2:</P>
</macros>
<boy_version>4.0.103.201506251634</boy_version>
<show_edit_range>true</show_edit_range>
Expand Down Expand Up @@ -43,9 +43,9 @@ $(pv_value)</tooltip>
<push_action_index>0</push_action_index>
<rules />
<enabled>true</enabled>
<wuid>-5fa237c5:1486496e2b9:-7f3c</wuid>
<wuid>1aaa2922:15538b80fbe:-7fb8</wuid>
<pv_value />
<text>IOC:m1</text>
<text>IOC2:m1</text>
<scripts />
<border_alarm_sensitive>false</border_alarm_sensitive>
<height>31</height>
Expand All @@ -67,9 +67,9 @@ $(pv_value)</tooltip>
<color red="240" green="240" blue="240" />
</background_color>
<width>103</width>
<x>30</x>
<x>24</x>
<name>Action Button</name>
<y>36</y>
<y>48</y>
<style>0</style>
<foreground_color>
<color red="0" green="0" blue="0" />
Expand Down Expand Up @@ -100,9 +100,9 @@ $(pv_value)</tooltip>
<push_action_index>0</push_action_index>
<rules />
<enabled>true</enabled>
<wuid>656a2d8c:15258ee659a:-7a22</wuid>
<wuid>1aaa2922:15538b80fbe:-7fb1</wuid>
<pv_value />
<text>IOC:m1,m2</text>
<text>IOC2:m1</text>
<scripts />
<border_alarm_sensitive>false</border_alarm_sensitive>
<height>31</height>
Expand All @@ -124,22 +124,21 @@ $(pv_value)</tooltip>
<color red="240" green="240" blue="240" />
</background_color>
<width>103</width>
<x>30</x>
<x>156</x>
<name>Action Button_1</name>
<y>168</y>
<y>48</y>
<style>0</style>
<foreground_color>
<color red="0" green="0" blue="0" />
</foreground_color>
<actions hook="false" hook_all="false">
<action type="OPEN_DISPLAY">
<path>motor2x.opi</path>
<path>eemcuAxis.opi</path>
<macros>
<include_parent_macros>true</include_parent_macros>
<M>m1</M>
<M1>m1</M1>
<M2>m2</M2>
<R>m1-</R>
<P>IOC2:</P>
</macros>
<replace>0</replace>
<description></description>
Expand All @@ -150,7 +149,7 @@ $(pv_value)</tooltip>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
<toggle_button>false</toggle_button>
<toggle_button>true</toggle_button>
<border_style>0</border_style>
<forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
<alarm_pulsing>false</alarm_pulsing>
Expand All @@ -159,9 +158,10 @@ $(pv_value)</tooltip>
<push_action_index>0</push_action_index>
<rules />
<enabled>true</enabled>
<wuid>656a2d8c:15258ee659a:-788d</wuid>
<wuid>5e0af4bd:157e72ce27b:-7cc9</wuid>
<release_action_index>0</release_action_index>
<pv_value />
<text>IOC:m2</text>
<text>IOC2:xl</text>
<scripts />
<border_alarm_sensitive>false</border_alarm_sensitive>
<height>31</height>
Expand All @@ -183,9 +183,9 @@ $(pv_value)</tooltip>
<color red="240" green="240" blue="240" />
</background_color>
<width>103</width>
<x>30</x>
<x>24</x>
<name>Action Button_2</name>
<y>90</y>
<y>96</y>
<style>0</style>
<foreground_color>
<color red="0" green="0" blue="0" />
Expand All @@ -195,8 +195,124 @@ $(pv_value)</tooltip>
<path>eemcuAxis.opi</path>
<macros>
<include_parent_macros>true</include_parent_macros>
<M>m2</M>
<R>m2-</R>
<M>xl</M>
<R>xl-</R>
</macros>
<replace>0</replace>
<description></description>
</action>
</actions>
<font>
<opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
<toggle_button>false</toggle_button>
<border_style>0</border_style>
<forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
<alarm_pulsing>false</alarm_pulsing>
<tooltip>$(pv_name)
$(pv_value)</tooltip>
<push_action_index>0</push_action_index>
<rules />
<enabled>true</enabled>
<wuid>5e0af4bd:157e72ce27b:-7cc2</wuid>
<pv_value />
<text>IOC2:xr</text>
<scripts />
<border_alarm_sensitive>false</border_alarm_sensitive>
<height>31</height>
<border_width>1</border_width>
<scale_options>
<width_scalable>true</width_scalable>
<height_scalable>true</height_scalable>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<image></image>
<visible>true</visible>
<pv_name></pv_name>
<border_color>
<color red="0" green="128" blue="255" />
</border_color>
<widget_type>Action Button</widget_type>
<backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
<background_color>
<color red="240" green="240" blue="240" />
</background_color>
<width>103</width>
<x>156</x>
<name>Action Button_3</name>
<y>96</y>
<style>0</style>
<foreground_color>
<color red="0" green="0" blue="0" />
</foreground_color>
<actions hook="false" hook_all="false">
<action type="OPEN_DISPLAY">
<path>eemcuAxis.opi</path>
<macros>
<include_parent_macros>true</include_parent_macros>
<M>xr</M>
<R>xr-</R>
</macros>
<replace>0</replace>
<description></description>
</action>
</actions>
<font>
<opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
</font>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.ActionButton" version="2.0.0">
<toggle_button>false</toggle_button>
<border_style>0</border_style>
<forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
<alarm_pulsing>false</alarm_pulsing>
<tooltip>$(pv_name)
$(pv_value)</tooltip>
<push_action_index>0</push_action_index>
<rules />
<enabled>true</enabled>
<wuid>4fd29166:158534771b1:-7c2f</wuid>
<pv_value />
<text>IOC2:m1m2xlxr</text>
<scripts />
<border_alarm_sensitive>false</border_alarm_sensitive>
<height>31</height>
<border_width>1</border_width>
<scale_options>
<width_scalable>true</width_scalable>
<height_scalable>true</height_scalable>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<image></image>
<visible>true</visible>
<pv_name></pv_name>
<border_color>
<color red="0" green="128" blue="255" />
</border_color>
<widget_type>Action Button</widget_type>
<backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
<background_color>
<color red="240" green="240" blue="240" />
</background_color>
<width>103</width>
<x>24</x>
<name>Action Button_4</name>
<y>156</y>
<style>0</style>
<foreground_color>
<color red="0" green="0" blue="0" />
</foreground_color>
<actions hook="false" hook_all="false">
<action type="OPEN_DISPLAY">
<path>motor4x.opi</path>
<macros>
<include_parent_macros>true</include_parent_macros>
<M1>m1</M1>
<M2>m2</M2>
<M3>xl</M3>
<M4>xr</M4>
</macros>
<replace>0</replace>
<description></description>
Expand Down
Loading

0 comments on commit 556c92d

Please sign in to comment.