Skip to content

Ticket6729 enhanced cryostat control #1374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
+1,435 −19
Draft

Ticket6729 enhanced cryostat control #1374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f87109
Design for enhanced cryostat control UI on mercury
JamesKingWork Nov 3, 2021
037d004
Merge branch 'master' into Ticket6729_enhanced_cryostat_control
JamesKingWork Nov 3, 2021
2ab1603
Make selected level and temp cards for mercury auto pressure control …
JamesKingWork Nov 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 97 additions & 3 deletions base/uk.ac.stfc.isis.ibex.opis/resources/mercuryiTC/mercuryiTC.opi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<background_color>
<color name="ISIS_OPI_Background" red="240" green="240" blue="240" />
</background_color>
<boy_version>5.1.0.201707071649</boy_version>
<boy_version>5.1.0</boy_version>
<foreground_color>
<color red="192" green="192" blue="192" />
</foreground_color>
Expand Down Expand Up @@ -266,7 +266,19 @@ $(pv_value)</tooltip>
</tab_8_foreground_color>
<tab_8_icon_path></tab_8_icon_path>
<tab_8_title>System</tab_8_title>
<tab_count>9</tab_count>
<tab_9_background_color>
<color name="ISIS_OPI_Background" red="240" green="240" blue="240" />
</tab_9_background_color>
<tab_9_enabled>true</tab_9_enabled>
<tab_9_font>
<opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">ISIS_TabTitle_NEW</opifont.name>
</tab_9_font>
<tab_9_foreground_color>
<color name="ISIS_Standard_Text" red="0" green="0" blue="0" />
</tab_9_foreground_color>
<tab_9_icon_path></tab_9_icon_path>
<tab_9_title>Automatic Pressure Control</tab_9_title>
<tab_count>10</tab_count>
<tooltip></tooltip>
<visible>true</visible>
<widget_type>Tabbed Container</widget_type>
Expand Down Expand Up @@ -960,7 +972,7 @@ $(pv_value)</tooltip>
<show_scrollbar>true</show_scrollbar>
<tooltip></tooltip>
<transparent>true</transparent>
<visible>true</visible>
<visible>false</visible>
<widget_type>Grouping Container</widget_type>
<width>791</width>
<wuid>d2963b:1723cd72607:-7c6d</wuid>
Expand Down Expand Up @@ -1008,6 +1020,88 @@ $(pv_value)</tooltip>
<y>0</y>
</widget>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0.0">
<actions hook="false" hook_all="false" />
<background_color>
<color red="240" green="240" blue="240" />
</background_color>
<border_color>
<color red="0" green="128" blue="255" />
</border_color>
<border_style>0</border_style>
<border_width>1</border_width>
<enabled>true</enabled>
<fc>false</fc>
<font>
<opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
</font>
<foreground_color>
<color red="192" green="192" blue="192" />
</foreground_color>
<height>502</height>
<lock_children>false</lock_children>
<macros>
<include_parent_macros>true</include_parent_macros>
</macros>
<name>Automatic Pressure Control</name>
<rules />
<scale_options>
<width_scalable>true</width_scalable>
<height_scalable>true</height_scalable>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<scripts />
<show_scrollbar>true</show_scrollbar>
<tooltip></tooltip>
<transparent>true</transparent>
<visible>true</visible>
<widget_type>Grouping Container</widget_type>
<width>791</width>
<wuid>-2e77eee8:17ce60572b3:-7e5c</wuid>
<x>1</x>
<y>1</y>
<widget typeId="org.csstudio.opibuilder.widgets.linkingContainer" version="1.0.0">
<actions hook="false" hook_all="false" />
<background_color>
<color name="ISIS_OPI_Background" red="240" green="240" blue="240" />
</background_color>
<border_color>
<color red="0" green="128" blue="255" />
</border_color>
<border_style>0</border_style>
<border_width>1</border_width>
<enabled>true</enabled>
<font>
<opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">Default</opifont.name>
</font>
<foreground_color>
<color red="192" green="192" blue="192" />
</foreground_color>
<group_name></group_name>
<height>495</height>
<macros>
<include_parent_macros>true</include_parent_macros>
<CARD_NUM>7</CARD_NUM>
</macros>
<name>Tab9</name>
<opi_file>mercuryiTC_single_auto_pressure_control.opi</opi_file>
<resize_behaviour>3</resize_behaviour>
<rules />
<scale_options>
<width_scalable>true</width_scalable>
<height_scalable>true</height_scalable>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<scripts />
<tooltip></tooltip>
<visible>true</visible>
<widget_type>Linking Container</widget_type>
<width>787</width>
<wuid>-2e77eee8:17ce60572b3:-7c92</wuid>
<x>0</x>
<y>0</y>
</widget>
</widget>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
<actions hook="false" hook_all="false" />
Expand Down
Loading