Skip to content

Ticket3071 add ioc kicker #790

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

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
+878 −241
Open

Ticket3071 add ioc kicker #790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
64e6a6c
Add template OPI file
Aug 15, 2018
8fc2f9a
Merge remote-tracking branch 'origin/Ticket3406_monitor_oscilloscope_…
Aug 21, 2018
1430b59
Added voltage viewer to Kicker OPI
Aug 21, 2018
13ff0ab
Updated xml and tweaked OPI
Aug 21, 2018
96ad20f
Fixed extra merged text
Aug 21, 2018
1cddaea
Updated macros
Aug 21, 2018
e4a7ad7
Updated kicker opi with power pv.
Aug 28, 2018
2bc4f6c
Changed name of the OPI
Aug 28, 2018
ba7e1d7
Merge branch 'master' into Ticket3071_Add_IOC_KICKER
Aug 28, 2018
912f0e4
Removed checkstyle file
Aug 28, 2018
a0a0dbc
Reverted back to old opi_info file and template opi
Aug 28, 2018
6f28041
Readded Kicker OPI info to xml file
Aug 28, 2018
f197b17
Tidy up
Aug 28, 2018
798f873
More tidying up
Aug 28, 2018
58f943a
Fix build issue
Sep 6, 2018
ed96bdd
Merge branch 'master' into Ticket3071_Add_IOC_KICKER
Sep 6, 2018
30bb650
Fix label lissue
Sep 6, 2018
64e8999
Merge branch 'Ticket3071_Add_IOC_KICKER' of https://github.com/ISISCo…
Sep 6, 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 ...s.ibex.devicescreens/src/uk/ac/stfc/isis/ibex/devicescreens/components/ComponentType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,12 @@ public enum ComponentType {
SYRINGE_PUMP,
/** Keyence micrometer. */
KEYENCE,
/** Generic Power Supply. */
/** Generic Power Supply. */
POWER_SUPPLY,
/** Oscilloscope */
/** Oscilloscope. */
OSCILLOSCOPE,
/** Moxa ioLogik e1210 Remote I/O. */
MOXA_1210;
/** Moxa ioLogik e1210 Remote I/O. */
MOXA_1210;

private Target target;

Expand Down
253 changes: 21 additions & 232 deletions base/uk.ac.stfc.isis.ibex.opis/resources/TDS3000_trace.opi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<widget_type>Display</widget_type>
<width>800</width>
<wuid>-336ad6f:141c65e96ed:-7fff</wuid>
<x>18</x>
<x>0</x>
<y>30</y>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
<actions hook="false" hook_all="false" />
Expand Down Expand Up @@ -69,259 +69,48 @@
<widget_type>Label</widget_type>
<width>391</width>
<wrap_words>true</wrap_words>
<wuid>4fdc1aa2:158de06471b:-7a02</wuid>
<wuid>-3622cb5:1655c0e9d06:-7f29</wuid>
<x>6</x>
<y>-12</y>
<y>6</y>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.tab" version="1.0.0">
<widget typeId="org.csstudio.opibuilder.widgets.linkingContainer" version="1.0.0">
<actions hook="false" hook_all="false" />
<active_tab>0</active_tab>
<background_color>
<color name="ISIS_OPI_Background" red="240" green="240" blue="240" />
<color red="240" green="240" blue="240" />
</background_color>
<border_color>
<color name="ISIS_Border" red="0" green="0" blue="0" />
<color name="ISIS_GroupBox_Border_NEW" red="0" green="128" blue="255" />
</border_color>
<border_style>0</border_style>
<border_style>13</border_style>
<border_width>1</border_width>
<enabled>true</enabled>
<font>
<opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">ISIS_GroupBox_NEW</opifont.name>
</font>
<foreground_color>
<color name="ISIS_OPI_Background" red="240" green="240" blue="240" />
<color name="ISIS_OPI_Foreground" red="192" green="192" blue="192" />
</foreground_color>
<height>649</height>
<horizontal_tabs>true</horizontal_tabs>
<group_name></group_name>
<height>798</height>
<macros>
<include_parent_macros>true</include_parent_macros>
</macros>
<minimum_tab_height>10</minimum_tab_height>
<name>Tabbed Container</name>
<name></name>
<opi_file>TDS3000_trace_web_interface.opi</opi_file>
<resize_behaviour>1</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 />
<tab_0_background_color>
<color name="ISIS_OPI_Background" red="240" green="240" blue="240" />
</tab_0_background_color>
<tab_0_enabled>true</tab_0_enabled>
<tab_0_font>
<opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">ISIS_TabTitle_NEW</opifont.name>
</tab_0_font>
<tab_0_foreground_color>
<color name="ISIS_Standard_Text" red="0" green="0" blue="0" />
</tab_0_foreground_color>
<tab_0_icon_path></tab_0_icon_path>
<tab_0_title>View trace</tab_0_title>
<tab_1_background_color>
<color name="ISIS_OPI_Background" red="240" green="240" blue="240" />
</tab_1_background_color>
<tab_1_enabled>true</tab_1_enabled>
<tab_1_font>
<opifont.name fontName="Segoe UI" height="9" style="0" pixels="false">ISIS_TabTitle_NEW</opifont.name>
</tab_1_font>
<tab_1_foreground_color>
<color name="ISIS_Standard_Text" red="0" green="0" blue="0" />
</tab_1_foreground_color>
<tab_1_icon_path></tab_1_icon_path>
<tab_1_title>Configuration</tab_1_title>
<tab_count>2</tab_count>
<tooltip></tooltip>
<visible>true</visible>
<widget_type>Tabbed Container</widget_type>
<width>684</width>
<wuid>1a251549:1653d5a1794:-76d0</wuid>
<x>6</x>
<y>30</y>
<widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" 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 name="ISIS_Check_Border" 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="Arial" height="9" style="0" pixels="false">ISIS_Label_Small</opifont.name>
</font>
<foreground_color>
<color name="ISIS_OPI_Foreground" red="192" green="192" blue="192" />
</foreground_color>
<height>620</height>
<lock_children>false</lock_children>
<macros>
<include_parent_macros>true</include_parent_macros>
</macros>
<name>View trace</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>false</visible>
<widget_type>Grouping Container</widget_type>
<width>682</width>
<wuid>1a251549:1653d5a1794:-76cf</wuid>
<x>1</x>
<y>1</y>
<widget typeId="org.csstudio.opibuilder.widgets.webbrowser" 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="192" green="192" blue="192" />
</border_color>
<border_style>1</border_style>
<border_width>1</border_width>
<enabled>true</enabled>
<foreground_color>
<color red="192" green="192" blue="192" />
</foreground_color>
<height>504</height>
<name>Web Browser</name>
<rules />
<scale_options>
<width_scalable>false</width_scalable>
<height_scalable>false</height_scalable>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<scripts />
<show_toolbar>false</show_toolbar>
<tooltip></tooltip>
<url>$(IP)/Image.png</url>
<visible>true</visible>
<widget_type>Web Browser</widget_type>
<width>679</width>
<wuid>1a251549:1653d5a1794:-7c60</wuid>
<x>0</x>
<y>0</y>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
<actions hook="false" hook_all="false" />
<auto_size>false</auto_size>
<background_color>
<color name="ISIS_Label_Background" red="240" green="240" blue="240" />
</background_color>
<border_color>
<color name="ISIS_Border" red="0" green="0" blue="0" />
</border_color>
<border_style>0</border_style>
<border_width>1</border_width>
<enabled>true</enabled>
<font>
<opifont.name fontName="Segoe UI" height="9" style="1" pixels="false">ISIS_Label_NEW</opifont.name>
</font>
<foreground_color>
<color name="ISIS_Standard_Text" red="0" green="0" blue="0" />
</foreground_color>
<height>20</height>
<horizontal_alignment>0</horizontal_alignment>
<name>Ramp_file_label</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>false</show_scrollbar>
<text>To refresh the data shown on this screen, right click outside the image and select "Refresh OPI".</text>
<tooltip></tooltip>
<transparent>false</transparent>
<vertical_alignment>1</vertical_alignment>
<visible>true</visible>
<widget_type>Label</widget_type>
<width>661</width>
<wrap_words>true</wrap_words>
<wuid>1a251549:1653d5a1794:-78c4</wuid>
<x>6</x>
<y>510</y>
</widget>
</widget>
<widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" 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 name="ISIS_Check_Border" 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="Arial" height="9" style="0" pixels="false">ISIS_Label_Small</opifont.name>
</font>
<foreground_color>
<color name="ISIS_OPI_Foreground" red="192" green="192" blue="192" />
</foreground_color>
<height>620</height>
<lock_children>false</lock_children>
<macros>
<include_parent_macros>true</include_parent_macros>
</macros>
<name>Configuration</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>682</width>
<wuid>1a251549:1653d5a1794:-76cb</wuid>
<x>1</x>
<y>1</y>
<widget typeId="org.csstudio.opibuilder.widgets.webbrowser" 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="192" green="192" blue="192" />
</border_color>
<border_style>1</border_style>
<border_width>1</border_width>
<enabled>true</enabled>
<foreground_color>
<color red="192" green="192" blue="192" />
</foreground_color>
<height>619</height>
<name>Web Browser</name>
<rules />
<scale_options>
<width_scalable>false</width_scalable>
<height_scalable>false</height_scalable>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<scripts />
<show_toolbar>false</show_toolbar>
<tooltip></tooltip>
<url>$(IP)/Data.html</url>
<visible>true</visible>
<widget_type>Web Browser</widget_type>
<width>679</width>
<wuid>1a251549:1653d5a1794:-761a</wuid>
<x>0</x>
<y>0</y>
</widget>
</widget>
<widget_type>Linking Container</widget_type>
<width>846</width>
<wuid>-3622cb5:1655c0e9d06:-7ec3</wuid>
<x>0</x>
<y>37</y>
</widget>
</display>
Loading