Skip to content
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

Ticket3176 khly2400 #744

Merged
merged 4 commits into from
Jul 18, 2018
Merged

Ticket3176 khly2400 #744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
25dd5a4
Merge remote-tracking branch 'origin/master' into Ticket3176_KHLY2400
Alistair-McGann-Tessella Jul 12, 2018
8613f66
Replaced tabs with spaces
Alistair-McGann-Tessella Jul 13, 2018
57b80ec
Update the Keithley OPI with new functionality
Alistair-McGann-Tessella Jul 13, 2018
41ba474
Merge remote-tracking branch 'origin/master' into Ticket3176_KHLY2400
Tom-Willemsen Jul 18, 2018
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
8 changes: 4 additions & 4 deletions base/uk.ac.stfc.isis.ibex.opis/resources/Common Scripts/onOff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from org.csstudio.opibuilder.scriptUtil import PVUtil
from org.csstudio.opibuilder.scriptUtil import PVUtil, ConsoleUtil

pv = widget.getPV();
pv = widget.getPV()
current_value = int(PVUtil.getDouble(pv))

if current_value == 0:
pv.setValue(1)
pv.setValue(1)
else:
pv.setValue(0)
pv.setValue(0)
194 changes: 190 additions & 4 deletions base/uk.ac.stfc.isis.ibex.opis/resources/Keithley2400/Keithley2400.opi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,8 @@ from org.csstudio.opibuilder.scriptUtil import ConsoleUtil
<widget typeId="org.csstudio.opibuilder.widgets.tab" version="1.0">
<active_tab>0</active_tab>
<tooltip></tooltip>
<tab_3_icon_path></tab_3_icon_path>
<tab_4_enabled>true</tab_4_enabled>
<height>511</height>
<tab_2_icon_path></tab_2_icon_path>
<border_width>1</border_width>
Expand All @@ -139,6 +141,7 @@ from org.csstudio.opibuilder.scriptUtil import ConsoleUtil
<actions hook="false" hook_all="false" />
<tab_1_enabled>true</tab_1_enabled>
<border_style>0</border_style>
<tab_4_title>Custom Input</tab_4_title>
<enabled>true</enabled>
<wuid>-e89b52e:15993563eb1:-795b</wuid>
<tab_1_background_color>
Expand All @@ -151,6 +154,11 @@ from org.csstudio.opibuilder.scriptUtil import ConsoleUtil
<tab_1_font>
<opifont.name fontName="Segoe UI" height="9" style="0">ISIS_TabTitle_NEW</opifont.name>
</tab_1_font>
<tab_3_title>Measurement Ranges</tab_3_title>
<tab_4_background_color>
<color name="ISIS_OPI_Background" red="240" green="240" blue="240" />
</tab_4_background_color>
<tab_4_icon_path></tab_4_icon_path>
<tab_2_enabled>true</tab_2_enabled>
<background_color>
<color name="ISIS_OPI_Background" red="240" green="240" blue="240" />
Expand All @@ -160,20 +168,33 @@ from org.csstudio.opibuilder.scriptUtil import ConsoleUtil
<horizontal_tabs>true</horizontal_tabs>
<y>84</y>
<rules />
<tab_3_font>
<opifont.name fontName="Segoe UI" height="9" style="0">ISIS_TabTitle_NEW</opifont.name>
</tab_3_font>
<tab_4_font>
<opifont.name fontName="Segoe UI" height="9" style="0">ISIS_TabTitle_NEW</opifont.name>
</tab_4_font>
<macros>
<include_parent_macros>true</include_parent_macros>
</macros>
<visible>true</visible>
<tab_0_background_color>
<color name="ISIS_OPI_Background" red="240" green="240" blue="240" />
</tab_0_background_color>
<tab_3_foreground_color>
<color name="ISIS_Standard_Text" red="0" green="0" blue="0" />
</tab_3_foreground_color>
<widget_type>Tabbed Container</widget_type>
<tab_2_font>
<opifont.name fontName="Segoe UI" height="9" style="0">ISIS_TabTitle_NEW</opifont.name>
</tab_2_font>
<tab_3_background_color>
<color name="ISIS_OPI_Background" red="240" green="240" blue="240" />
</tab_3_background_color>
<tab_3_enabled>true</tab_3_enabled>
<name>Tabbed Container</name>
<minimum_tab_height>10</minimum_tab_height>
<tab_2_title>Custom Input</tab_2_title>
<tab_2_title>Source Mode</tab_2_title>
<tab_0_font>
<opifont.name fontName="Segoe UI" height="9" style="0">ISIS_TabTitle_NEW</opifont.name>
</tab_0_font>
Expand All @@ -186,7 +207,7 @@ from org.csstudio.opibuilder.scriptUtil import ConsoleUtil
</tab_1_foreground_color>
<tab_1_title>Resistance Mode</tab_1_title>
<scripts />
<tab_count>3</tab_count>
<tab_count>5</tab_count>
<scale_options>
<width_scalable>true</width_scalable>
<height_scalable>true</height_scalable>
Expand All @@ -197,6 +218,9 @@ from org.csstudio.opibuilder.scriptUtil import ConsoleUtil
<foreground_color>
<color name="ISIS_OPI_Background" red="240" green="240" blue="240" />
</foreground_color>
<tab_4_foreground_color>
<color name="ISIS_Standard_Text" red="0" green="0" blue="0" />
</tab_4_foreground_color>
<widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0">
<border_style>0</border_style>
<tooltip></tooltip>
Expand All @@ -216,7 +240,7 @@ from org.csstudio.opibuilder.scriptUtil import ConsoleUtil
<macros>
<include_parent_macros>true</include_parent_macros>
</macros>
<visible>true</visible>
<visible>false</visible>
<border_color>
<color name="ISIS_Check_Border" red="0" green="128" blue="255" />
</border_color>
Expand Down Expand Up @@ -359,6 +383,168 @@ from org.csstudio.opibuilder.scriptUtil import ConsoleUtil
</font>
</widget>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0">
<border_style>0</border_style>
<tooltip></tooltip>
<rules />
<enabled>true</enabled>
<wuid>3572d0fe:1648dcc8f25:-60b2</wuid>
<transparent>true</transparent>
<lock_children>false</lock_children>
<scripts />
<height>482</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>
<macros>
<include_parent_macros>true</include_parent_macros>
</macros>
<visible>false</visible>
<border_color>
<color red="0" green="128" blue="255" />
</border_color>
<widget_type>Grouping Container</widget_type>
<background_color>
<color red="240" green="240" blue="240" />
</background_color>
<width>785</width>
<x>1</x>
<name>Source Mode</name>
<y>1</y>
<foreground_color>
<color red="192" green="192" blue="192" />
</foreground_color>
<actions hook="false" hook_all="false" />
<show_scrollbar>true</show_scrollbar>
<font>
<opifont.name fontName="Segoe UI" height="9" style="0">Default</opifont.name>
</font>
<widget typeId="org.csstudio.opibuilder.widgets.linkingContainer" version="1.0">
<opi_file>SourceMode.opi</opi_file>
<border_style>3</border_style>
<tooltip></tooltip>
<rules />
<enabled>true</enabled>
<wuid>3572d0fe:1648dcc8f25:-5fff</wuid>
<auto_size>false</auto_size>
<scripts />
<height>482</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>
<macros>
<include_parent_macros>true</include_parent_macros>
</macros>
<visible>true</visible>
<group_name></group_name>
<border_color>
<color red="0" green="128" blue="255" />
</border_color>
<widget_type>Linking Container</widget_type>
<background_color>
<color red="240" green="240" blue="240" />
</background_color>
<zoom_to_fit>false</zoom_to_fit>
<width>785</width>
<x>0</x>
<name>Linking Container</name>
<y>0</y>
<foreground_color>
<color red="192" green="192" blue="192" />
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
<opifont.name fontName="Segoe UI" height="9" style="0">Default</opifont.name>
</font>
</widget>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0">
<border_style>0</border_style>
<tooltip></tooltip>
<rules />
<enabled>true</enabled>
<wuid>3572d0fe:1648dcc8f25:-5694</wuid>
<transparent>true</transparent>
<lock_children>false</lock_children>
<scripts />
<height>482</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>
<macros>
<include_parent_macros>true</include_parent_macros>
</macros>
<visible>true</visible>
<border_color>
<color red="0" green="128" blue="255" />
</border_color>
<widget_type>Grouping Container</widget_type>
<background_color>
<color red="240" green="240" blue="240" />
</background_color>
<width>785</width>
<x>1</x>
<name>Measurement Ranges</name>
<y>1</y>
<foreground_color>
<color red="192" green="192" blue="192" />
</foreground_color>
<actions hook="false" hook_all="false" />
<show_scrollbar>true</show_scrollbar>
<font>
<opifont.name fontName="Segoe UI" height="9" style="0">Default</opifont.name>
</font>
<widget typeId="org.csstudio.opibuilder.widgets.linkingContainer" version="1.0">
<opi_file>MeasurementSettings.opi</opi_file>
<border_style>3</border_style>
<tooltip></tooltip>
<rules />
<enabled>true</enabled>
<wuid>3572d0fe:1648dcc8f25:-5669</wuid>
<auto_size>false</auto_size>
<scripts />
<height>482</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>
<macros>
<include_parent_macros>true</include_parent_macros>
</macros>
<visible>true</visible>
<group_name></group_name>
<border_color>
<color red="0" green="128" blue="255" />
</border_color>
<widget_type>Linking Container</widget_type>
<background_color>
<color red="240" green="240" blue="240" />
</background_color>
<zoom_to_fit>false</zoom_to_fit>
<width>785</width>
<x>0</x>
<name>Linking Container</name>
<y>0</y>
<foreground_color>
<color red="192" green="192" blue="192" />
</foreground_color>
<actions hook="false" hook_all="false" />
<font>
<opifont.name fontName="Segoe UI" height="9" style="0">Default</opifont.name>
</font>
</widget>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0">
<border_style>0</border_style>
<tooltip></tooltip>
Expand Down Expand Up @@ -441,4 +627,4 @@ from org.csstudio.opibuilder.scriptUtil import ConsoleUtil
</widget>
</widget>
</widget>
</display>
</display>
Loading