From f15bcbcc7f59985e51cd92c4ebc82d5b425feccd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Denis?= <jfdenis@cea.fr>
Date: Thu, 8 Dec 2016 14:42:35 +0100
Subject: [PATCH] OPI Update
---
logs.0 | 102 +++++++++++
logs.1 | 112 ++++++++++++
opi/EMU.opi | 491 +++-------------------------------------------------
3 files changed, 239 insertions(+), 466 deletions(-)
create mode 100644 logs.0
create mode 100644 logs.1
diff --git a/logs.0 b/logs.0
new file mode 100644
index 0000000..5c87442
--- /dev/null
+++ b/logs.0
@@ -0,0 +1,102 @@
+2016-12-08 11:51:39.534 INFO [Thread 1] org.csstudio.opibuilder.widgets.editparts.LinkingContainerEditpart (configureDisplayModel) -
+2016-12-08 11:51:40.413 INFO [Thread 1] org.csstudio.opibuilder.widgets.editparts.LinkingContainerEditpart (configureDisplayModel) - /CSS/emu-plc-test/1-Home.opi
+2016-12-08 11:51:40.924 WARNING [Thread 34] org.csstudio.swt.widgets.symbol.PNGSymbolImage$1 (handleError) - ERROR in loading PNG image /CSS/emu-plc-test/r.png
+com.google.common.util.concurrent.UncheckedExecutionException: java.lang.Exception: Cannot open /CSS/emu-plc-test/r.png (No such file or directory)
+ at com.google.common.cache.LocalCache$LocalLoadingCache.getUnchecked(LocalCache.java:4832)
+ at org.csstudio.swt.widgets.util.ResourceUtil$2.run(ResourceUtil.java:87)
+ at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
+Caused by: java.lang.Exception: Cannot open /CSS/emu-plc-test/r.png (No such file or directory)
+ at org.csstudio.swt.widgets.util.ResourceUtil.pathToInputStream(ResourceUtil.java:138)
+ at org.csstudio.swt.widgets.util.ResourceUtil$1.load(ResourceUtil.java:53)
+ at org.csstudio.swt.widgets.util.ResourceUtil$1.load(ResourceUtil.java:1)
+ at com.google.common.cache.LocalCache$LoadingValueReference.loadFuture(LocalCache.java:3527)
+ at com.google.common.cache.LocalCache$Segment.loadSync(LocalCache.java:2319)
+ at com.google.common.cache.LocalCache$Segment.lockedGetOrLoad(LocalCache.java:2282)
+ at com.google.common.cache.LocalCache$Segment.get(LocalCache.java:2197)
+ at com.google.common.cache.LocalCache.get(LocalCache.java:3937)
+ at com.google.common.cache.LocalCache.getOrLoad(LocalCache.java:3941)
+ at com.google.common.cache.LocalCache$LocalLoadingCache.get(LocalCache.java:4824)
+ at com.google.common.cache.LocalCache$LocalLoadingCache.getUnchecked(LocalCache.java:4830)
+ ... 2 more
+Caused by: java.io.FileNotFoundException: /CSS/emu-plc-test/r.png (No such file or directory)
+ at java.io.FileInputStream.open0(Native Method)
+ at java.io.FileInputStream.open(FileInputStream.java:195)
+ at java.io.FileInputStream.<init>(FileInputStream.java:138)
+ at org.csstudio.swt.widgets.util.ResourceUtil.pathToInputStream(ResourceUtil.java:125)
+ ... 12 more
+
+2016-12-08 11:52:18.977 WARNING [Thread 28] org.csstudio.swt.widgets.symbol.PNGSymbolImage$1 (handleError) - ERROR in loading PNG image /CSS/emu-plc-test/r.png
+com.google.common.util.concurrent.UncheckedExecutionException: java.lang.Exception: Cannot open /CSS/emu-plc-test/r.png (No such file or directory)
+ at com.google.common.cache.LocalCache$LocalLoadingCache.getUnchecked(LocalCache.java:4832)
+ at org.csstudio.swt.widgets.util.ResourceUtil$2.run(ResourceUtil.java:87)
+ at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
+Caused by: java.lang.Exception: Cannot open /CSS/emu-plc-test/r.png (No such file or directory)
+ at org.csstudio.swt.widgets.util.ResourceUtil.pathToInputStream(ResourceUtil.java:138)
+ at org.csstudio.swt.widgets.util.ResourceUtil$1.load(ResourceUtil.java:53)
+ at org.csstudio.swt.widgets.util.ResourceUtil$1.load(ResourceUtil.java:1)
+ at com.google.common.cache.LocalCache$LoadingValueReference.loadFuture(LocalCache.java:3527)
+ at com.google.common.cache.LocalCache$Segment.loadSync(LocalCache.java:2319)
+ at com.google.common.cache.LocalCache$Segment.lockedGetOrLoad(LocalCache.java:2282)
+ at com.google.common.cache.LocalCache$Segment.get(LocalCache.java:2197)
+ at com.google.common.cache.LocalCache.get(LocalCache.java:3937)
+ at com.google.common.cache.LocalCache.getOrLoad(LocalCache.java:3941)
+ at com.google.common.cache.LocalCache$LocalLoadingCache.get(LocalCache.java:4824)
+ at com.google.common.cache.LocalCache$LocalLoadingCache.getUnchecked(LocalCache.java:4830)
+ ... 2 more
+Caused by: java.io.FileNotFoundException: /CSS/emu-plc-test/r.png (No such file or directory)
+ at java.io.FileInputStream.open0(Native Method)
+ at java.io.FileInputStream.open(FileInputStream.java:195)
+ at java.io.FileInputStream.<init>(FileInputStream.java:138)
+ at org.csstudio.swt.widgets.util.ResourceUtil.pathToInputStream(ResourceUtil.java:125)
+ ... 12 more
+
+2016-12-08 11:52:57.228 WARNING [Thread 28] org.csstudio.swt.widgets.symbol.PNGSymbolImage$1 (handleError) - ERROR in loading PNG image /CSS/emu-plc-test/r.png
+com.google.common.util.concurrent.UncheckedExecutionException: java.lang.Exception: Cannot open /CSS/emu-plc-test/r.png (No such file or directory)
+ at com.google.common.cache.LocalCache$LocalLoadingCache.getUnchecked(LocalCache.java:4832)
+ at org.csstudio.swt.widgets.util.ResourceUtil$2.run(ResourceUtil.java:87)
+ at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
+Caused by: java.lang.Exception: Cannot open /CSS/emu-plc-test/r.png (No such file or directory)
+ at org.csstudio.swt.widgets.util.ResourceUtil.pathToInputStream(ResourceUtil.java:138)
+ at org.csstudio.swt.widgets.util.ResourceUtil$1.load(ResourceUtil.java:53)
+ at org.csstudio.swt.widgets.util.ResourceUtil$1.load(ResourceUtil.java:1)
+ at com.google.common.cache.LocalCache$LoadingValueReference.loadFuture(LocalCache.java:3527)
+ at com.google.common.cache.LocalCache$Segment.loadSync(LocalCache.java:2319)
+ at com.google.common.cache.LocalCache$Segment.lockedGetOrLoad(LocalCache.java:2282)
+ at com.google.common.cache.LocalCache$Segment.get(LocalCache.java:2197)
+ at com.google.common.cache.LocalCache.get(LocalCache.java:3937)
+ at com.google.common.cache.LocalCache.getOrLoad(LocalCache.java:3941)
+ at com.google.common.cache.LocalCache$LocalLoadingCache.get(LocalCache.java:4824)
+ at com.google.common.cache.LocalCache$LocalLoadingCache.getUnchecked(LocalCache.java:4830)
+ ... 2 more
+Caused by: java.io.FileNotFoundException: /CSS/emu-plc-test/r.png (No such file or directory)
+ at java.io.FileInputStream.open0(Native Method)
+ at java.io.FileInputStream.open(FileInputStream.java:195)
+ at java.io.FileInputStream.<init>(FileInputStream.java:138)
+ at org.csstudio.swt.widgets.util.ResourceUtil.pathToInputStream(ResourceUtil.java:125)
+ ... 12 more
+
+2016-12-08 11:54:50.050 WARNING [Thread 61] org.csstudio.swt.widgets.symbol.PNGSymbolImage$1 (handleError) - ERROR in loading PNG image /CSS/emu-plc-test/r.png
+com.google.common.util.concurrent.UncheckedExecutionException: java.lang.Exception: Cannot open /CSS/emu-plc-test/r.png (No such file or directory)
+ at com.google.common.cache.LocalCache$LocalLoadingCache.getUnchecked(LocalCache.java:4832)
+ at org.csstudio.swt.widgets.util.ResourceUtil$2.run(ResourceUtil.java:87)
+ at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
+Caused by: java.lang.Exception: Cannot open /CSS/emu-plc-test/r.png (No such file or directory)
+ at org.csstudio.swt.widgets.util.ResourceUtil.pathToInputStream(ResourceUtil.java:138)
+ at org.csstudio.swt.widgets.util.ResourceUtil$1.load(ResourceUtil.java:53)
+ at org.csstudio.swt.widgets.util.ResourceUtil$1.load(ResourceUtil.java:1)
+ at com.google.common.cache.LocalCache$LoadingValueReference.loadFuture(LocalCache.java:3527)
+ at com.google.common.cache.LocalCache$Segment.loadSync(LocalCache.java:2319)
+ at com.google.common.cache.LocalCache$Segment.lockedGetOrLoad(LocalCache.java:2282)
+ at com.google.common.cache.LocalCache$Segment.get(LocalCache.java:2197)
+ at com.google.common.cache.LocalCache.get(LocalCache.java:3937)
+ at com.google.common.cache.LocalCache.getOrLoad(LocalCache.java:3941)
+ at com.google.common.cache.LocalCache$LocalLoadingCache.get(LocalCache.java:4824)
+ at com.google.common.cache.LocalCache$LocalLoadingCache.getUnchecked(LocalCache.java:4830)
+ ... 2 more
+Caused by: java.io.FileNotFoundException: /CSS/emu-plc-test/r.png (No such file or directory)
+ at java.io.FileInputStream.open0(Native Method)
+ at java.io.FileInputStream.open(FileInputStream.java:195)
+ at java.io.FileInputStream.<init>(FileInputStream.java:138)
+ at org.csstudio.swt.widgets.util.ResourceUtil.pathToInputStream(ResourceUtil.java:125)
+ ... 12 more
+
diff --git a/logs.1 b/logs.1
new file mode 100644
index 0000000..5aa6d76
--- /dev/null
+++ b/logs.1
@@ -0,0 +1,112 @@
+2016-12-08 11:48:11.351 INFO [Thread 17] org.csstudio.security.authentication.UnattendedCallbackHandler (handleText) - OK
+2016-12-08 11:48:12.344 WARNING [Thread 1] org.csstudio.logging.PluginLogListener (logging) - Keybinding conflicts occurred. They may interfere with normal accelerator operation.
+2016-12-08 11:48:16.029 SEVERE [Thread 32] org.csstudio.logging.PluginLogListener (logging) - No repository found at http://download.controlsystemstudio.org/updates/3.0.
+2016-12-08 11:48:22.630 WARNING [Thread 31] org.csstudio.swt.widgets.symbol.PNGSymbolImage$1 (handleError) - ERROR in loading PNG image /CSS/emu-plc-test/r.png
+com.google.common.util.concurrent.UncheckedExecutionException: java.lang.Exception: Cannot open /CSS/emu-plc-test/r.png (No such file or directory)
+ at com.google.common.cache.LocalCache$LocalLoadingCache.getUnchecked(LocalCache.java:4832)
+ at org.csstudio.swt.widgets.util.ResourceUtil$2.run(ResourceUtil.java:87)
+ at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
+Caused by: java.lang.Exception: Cannot open /CSS/emu-plc-test/r.png (No such file or directory)
+ at org.csstudio.swt.widgets.util.ResourceUtil.pathToInputStream(ResourceUtil.java:138)
+ at org.csstudio.swt.widgets.util.ResourceUtil$1.load(ResourceUtil.java:53)
+ at org.csstudio.swt.widgets.util.ResourceUtil$1.load(ResourceUtil.java:1)
+ at com.google.common.cache.LocalCache$LoadingValueReference.loadFuture(LocalCache.java:3527)
+ at com.google.common.cache.LocalCache$Segment.loadSync(LocalCache.java:2319)
+ at com.google.common.cache.LocalCache$Segment.lockedGetOrLoad(LocalCache.java:2282)
+ at com.google.common.cache.LocalCache$Segment.get(LocalCache.java:2197)
+ at com.google.common.cache.LocalCache.get(LocalCache.java:3937)
+ at com.google.common.cache.LocalCache.getOrLoad(LocalCache.java:3941)
+ at com.google.common.cache.LocalCache$LocalLoadingCache.get(LocalCache.java:4824)
+ at com.google.common.cache.LocalCache$LocalLoadingCache.getUnchecked(LocalCache.java:4830)
+ ... 2 more
+Caused by: java.io.FileNotFoundException: /CSS/emu-plc-test/r.png (No such file or directory)
+ at java.io.FileInputStream.open0(Native Method)
+ at java.io.FileInputStream.open(FileInputStream.java:195)
+ at java.io.FileInputStream.<init>(FileInputStream.java:138)
+ at org.csstudio.swt.widgets.util.ResourceUtil.pathToInputStream(ResourceUtil.java:125)
+ ... 12 more
+
+2016-12-08 11:48:24.524 INFO [Thread 1] org.csstudio.opibuilder.widgets.editparts.LinkingContainerEditpart (configureDisplayModel) -
+2016-12-08 11:48:32.448 WARNING [Thread 1] org.csstudio.utility.pvmanager.jdbc.CsstudioJdbcServiceFactory (loadDriver) - Couldn't load driver oracle.jdbc.driver.OracleDriver
+2016-12-08 11:48:33.928 INFO [Thread 1] org.csstudio.opibuilder.widgets.editparts.LinkingContainerEditpart (configureDisplayModel) -
+2016-12-08 11:48:35.752 INFO [Thread 1] org.csstudio.opibuilder.widgets.editparts.LinkingContainerEditpart (configureDisplayModel) - /CSS/emu-plc-test/1-Home.opi
+2016-12-08 11:48:36.262 WARNING [Thread 33] org.csstudio.swt.widgets.symbol.PNGSymbolImage$1 (handleError) - ERROR in loading PNG image /CSS/emu-plc-test/r.png
+com.google.common.util.concurrent.UncheckedExecutionException: java.lang.Exception: Cannot open /CSS/emu-plc-test/r.png (No such file or directory)
+ at com.google.common.cache.LocalCache$LocalLoadingCache.getUnchecked(LocalCache.java:4832)
+ at org.csstudio.swt.widgets.util.ResourceUtil$2.run(ResourceUtil.java:87)
+ at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
+Caused by: java.lang.Exception: Cannot open /CSS/emu-plc-test/r.png (No such file or directory)
+ at org.csstudio.swt.widgets.util.ResourceUtil.pathToInputStream(ResourceUtil.java:138)
+ at org.csstudio.swt.widgets.util.ResourceUtil$1.load(ResourceUtil.java:53)
+ at org.csstudio.swt.widgets.util.ResourceUtil$1.load(ResourceUtil.java:1)
+ at com.google.common.cache.LocalCache$LoadingValueReference.loadFuture(LocalCache.java:3527)
+ at com.google.common.cache.LocalCache$Segment.loadSync(LocalCache.java:2319)
+ at com.google.common.cache.LocalCache$Segment.lockedGetOrLoad(LocalCache.java:2282)
+ at com.google.common.cache.LocalCache$Segment.get(LocalCache.java:2197)
+ at com.google.common.cache.LocalCache.get(LocalCache.java:3937)
+ at com.google.common.cache.LocalCache.getOrLoad(LocalCache.java:3941)
+ at com.google.common.cache.LocalCache$LocalLoadingCache.get(LocalCache.java:4824)
+ at com.google.common.cache.LocalCache$LocalLoadingCache.getUnchecked(LocalCache.java:4830)
+ ... 2 more
+Caused by: java.io.FileNotFoundException: /CSS/emu-plc-test/r.png (No such file or directory)
+ at java.io.FileInputStream.open0(Native Method)
+ at java.io.FileInputStream.open(FileInputStream.java:195)
+ at java.io.FileInputStream.<init>(FileInputStream.java:138)
+ at org.csstudio.swt.widgets.util.ResourceUtil.pathToInputStream(ResourceUtil.java:125)
+ ... 12 more
+
+2016-12-08 11:48:39.387 INFO [Thread 1] org.csstudio.opibuilder.widgets.editparts.LinkingContainerEditpart (configureDisplayModel) - /CSS/emu-plc-test/1-Home.opi
+2016-12-08 11:48:39.898 WARNING [Thread 23] org.csstudio.swt.widgets.symbol.PNGSymbolImage$1 (handleError) - ERROR in loading PNG image /CSS/emu-plc-test/r.png
+com.google.common.util.concurrent.UncheckedExecutionException: java.lang.Exception: Cannot open /CSS/emu-plc-test/r.png (No such file or directory)
+ at com.google.common.cache.LocalCache$LocalLoadingCache.getUnchecked(LocalCache.java:4832)
+ at org.csstudio.swt.widgets.util.ResourceUtil$2.run(ResourceUtil.java:87)
+ at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
+Caused by: java.lang.Exception: Cannot open /CSS/emu-plc-test/r.png (No such file or directory)
+ at org.csstudio.swt.widgets.util.ResourceUtil.pathToInputStream(ResourceUtil.java:138)
+ at org.csstudio.swt.widgets.util.ResourceUtil$1.load(ResourceUtil.java:53)
+ at org.csstudio.swt.widgets.util.ResourceUtil$1.load(ResourceUtil.java:1)
+ at com.google.common.cache.LocalCache$LoadingValueReference.loadFuture(LocalCache.java:3527)
+ at com.google.common.cache.LocalCache$Segment.loadSync(LocalCache.java:2319)
+ at com.google.common.cache.LocalCache$Segment.lockedGetOrLoad(LocalCache.java:2282)
+ at com.google.common.cache.LocalCache$Segment.get(LocalCache.java:2197)
+ at com.google.common.cache.LocalCache.get(LocalCache.java:3937)
+ at com.google.common.cache.LocalCache.getOrLoad(LocalCache.java:3941)
+ at com.google.common.cache.LocalCache$LocalLoadingCache.get(LocalCache.java:4824)
+ at com.google.common.cache.LocalCache$LocalLoadingCache.getUnchecked(LocalCache.java:4830)
+ ... 2 more
+Caused by: java.io.FileNotFoundException: /CSS/emu-plc-test/r.png (No such file or directory)
+ at java.io.FileInputStream.open0(Native Method)
+ at java.io.FileInputStream.open(FileInputStream.java:195)
+ at java.io.FileInputStream.<init>(FileInputStream.java:138)
+ at org.csstudio.swt.widgets.util.ResourceUtil.pathToInputStream(ResourceUtil.java:125)
+ ... 12 more
+
+2016-12-08 11:48:40.388 INFO [Thread 1] org.csstudio.opibuilder.widgets.editparts.LinkingContainerEditpart (configureDisplayModel) - /CSS/emu-plc-test/2-FM1,2,3.opi
+2016-12-08 11:48:41.088 INFO [Thread 1] org.csstudio.opibuilder.widgets.editparts.LinkingContainerEditpart (configureDisplayModel) - /CSS/emu-plc-test/3-FM4,5.opi
+2016-12-08 11:48:42.190 INFO [Thread 1] org.csstudio.opibuilder.widgets.editparts.LinkingContainerEditpart (configureDisplayModel) - /CSS/emu-plc-test/4-Inout_value.opi
+2016-12-08 11:48:43.990 INFO [Thread 1] org.csstudio.opibuilder.widgets.editparts.LinkingContainerEditpart (configureDisplayModel) - /CSS/emu-plc-test/1-Home.opi
+2016-12-08 11:48:44.503 WARNING [Thread 33] org.csstudio.swt.widgets.symbol.PNGSymbolImage$1 (handleError) - ERROR in loading PNG image /CSS/emu-plc-test/r.png
+com.google.common.util.concurrent.UncheckedExecutionException: java.lang.Exception: Cannot open /CSS/emu-plc-test/r.png (No such file or directory)
+ at com.google.common.cache.LocalCache$LocalLoadingCache.getUnchecked(LocalCache.java:4832)
+ at org.csstudio.swt.widgets.util.ResourceUtil$2.run(ResourceUtil.java:87)
+ at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
+Caused by: java.lang.Exception: Cannot open /CSS/emu-plc-test/r.png (No such file or directory)
+ at org.csstudio.swt.widgets.util.ResourceUtil.pathToInputStream(ResourceUtil.java:138)
+ at org.csstudio.swt.widgets.util.ResourceUtil$1.load(ResourceUtil.java:53)
+ at org.csstudio.swt.widgets.util.ResourceUtil$1.load(ResourceUtil.java:1)
+ at com.google.common.cache.LocalCache$LoadingValueReference.loadFuture(LocalCache.java:3527)
+ at com.google.common.cache.LocalCache$Segment.loadSync(LocalCache.java:2319)
+ at com.google.common.cache.LocalCache$Segment.lockedGetOrLoad(LocalCache.java:2282)
+ at com.google.common.cache.LocalCache$Segment.get(LocalCache.java:2197)
+ at com.google.common.cache.LocalCache.get(LocalCache.java:3937)
+ at com.google.common.cache.LocalCache.getOrLoad(LocalCache.java:3941)
+ at com.google.common.cache.LocalCache$LocalLoadingCache.get(LocalCache.java:4824)
+ at com.google.common.cache.LocalCache$LocalLoadingCache.getUnchecked(LocalCache.java:4830)
+ ... 2 more
+Caused by: java.io.FileNotFoundException: /CSS/emu-plc-test/r.png (No such file or directory)
+ at java.io.FileInputStream.open0(Native Method)
+ at java.io.FileInputStream.open(FileInputStream.java:195)
+ at java.io.FileInputStream.<init>(FileInputStream.java:138)
+ at org.csstudio.swt.widgets.util.ResourceUtil.pathToInputStream(ResourceUtil.java:125)
+ ... 12 more
+
diff --git a/opi/EMU.opi b/opi/EMU.opi
index fc72db6..a795ffe 100644
--- a/opi/EMU.opi
+++ b/opi/EMU.opi
@@ -13,7 +13,7 @@
<DEVICE_FC>PBI-EM-FC</DEVICE_FC>
<PREFIX_SIG>DACQ</PREFIX_SIG>
<PREFIX_MTR>PMAC</PREFIX_MTR>
- <NAME_MTR>MTR</NAME_MTR>
+ <NAME_MTR>MTR1</NAME_MTR>
<NAME_PS>PS</NAME_PS>
<PREFIX_PS>LNS-ISRC-010:PBI-EM:HV</PREFIX_PS>
<PREFIX_SCAN>SCAN</PREFIX_SCAN>
@@ -139,7 +139,7 @@
<macros>
<include_parent_macros>true</include_parent_macros>
</macros>
- <visible>false</visible>
+ <visible>true</visible>
<border_color>
<color red="0" green="128" blue="255" />
</border_color>
@@ -224,7 +224,6 @@ $(pv_value)</tooltip>
<active_tab>0</active_tab>
<tooltip></tooltip>
<tab_3_icon_path></tab_3_icon_path>
- <tab_4_enabled>true</tab_4_enabled>
<height>295</height>
<tab_2_icon_path></tab_2_icon_path>
<border_width>1</border_width>
@@ -237,7 +236,6 @@ $(pv_value)</tooltip>
<actions hook="false" hook_all="false" />
<tab_1_enabled>true</tab_1_enabled>
<border_style>0</border_style>
- <tab_4_title>BPS</tab_4_title>
<enabled>true</enabled>
<wuid>-1ab698cd:1586d27a42e:-6643</wuid>
<tab_1_background_color>
@@ -250,11 +248,7 @@ $(pv_value)</tooltip>
<tab_1_font>
<opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
</tab_1_font>
- <tab_3_title>Timing</tab_3_title>
- <tab_4_background_color>
- <color name="Field Background Grey" red="240" green="240" blue="240" />
- </tab_4_background_color>
- <tab_4_icon_path></tab_4_icon_path>
+ <tab_3_title>BPS</tab_3_title>
<tab_2_enabled>true</tab_2_enabled>
<background_color>
<color name="Container Grey" red="200" green="200" blue="200" />
@@ -267,9 +261,6 @@ $(pv_value)</tooltip>
<tab_3_font>
<opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
</tab_3_font>
- <tab_4_font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
- </tab_4_font>
<macros>
<include_parent_macros>true</include_parent_macros>
</macros>
@@ -303,7 +294,7 @@ $(pv_value)</tooltip>
</tab_1_foreground_color>
<tab_1_title>Dimension</tab_1_title>
<scripts />
- <tab_count>5</tab_count>
+ <tab_count>4</tab_count>
<scale_options>
<width_scalable>true</width_scalable>
<height_scalable>true</height_scalable>
@@ -314,9 +305,6 @@ $(pv_value)</tooltip>
<foreground_color>
<color name="Container Grey" red="200" green="200" blue="200" />
</foreground_color>
- <tab_4_foreground_color>
- <color red="0" green="0" blue="0" />
- </tab_4_foreground_color>
<widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0.0">
<border_style>0</border_style>
<tooltip></tooltip>
@@ -336,7 +324,7 @@ $(pv_value)</tooltip>
<macros>
<include_parent_macros>true</include_parent_macros>
</macros>
- <visible>true</visible>
+ <visible>false</visible>
<border_color>
<color red="0" green="128" blue="255" />
</border_color>
@@ -1997,435 +1985,6 @@ $(pv_value)</tooltip>
</font>
</widget>
</widget>
- <widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0.0">
- <border_style>0</border_style>
- <tooltip></tooltip>
- <rules />
- <enabled>true</enabled>
- <wuid>-1ab698cd:1586d27a42e:-5cdf</wuid>
- <transparent>true</transparent>
- <lock_children>false</lock_children>
- <scripts />
- <height>263</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>324</width>
- <x>1</x>
- <name>Timing</name>
- <y>1</y>
- <foreground_color>
- <color red="192" green="192" blue="192" />
- </foreground_color>
- <actions hook="false" hook_all="false" />
- <fc>false</fc>
- <show_scrollbar>true</show_scrollbar>
- <font>
- <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
- </font>
- <widget typeId="org.csstudio.opibuilder.widgets.Rectangle" version="1.0.0">
- <border_style>0</border_style>
- <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
- <line_width>0</line_width>
- <horizontal_fill>true</horizontal_fill>
- <alarm_pulsing>false</alarm_pulsing>
- <tooltip>$(pv_name)
-$(pv_value)</tooltip>
- <rules />
- <enabled>true</enabled>
- <wuid>-6047e935:1589bd389ef:-7d2a</wuid>
- <transparent>false</transparent>
- <pv_value />
- <alpha>255</alpha>
- <bg_gradient_color>
- <color red="255" green="255" blue="255" />
- </bg_gradient_color>
- <scripts />
- <border_alarm_sensitive>false</border_alarm_sensitive>
- <height>145</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>
- <visible>true</visible>
- <pv_name></pv_name>
- <gradient>false</gradient>
- <border_color>
- <color red="0" green="128" blue="255" />
- </border_color>
- <anti_alias>true</anti_alias>
- <line_style>0</line_style>
- <widget_type>Rectangle</widget_type>
- <fg_gradient_color>
- <color red="255" green="255" blue="255" />
- </fg_gradient_color>
- <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
- <background_color>
- <color red="30" green="144" blue="255" />
- </background_color>
- <width>300</width>
- <x>12</x>
- <name>Rectangle</name>
- <y>36</y>
- <fill_level>0.0</fill_level>
- <foreground_color>
- <color red="255" green="0" blue="0" />
- </foreground_color>
- <actions hook="false" hook_all="false" />
- <font>
- <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
- </font>
- <line_color>
- <color red="128" green="0" blue="255" />
- </line_color>
- </widget>
- <widget typeId="org.csstudio.opibuilder.widgets.BoolButton" version="1.0.0">
- <toggle_button>true</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 />
- <effect_3d>true</effect_3d>
- <bit>-1</bit>
- <enabled>true</enabled>
- <wuid>-1ab698cd:1586d27a42e:-5c63</wuid>
- <on_color>
- <color red="0" green="255" blue="0" />
- </on_color>
- <show_confirm_dialog>0</show_confirm_dialog>
- <password></password>
- <pv_value />
- <released_action_index>1</released_action_index>
- <square_button>true</square_button>
- <show_led>true</show_led>
- <scripts />
- <border_alarm_sensitive>true</border_alarm_sensitive>
- <height>38</height>
- <on_label>ON</on_label>
- <border_width>1</border_width>
- <scale_options>
- <width_scalable>true</width_scalable>
- <height_scalable>true</height_scalable>
- <keep_wh_ratio>true</keep_wh_ratio>
- </scale_options>
- <visible>true</visible>
- <pv_name>SYS0-EVR0:FrontOut1-Ena-SP</pv_name>
- <border_color>
- <color red="0" green="128" blue="255" />
- </border_color>
- <widget_type>Boolean Button</widget_type>
- <off_color>
- <color red="0" green="100" blue="0" />
- </off_color>
- <confirm_message>Are your sure you want to do this?</confirm_message>
- <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
- <background_color>
- <color name="Button Grey" red="180" green="180" blue="180" />
- </background_color>
- <width>100</width>
- <x>191</x>
- <name>Boolean Button</name>
- <data_type>0</data_type>
- <y>132</y>
- <foreground_color>
- <color red="0" green="0" blue="0" />
- </foreground_color>
- <actions hook="false" hook_all="false">
- <action type="WRITE_PV">
- <pv_name>$(pv_name)</pv_name>
- <value>1</value>
- <timeout>10</timeout>
- <confirm_message></confirm_message>
- <description></description>
- </action>
- <action type="WRITE_PV">
- <pv_name>$(pv_name)</pv_name>
- <value>0</value>
- <timeout>10</timeout>
- <confirm_message></confirm_message>
- <description></description>
- </action>
- </actions>
- <show_boolean_label>true</show_boolean_label>
- <font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
- </font>
- <off_label>OFF</off_label>
- </widget>
- <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
- <border_style>0</border_style>
- <tooltip></tooltip>
- <horizontal_alignment>1</horizontal_alignment>
- <rules />
- <enabled>false</enabled>
- <wuid>-6047e935:1589bd389ef:-7d7a</wuid>
- <transparent>true</transparent>
- <auto_size>false</auto_size>
- <text>Width pulse</text>
- <scripts />
- <height>20</height>
- <border_width>2</border_width>
- <scale_options>
- <width_scalable>true</width_scalable>
- <height_scalable>true</height_scalable>
- <keep_wh_ratio>false</keep_wh_ratio>
- </scale_options>
- <visible>true</visible>
- <vertical_alignment>1</vertical_alignment>
- <border_color>
- <color name="IO Border" red="215" green="215" blue="215" />
- </border_color>
- <widget_type>Label</widget_type>
- <wrap_words>false</wrap_words>
- <background_color>
- <color name="IO Background" red="255" green="255" blue="205" />
- </background_color>
- <width>163</width>
- <x>6</x>
- <name>Label Orientation_2</name>
- <y>96</y>
- <foreground_color>
- <color name="IO Foreground" red="0" green="0" blue="0" />
- </foreground_color>
- <actions hook="false" hook_all="false" />
- <font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
- </font>
- </widget>
- <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
- <alarm_pulsing>false</alarm_pulsing>
- <precision>0</precision>
- <tooltip>$(pv_name)
-$(pv_value)</tooltip>
- <horizontal_alignment>1</horizontal_alignment>
- <rules>
- <rule name="Disable" prop_id="enabled" out_exp="false">
- <exp bool_exp="pv0==1">
- <value>false</value>
- </exp>
- <exp bool_exp="pv0==0">
- <value>true</value>
- </exp>
- <pv trig="true">${PREFIX_SCAN}:$(NAME_MTR).BUSY</pv>
- </rule>
- </rules>
- <pv_value />
- <auto_size>false</auto_size>
- <text></text>
- <rotation_angle>0.0</rotation_angle>
- <show_units>true</show_units>
- <height>31</height>
- <multiline_input>false</multiline_input>
- <border_width>1</border_width>
- <visible>true</visible>
- <pv_name>SYS0-EVR0:Pul1-Width-SP</pv_name>
- <selector_type>0</selector_type>
- <border_color>
- <color red="0" green="128" blue="255" />
- </border_color>
- <precision_from_pv>false</precision_from_pv>
- <widget_type>Text Input</widget_type>
- <confirm_message></confirm_message>
- <name>Text Input_2</name>
- <style>0</style>
- <actions hook="false" hook_all="false" />
- <border_style>3</border_style>
- <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
- <enabled>true</enabled>
- <wuid>-6047e935:1589bd389ef:-7d79</wuid>
- <transparent>false</transparent>
- <scripts />
- <border_alarm_sensitive>false</border_alarm_sensitive>
- <scale_options>
- <width_scalable>true</width_scalable>
- <height_scalable>true</height_scalable>
- <keep_wh_ratio>false</keep_wh_ratio>
- </scale_options>
- <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
- <format_type>0</format_type>
- <limits_from_pv>false</limits_from_pv>
- <background_color>
- <color name="TextBackground" red="70" green="70" blue="70" />
- </background_color>
- <width>123</width>
- <x>168</x>
- <y>90</y>
- <maximum>1.7976931348623157E308</maximum>
- <foreground_color>
- <color name="KeyboardEntry" red="0" green="255" blue="255" />
- </foreground_color>
- <minimum>-1.7976931348623157E308</minimum>
- <font>
- <fontdata fontName="Sans" height="10" style="1" />
- </font>
- </widget>
- <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
- <border_style>0</border_style>
- <tooltip></tooltip>
- <horizontal_alignment>1</horizontal_alignment>
- <rules />
- <enabled>true</enabled>
- <wuid>-6047e935:1589bd389ef:-7d0d</wuid>
- <transparent>true</transparent>
- <auto_size>false</auto_size>
- <text>MAGNETRON</text>
- <scripts />
- <height>20</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>
- <visible>true</visible>
- <vertical_alignment>1</vertical_alignment>
- <border_color>
- <color red="0" green="128" blue="255" />
- </border_color>
- <widget_type>Label</widget_type>
- <wrap_words>false</wrap_words>
- <background_color>
- <color red="255" green="255" blue="255" />
- </background_color>
- <width>95</width>
- <x>114</x>
- <name>Label</name>
- <y>12</y>
- <foreground_color>
- <color red="0" green="0" blue="0" />
- </foreground_color>
- <actions hook="false" hook_all="false" />
- <font>
- <opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
- </font>
- </widget>
- <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
- <border_style>0</border_style>
- <tooltip></tooltip>
- <horizontal_alignment>1</horizontal_alignment>
- <rules />
- <enabled>false</enabled>
- <wuid>-6047e935:1589bd389ef:-7c5c</wuid>
- <transparent>true</transparent>
- <auto_size>false</auto_size>
- <text>Frequency</text>
- <scripts />
- <height>20</height>
- <border_width>2</border_width>
- <scale_options>
- <width_scalable>true</width_scalable>
- <height_scalable>true</height_scalable>
- <keep_wh_ratio>false</keep_wh_ratio>
- </scale_options>
- <visible>true</visible>
- <vertical_alignment>1</vertical_alignment>
- <border_color>
- <color name="IO Border" red="215" green="215" blue="215" />
- </border_color>
- <widget_type>Label</widget_type>
- <wrap_words>false</wrap_words>
- <background_color>
- <color name="IO Background" red="255" green="255" blue="205" />
- </background_color>
- <width>116</width>
- <x>30</x>
- <name>Label Orientation_2</name>
- <y>54</y>
- <foreground_color>
- <color name="IO Foreground" red="0" green="0" blue="0" />
- </foreground_color>
- <actions hook="false" hook_all="false" />
- <font>
- <opifont.name fontName="OpenSans" height="10" style="1">Small Bold</opifont.name>
- </font>
- </widget>
- <widget typeId="org.csstudio.opibuilder.widgets.TextInput" version="2.0.0">
- <alarm_pulsing>false</alarm_pulsing>
- <precision>0</precision>
- <tooltip>$(pv_name)
-$(pv_value)</tooltip>
- <horizontal_alignment>1</horizontal_alignment>
- <rules>
- <rule name="Disable" prop_id="enabled" out_exp="false">
- <exp bool_exp="pv0==1">
- <value>false</value>
- </exp>
- <exp bool_exp="pv0==0">
- <value>true</value>
- </exp>
- <pv trig="true">${PREFIX_SCAN}:$(NAME_MTR).BUSY</pv>
- </rule>
- </rules>
- <pv_value />
- <auto_size>false</auto_size>
- <text></text>
- <rotation_angle>0.0</rotation_angle>
- <show_units>true</show_units>
- <height>31</height>
- <multiline_input>false</multiline_input>
- <border_width>1</border_width>
- <visible>true</visible>
- <pv_name>SYS0-EVG0:Mxc1-Frequency-SP</pv_name>
- <selector_type>0</selector_type>
- <border_color>
- <color red="0" green="128" blue="255" />
- </border_color>
- <precision_from_pv>true</precision_from_pv>
- <widget_type>Text Input</widget_type>
- <confirm_message></confirm_message>
- <name>Text Input_2</name>
- <style>0</style>
- <actions hook="false" hook_all="false" />
- <border_style>3</border_style>
- <forecolor_alarm_sensitive>false</forecolor_alarm_sensitive>
- <enabled>true</enabled>
- <wuid>-6047e935:1589bd389ef:-7c5b</wuid>
- <transparent>false</transparent>
- <scripts />
- <border_alarm_sensitive>false</border_alarm_sensitive>
- <scale_options>
- <width_scalable>true</width_scalable>
- <height_scalable>true</height_scalable>
- <keep_wh_ratio>false</keep_wh_ratio>
- </scale_options>
- <backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
- <format_type>0</format_type>
- <limits_from_pv>false</limits_from_pv>
- <background_color>
- <color name="TextBackground" red="70" green="70" blue="70" />
- </background_color>
- <width>123</width>
- <x>168</x>
- <y>48</y>
- <maximum>1.7976931348623157E308</maximum>
- <foreground_color>
- <color name="KeyboardEntry" red="0" green="255" blue="255" />
- </foreground_color>
- <minimum>-1.7976931348623157E308</minimum>
- <font>
- <fontdata fontName="Sans" height="10" style="1" />
- </font>
- </widget>
- </widget>
<widget typeId="org.csstudio.opibuilder.widgets.groupingContainer" version="1.0.0">
<border_style>0</border_style>
<tooltip></tooltip>
@@ -2445,7 +2004,7 @@ $(pv_value)</tooltip>
<macros>
<include_parent_macros>true</include_parent_macros>
</macros>
- <visible>false</visible>
+ <visible>true</visible>
<border_color>
<color red="0" green="128" blue="255" />
</border_color>
@@ -2953,7 +2512,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>SCAN:CALC-PROJ-X</pv_name>
+ <pv_name>$(PREFIX_SCAN):$(CALC)-PROJ-X</pv_name>
<vertical_alignment>1</vertical_alignment>
<border_color>
<color red="0" green="128" blue="255" />
@@ -6264,7 +5823,7 @@ $(pv_value)</tooltip>
<multiline_input>false</multiline_input>
<border_width>1</border_width>
<visible>true</visible>
- <pv_name>PMAC:MTR1.RBV</pv_name>
+ <pv_name>$(PREFIX_MTR):$(NAME_MTR).RBV</pv_name>
<selector_type>0</selector_type>
<border_color>
<color red="0" green="128" blue="255" />
@@ -6370,7 +5929,7 @@ $(trace_0_y_pv_value)</tooltip>
</axis_0_grid_color>
<trace_0_name>$(trace_0_y_pv)</trace_0_name>
<trace_0_update_mode>0</trace_0_update_mode>
- <trace_1_x_pv>SCAN:CALC-PROJ-Xabsc</trace_1_x_pv>
+ <trace_1_x_pv>$(PREFIX_SCAN):$(CALC)-PROJ-Xabsc</trace_1_x_pv>
<wuid>-1168daa3:158859bc9c3:6e0</wuid>
<transparent>false</transparent>
<trace_1_update_mode>0</trace_1_update_mode>
@@ -6425,7 +5984,7 @@ $(trace_0_y_pv_value)</tooltip>
<height_scalable>true</height_scalable>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
- <trace_1_y_pv>SCAN:CALC-PROJ-Xwf</trace_1_y_pv>
+ <trace_1_y_pv>$(PREFIX_SCAN):$(CALC)-PROJ-Xwf</trace_1_y_pv>
<backcolor_alarm_sensitive>false</backcolor_alarm_sensitive>
<axis_0_maximum>100.0</axis_0_maximum>
<trace_1_y_axis_index>1</trace_1_y_axis_index>
@@ -6445,7 +6004,7 @@ $(trace_0_y_pv_value)</tooltip>
<trace_1_trace_color>
<color red="242" green="26" blue="26" />
</trace_1_trace_color>
- <pv_name>SCAN:CALC-PROJ-Xwf</pv_name>
+ <pv_name>$(PREFIX_SCAN):$(CALC)-PROJ-Xwf</pv_name>
<name>XY Graph</name>
<trace_1_trace_type>0</trace_1_trace_type>
<axis_0_auto_scale>true</axis_0_auto_scale>
@@ -6458,10 +6017,10 @@ $(trace_0_y_pv_value)</tooltip>
<border_color>
<color red="0" green="128" blue="255" />
</border_color>
- <trace_0_y_pv>SCAN:CALC-PROJ-Xwf</trace_0_y_pv>
+ <trace_0_y_pv>$(PREFIX_SCAN):$(CALC)-PROJ-Xwf</trace_0_y_pv>
<trace_0_plot_mode>0</trace_0_plot_mode>
<enabled>true</enabled>
- <trace_0_x_pv>SCAN:CALC-PROJ-Xabsc</trace_0_x_pv>
+ <trace_0_x_pv>$(PREFIX_SCAN):$(CALC)-PROJ-Xabsc</trace_0_x_pv>
<axis_1_scale_font>
<opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
</axis_1_scale_font>
@@ -6572,7 +6131,7 @@ $(trace_0_y_pv_value)</tooltip>
<rules />
<axis_1_visible>true</axis_1_visible>
<trace_0_update_delay>10</trace_0_update_delay>
- <pv_name>SCAN:CALC-PROJ-Xwf</pv_name>
+ <pv_name>$(PREFIX_SCAN):$(CALC)-PROJ-Xwf</pv_name>
<name>XY Graph</name>
<axis_0_auto_scale>true</axis_0_auto_scale>
<axis_0_minimum>-100.0</axis_0_minimum>
@@ -6581,10 +6140,10 @@ $(trace_0_y_pv_value)</tooltip>
<border_color>
<color red="0" green="128" blue="255" />
</border_color>
- <trace_0_y_pv>SCAN:CALC-PROJ-Yabsc</trace_0_y_pv>
+ <trace_0_y_pv>$(PREFIX_SCAN):$(CALC)-PROJ-Yabsc</trace_0_y_pv>
<trace_0_plot_mode>0</trace_0_plot_mode>
<enabled>true</enabled>
- <trace_0_x_pv>SCAN:CALC-PROJ-Ywf</trace_0_x_pv>
+ <trace_0_x_pv>$(PREFIX_SCAN):$(CALC)-PROJ-Ywf</trace_0_x_pv>
<axis_1_scale_font>
<opifont.name fontName="Cantarell" height="11" style="0">Default</opifont.name>
</axis_1_scale_font>
@@ -6763,7 +6322,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>SCAN:CALC-PROJ-Y</pv_name>
+ <pv_name>${PREFIX_SCAN}:$(CALC)-PROJ-Y</pv_name>
<vertical_alignment>1</vertical_alignment>
<border_color>
<color red="0" green="128" blue="255" />
@@ -6855,7 +6414,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>SCAN:PROC-VoltMax</pv_name>
+ <pv_name>${PREFIX_SCAN}:$(PROC)-VoltMax</pv_name>
<vertical_alignment>1</vertical_alignment>
<border_color>
<color red="0" green="128" blue="255" />
@@ -6907,7 +6466,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>SCAN:PROC-VoltMin</pv_name>
+ <pv_name>${PREFIX_SCAN}:$(PROC)-VoltMin</pv_name>
<vertical_alignment>1</vertical_alignment>
<border_color>
<color red="0" green="128" blue="255" />
@@ -6999,7 +6558,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>SCAN:CALC-RMS-SIZE</pv_name>
+ <pv_name>${PREFIX_SCAN}:$(CALC)-RMS-SIZE</pv_name>
<vertical_alignment>1</vertical_alignment>
<border_color>
<color red="0" green="128" blue="255" />
@@ -7131,7 +6690,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>SCAN:CALC-RMS-ANGLE</pv_name>
+ <pv_name>${PREFIX_SCAN}:$(CALC)-RMS-ANGLE</pv_name>
<vertical_alignment>1</vertical_alignment>
<border_color>
<color red="0" green="128" blue="255" />
@@ -7223,7 +6782,7 @@ $(pv_value)</tooltip>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<visible>true</visible>
- <pv_name>SCAN:CALC-SIGMA</pv_name>
+ <pv_name>${PREFIX_SCAN}:$(CALC)-SIGMA</pv_name>
<vertical_alignment>1</vertical_alignment>
<border_color>
<color red="0" green="128" blue="255" />
@@ -7944,9 +7503,9 @@ $(pv_value)</tooltip>
<color name="Button Grey" red="180" green="180" blue="180" />
</background_color>
<width>166</width>
- <x>2235</x>
+ <x>2220</x>
<name>Action Button</name>
- <y>1024</y>
+ <y>1028</y>
<style>0</style>
<foreground_color>
<color red="0" green="0" blue="0" />
@@ -10138,7 +9697,7 @@ $(trace_0_y_pv_value)</tooltip>
<macros>
<include_parent_macros>true</include_parent_macros>
</macros>
- <visible>true</visible>
+ <visible>false</visible>
<border_color>
<color red="0" green="128" blue="255" />
</border_color>
--
GitLab