diff --git a/base/uk.ac.stfc.isis.ibex.devicescreens/src/uk/ac/stfc/isis/ibex/devicescreens/components/ComponentType.java b/base/uk.ac.stfc.isis.ibex.devicescreens/src/uk/ac/stfc/isis/ibex/devicescreens/components/ComponentType.java index fb5559cf7e..61b2fc0ffc 100644 --- a/base/uk.ac.stfc.isis.ibex.devicescreens/src/uk/ac/stfc/isis/ibex/devicescreens/components/ComponentType.java +++ b/base/uk.ac.stfc.isis.ibex.devicescreens/src/uk/ac/stfc/isis/ibex/devicescreens/components/ComponentType.java @@ -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; diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/TDS3000_trace.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/TDS3000_trace.opi index f2cf594b0c..f87620bd96 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/TDS3000_trace.opi +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/TDS3000_trace.opi @@ -30,7 +30,7 @@ Display 800 -336ad6f:141c65e96ed:-7fff - 18 + 0 30 @@ -69,32 +69,35 @@ Label 391 true - 4fdc1aa2:158de06471b:-7a02 + -3622cb5:1655c0e9d06:-7f29 6 - -12 + 6 - + - 0 - + - + - 0 + 13 1 true + + ISIS_GroupBox_NEW + - + - 649 - true + + 798 true - 10 - Tabbed Container + + TDS3000_trace_web_interface.opi + 1 true @@ -102,226 +105,12 @@ false - - - - true - - ISIS_TabTitle_NEW - - - - - - View trace - - - - true - - ISIS_TabTitle_NEW - - - - - - Configuration - 2 true - Tabbed Container - 684 - 1a251549:1653d5a1794:-76d0 - 6 - 30 - - - - - - - - - 0 - 1 - true - false - - ISIS_Label_Small - - - - - 620 - false - - true - - View trace - - - true - true - false - - - true - - true - false - Grouping Container - 682 - 1a251549:1653d5a1794:-76cf - 1 - 1 - - - - - - - - - 1 - 1 - true - - - - 504 - Web Browser - - - false - false - false - - - false - - $(IP)/Image.png - true - Web Browser - 679 - 1a251549:1653d5a1794:-7c60 - 0 - 0 - - - - false - - - - - - - 0 - 1 - true - - ISIS_Label_NEW - - - - - 20 - 0 - Ramp_file_label - - - true - true - false - - - false - To refresh the data shown on this screen, right click outside the image and select "Refresh OPI". - - false - 1 - true - Label - 661 - true - 1a251549:1653d5a1794:-78c4 - 6 - 510 - - - - - - - - - - - 0 - 1 - true - false - - ISIS_Label_Small - - - - - 620 - false - - true - - Configuration - - - true - true - false - - - true - - true - true - Grouping Container - 682 - 1a251549:1653d5a1794:-76cb - 1 - 1 - - - - - - - - - 1 - 1 - true - - - - 619 - Web Browser - - - false - false - false - - - false - - $(IP)/Data.html - true - Web Browser - 679 - 1a251549:1653d5a1794:-761a - 0 - 0 - - + Linking Container + 846 + -3622cb5:1655c0e9d06:-7ec3 + 0 + 37 \ No newline at end of file diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/TDS3000_trace_web_interface.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/TDS3000_trace_web_interface.opi new file mode 100644 index 0000000000..afb3e92a6b --- /dev/null +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/TDS3000_trace_web_interface.opi @@ -0,0 +1,286 @@ + + + + + false + -1 + -1 + + false + + + + 5.1.0.201707071649 + + + + 6 + 620 + + false + + $(NAME) + + + true + true + true + true + true + Display + 800 + -336ad6f:141c65e96ed:-7fff + 18 + 30 + + + 0 + + + + + + + 0 + 1 + true + + + + 715 + true + + true + + 10 + Tabbed Container_1 + + + true + true + false + + + + + + true + + ISIS_TabTitle_NEW + + + + + + View trace + + + + true + + ISIS_TabTitle_NEW + + + + + + Configuration + 2 + + true + Tabbed Container + 853 + -3622cb5:1655c0e9d06:-7f3c + 0 + 0 + + + + + + + + + 0 + 1 + true + false + + ISIS_Label_Small + + + + + 681 + false + + true + + View trace + + + true + true + false + + + true + + true + false + Grouping Container + 851 + -3622cb5:1655c0e9d06:-7f3b + 1 + 1 + + + + + + + + + 1 + 1 + true + + + + 619 + Web Browser + + + false + false + false + + + false + + $(SCOPE_IP)/Image.png + true + Web Browser + 847 + -3622cb5:1655c0e9d06:-7f3a + 0 + 0 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 0 + Ramp_file_label + + + true + true + false + + + false + To refresh the data shown on this screen, right click outside the image and select "Refresh OPI". + + false + 1 + true + Label + 661 + true + -3622cb5:1655c0e9d06:-7f39 + 6 + 630 + + + + + + + + + + + 0 + 1 + true + false + + ISIS_Label_Small + + + + + 681 + false + + true + + Configuration + + + true + true + false + + + true + + true + true + Grouping Container + 851 + -3622cb5:1655c0e9d06:-7f38 + 1 + 1 + + + + + + + + + 1 + 1 + true + + + + 673 + Web Browser + + + false + false + false + + + false + + $(SCOPE_IP)/Data.html + true + Web Browser + 835 + -3622cb5:1655c0e9d06:-7f37 + 0 + 0 + + + + \ No newline at end of file diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi b/base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi new file mode 100644 index 0000000000..6f6f601151 --- /dev/null +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/kicker.opi @@ -0,0 +1,540 @@ + + + + + false + -1 + -1 + + false + + + + 5.1.0.201707071649 + + + + 6 + 600 + + true + $(P)$(KICKER): + + + + + true + true + true + true + true + Display + 800 + -1fce3382:15fb9cec36d:-75d6 + -1 + -1 + + + false + + + + + + + 0 + 1 + true + + ISIS_Header1_NEW + + + + + 37 + 0 + Label + + + true + true + false + + + false + Kicker PSU + + false + 1 + true + Label + 1164 + true + 20a87e7e:1655b91e73a:-7f2d + 6 + 12 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Header2_NEW + + + + + 37 + 0 + Label_1 + + + true + true + false + + + false + $(NAME) + + false + 1 + true + Label + 1164 + true + 20a87e7e:1655b91e73a:-7f2c + 6 + 48 + + + + + + + + + + 13 + 1 + true + false + + ISIS_GroupBox_NEW + + + + + 757 + false + + true + + Status + + + true + true + false + + + true + + false + true + Grouping Container + 259 + 20a87e7e:1655b91e73a:-7e41 + 6 + 96 + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Label_3 + + + true + true + false + + + false + Voltage: + + false + 1 + true + Label + 64 + true + 20a87e7e:1655b91e73a:-7e3d + 6 + 54 + + + + false + false + false + + + + true + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 20 + 1 + Text Update + 0 + true + $(PV_ROOT)VOLT + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 85 + false + 20a87e7e:1655b91e73a:-7e3b + 114 + 54 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Label_3 + + + true + true + false + + + false + Current: + + false + 1 + true + Label + 64 + true + 20a87e7e:1655b91e73a:-7e05 + 6 + 84 + + + + false + false + false + + + + true + + + + 0 + 1 + true + + ISIS_Value_NEW + + false + + + + 0 + 20 + 1 + Text Update + 0 + true + $(PV_ROOT)CURR + + 0.0 + + + true + true + false + + + true + ###### + $(pv_name) +$(pv_value) + true + 1 + true + Text Update + 85 + false + 20a87e7e:1655b91e73a:-7e04 + 114 + 84 + + + + false + false + + + + -1 + true + + + + 0 + 1 + 3 + + + + 0 + true + true + + Default + + false + + + + 25 + LED + + + + OFF + + + + ON + $(PV_ROOT)POWER + + + + true + true + true + + + false + false + $(pv_name) +$(pv_value) + true + LED + 25 + 20a87e7e:1655b91e73a:-7d65 + 144 + 21 + + + + false + + + + + + + 0 + 1 + true + + ISIS_Label_NEW + + + + + 20 + 2 + Label_3 + + + true + true + false + + + false + Power: + + false + 1 + true + Label + 64 + true + 20a87e7e:1655b91e73a:-7d5d + 6 + 24 + + + + false + 255 + true + 20 + 0 + false + + + + false + + + + 0 + 1 + true + true + 0.0 + + Default + + false + + + + 1 + true + 0 + 1 + Polyline + + + + + + + 0.0 + + + true + true + true + + + $(pv_name) +$(pv_value) + false + true + Polyline + 200 + 20a87e7e:1655b91e73a:-7c6f + 6 + 120 + + + + + + + + + + + 13 + 1 + true + + ISIS_GroupBox_NEW + + + + + + 746 + + true + + Voltage + TDS3000_trace_web_interface.opi + 1 + + + true + true + false + + + + true + Linking Container + 884 + -3622cb5:1655c0e9d06:-7cd8 + 276 + 96 + + \ No newline at end of file diff --git a/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml b/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml index 4880f28b6f..87f05c9591 100644 --- a/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml +++ b/base/uk.ac.stfc.isis.ibex.opis/resources/opi_info.xml @@ -2523,11 +2523,33 @@ The trace shown by a TDS 3000 series oscilloscope - IP - The IP address of the oscilloscope. + SCOPE_IP + The IP address of the Kicker oscilloscope. + + + Kicker PSU + + + Power supplies + + POWER_SUPPLY + kicker.opi + The OPI for the KICKER power supply unit + + + KICKER + The KICKER PV prefix (e.g. KICKER_01). + + + SCOPE_IP + The IP address of the Kicker oscilloscope. + + + - + + diff --git a/base/uk.ac.stfc.isis.ibex.ui.devicescreens/src/uk/ac/stfc/isis/ibex/ui/devicescreens/ComponentIcons.java b/base/uk.ac.stfc.isis.ibex.ui.devicescreens/src/uk/ac/stfc/isis/ibex/ui/devicescreens/ComponentIcons.java index b98cc207dd..73c13f6d39 100644 --- a/base/uk.ac.stfc.isis.ibex.ui.devicescreens/src/uk/ac/stfc/isis/ibex/ui/devicescreens/ComponentIcons.java +++ b/base/uk.ac.stfc.isis.ibex.ui.devicescreens/src/uk/ac/stfc/isis/ibex/ui/devicescreens/ComponentIcons.java @@ -163,8 +163,8 @@ private static String getIconNameForType(ComponentType componentType) { return "keyence"; case OSCILLOSCOPE: return "oscilloscope"; - case MOXA_1210: - return "moxa_1210"; + case MOXA_1210: + return "moxa_1210"; default: return "cog"; }