From 257a64f0b7ba7ae6a7aca1f5ca7e906f2a920233 Mon Sep 17 00:00:00 2001
From: Hinko Kocevar <hinko.kocevar@ess.eu>
Date: Thu, 7 May 2020 11:50:51 +0200
Subject: [PATCH] BCM cleanup (PBITECH-209)
---
10-Top/bcmioc/instance.bob | 52 ++--
10-Top/bcmioc/top.bob | 6 +-
10-Top/bpmioc/instance.bob | 60 ++---
10-Top/bpmioc/top.bob | 3 +-
99-Shared/adsis8300bcm/acct.bob | 4 +-
99-Shared/adsis8300bcm/bcm.bob | 31 +--
99-Shared/adsis8300bcm/bcm_instance.bob | 52 +++-
99-Shared/adsis8300bcm/diff_item.bob | 32 ++-
99-Shared/adsis8300bcm/diff_plot.bob | 66 ++---
99-Shared/adsis8300bcm/lut_dest_acct_item.bob | 10 +-
99-Shared/adsis8300bcm/lut_dest_item.bob | 7 +-
99-Shared/adsis8300bcm/lut_mode_acct_item.bob | 16 +-
99-Shared/adsis8300bcm/lut_mode_item.bob | 7 +-
99-Shared/adsis8300bcm/processed.bob | 228 +++++++-----------
99-Shared/adsis8300bcm/raw.bob | 32 +--
99-Shared/adsis8300bcm/trace_item.bob | 24 +-
16 files changed, 290 insertions(+), 340 deletions(-)
diff --git a/10-Top/bcmioc/instance.bob b/10-Top/bcmioc/instance.bob
index 8bd9216..90e98d4 100644
--- a/10-Top/bcmioc/instance.bob
+++ b/10-Top/bcmioc/instance.bob
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
+ <width>300</width>
+ <height>261</height>
<background_color>
<color red="240" green="240" blue="240">
</color>
@@ -9,12 +11,10 @@
<widget type="label" version="2.0.0">
<name>Label</name>
<text>$(CONTROL_GROUP):$(AMC_NAME)</text>
- <x>229</x>
- <y>63</y>
- <width>295</width>
+ <width>300</width>
<height>261</height>
<font>
- <font name="Header 3" family="Source Sans Pro" style="BOLD_ITALIC" size="18.0">
+ <font name="Header 3" family="Liberation Sans" style="BOLD" size="16.0">
</font>
</font>
<horizontal_alignment>1</horizontal_alignment>
@@ -40,8 +40,8 @@
</action>
</actions>
<text>$(CONTROL_GROUP):$(AMC_NAME)</text>
- <x>283</x>
- <y>90</y>
+ <x>50</x>
+ <y>30</y>
<width>187</width>
<height>20</height>
<foreground_color>
@@ -68,8 +68,8 @@
</action>
</actions>
<text>$(SYSTEM1)</text>
- <x>283</x>
- <y>114</y>
+ <x>50</x>
+ <y>54</y>
<width>187</width>
<height>20</height>
<foreground_color>
@@ -96,8 +96,8 @@
</action>
</actions>
<text>$(SYSTEM2)</text>
- <x>283</x>
- <y>134</y>
+ <x>50</x>
+ <y>74</y>
<width>187</width>
<height>20</height>
<foreground_color>
@@ -124,8 +124,8 @@
</action>
</actions>
<text>$(SYSTEM3)</text>
- <x>283</x>
- <y>153</y>
+ <x>50</x>
+ <y>93</y>
<width>187</width>
<height>20</height>
<foreground_color>
@@ -152,8 +152,8 @@
</action>
</actions>
<text>$(SYSTEM4)</text>
- <x>283</x>
- <y>172</y>
+ <x>50</x>
+ <y>112</y>
<width>187</width>
<height>20</height>
<foreground_color>
@@ -180,8 +180,8 @@
</action>
</actions>
<text>$(SYSTEM5)</text>
- <x>283</x>
- <y>191</y>
+ <x>50</x>
+ <y>131</y>
<width>187</width>
<height>20</height>
<foreground_color>
@@ -208,8 +208,8 @@
</action>
</actions>
<text>$(SYSTEM6)</text>
- <x>283</x>
- <y>210</y>
+ <x>50</x>
+ <y>150</y>
<width>187</width>
<height>20</height>
<foreground_color>
@@ -236,8 +236,8 @@
</action>
</actions>
<text>$(SYSTEM7)</text>
- <x>283</x>
- <y>229</y>
+ <x>50</x>
+ <y>169</y>
<width>187</width>
<height>20</height>
<foreground_color>
@@ -264,8 +264,8 @@
</action>
</actions>
<text>$(SYSTEM8)</text>
- <x>283</x>
- <y>248</y>
+ <x>50</x>
+ <y>188</y>
<width>187</width>
<height>20</height>
<foreground_color>
@@ -292,8 +292,8 @@
</action>
</actions>
<text>$(SYSTEM9)</text>
- <x>283</x>
- <y>267</y>
+ <x>50</x>
+ <y>207</y>
<width>187</width>
<height>20</height>
<foreground_color>
@@ -320,8 +320,8 @@
</action>
</actions>
<text>$(SYSTEM10)</text>
- <x>283</x>
- <y>286</y>
+ <x>50</x>
+ <y>226</y>
<width>187</width>
<height>20</height>
<foreground_color>
diff --git a/10-Top/bcmioc/top.bob b/10-Top/bcmioc/top.bob
index c7e90d1..9dd0496 100644
--- a/10-Top/bcmioc/top.bob
+++ b/10-Top/bcmioc/top.bob
@@ -13,7 +13,6 @@
</actions>
<widget type="embedded" version="2.0.0">
<name>Linking Container</name>
- <file>instance.opi</file>
<macros>
<AMC_NAME>Ctrl-AMC-005</AMC_NAME>
<CONTROL_GROUP>LAB-BCM08</CONTROL_GROUP>
@@ -28,10 +27,11 @@
<SYSTEM8>LAB-008:PBI-BCM-008</SYSTEM8>
<SYSTEM9>LAB-008:PBI-BCM-009</SYSTEM9>
</macros>
+ <file>instance.opi</file>
<x>12</x>
<y>78</y>
- <width>560</width>
- <height>44</height>
+ <width>295</width>
+ <height>261</height>
<resize>2</resize>
<actions>
</actions>
diff --git a/10-Top/bpmioc/instance.bob b/10-Top/bpmioc/instance.bob
index 89fd4f6..15a7a5e 100644
--- a/10-Top/bpmioc/instance.bob
+++ b/10-Top/bpmioc/instance.bob
@@ -1,13 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
- <width>350</width>
- <height>88</height>
+ <width>300</width>
+ <height>100</height>
<background_color>
<color red="240" green="240" blue="240">
</color>
</background_color>
<actions>
</actions>
+ <widget type="label" version="2.0.0">
+ <name>Label_1</name>
+ <text>$(CONTROL_GROUP):$(AMC_NAME)</text>
+ <width>300</width>
+ <height>100</height>
+ <font>
+ <font name="Header 3" family="Liberation Sans" style="BOLD" size="16.0">
+ </font>
+ </font>
+ <horizontal_alignment>1</horizontal_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ <border_width>1</border_width>
+ <border_color>
+ <color name="IO Area Background" red="221" green="223" blue="229">
+ </color>
+ </border_color>
+ </widget>
<widget type="action_button" version="3.0.0">
<name>Menu Button_3</name>
<actions>
@@ -21,9 +40,9 @@
</action>
</actions>
<text>$(CONTROL_GROUP):$(AMC_NAME)</text>
- <x>40</x>
- <y>23</y>
- <width>270</width>
+ <x>60</x>
+ <y>30</y>
+ <width>187</width>
<height>20</height>
<foreground_color>
<color name="IO TextButton" red="0" green="0" blue="0">
@@ -35,25 +54,6 @@
</background_color>
<tooltip>$(actions)</tooltip>
</widget>
- <widget type="label" version="2.0.0">
- <name>Label_1</name>
- <text>$(CONTROL_GROUP):$(AMC_NAME)</text>
- <width>350</width>
- <height>23</height>
- <font>
- <font name="Header 3" family="Liberation Sans" style="BOLD" size="16.0">
- </font>
- </font>
- <horizontal_alignment>1</horizontal_alignment>
- <wrap_words>false</wrap_words>
- <actions>
- </actions>
- <border_width>1</border_width>
- <border_color>
- <color name="IO Area Background" red="221" green="223" blue="229">
- </color>
- </border_color>
- </widget>
<widget type="action_button" version="3.0.0">
<name>Menu Button_1</name>
<actions>
@@ -68,9 +68,9 @@
</action>
</actions>
<text>$(SYSTEM1)</text>
- <x>40</x>
- <y>48</y>
- <width>270</width>
+ <x>60</x>
+ <y>55</y>
+ <width>187</width>
<height>20</height>
<foreground_color>
<color name="IO TextButton" red="0" green="0" blue="0">
@@ -95,9 +95,9 @@
</action>
</actions>
<text>$(SYSTEM2)</text>
- <x>40</x>
- <y>68</y>
- <width>270</width>
+ <x>60</x>
+ <y>75</y>
+ <width>187</width>
<height>20</height>
<foreground_color>
<color name="IO TextButton" red="0" green="0" blue="0">
diff --git a/10-Top/bpmioc/top.bob b/10-Top/bpmioc/top.bob
index d60b6f5..5a4ce6c 100644
--- a/10-Top/bpmioc/top.bob
+++ b/10-Top/bpmioc/top.bob
@@ -4,7 +4,8 @@
<macros>
<TITLE>BPM IOCs</TITLE>
</macros>
- <width>600</width>
+ <width>595</width>
+ <height>183</height>
<background_color>
<color red="240" green="240" blue="240">
</color>
diff --git a/99-Shared/adsis8300bcm/acct.bob b/99-Shared/adsis8300bcm/acct.bob
index 440aec2..e0b4cc9 100644
--- a/99-Shared/adsis8300bcm/acct.bob
+++ b/99-Shared/adsis8300bcm/acct.bob
@@ -2825,7 +2825,7 @@
<target>tab</target>
</action>
</actions>
- <text>Mode LUT</text>
+ <text>More..</text>
<x>367</x>
<y>525</y>
<width>112</width>
@@ -2844,7 +2844,7 @@
<target>tab</target>
</action>
</actions>
- <text>Destination LUT</text>
+ <text>More..</text>
<x>367</x>
<y>544</y>
<width>112</width>
diff --git a/99-Shared/adsis8300bcm/bcm.bob b/99-Shared/adsis8300bcm/bcm.bob
index 7dd0633..7e4a075 100644
--- a/99-Shared/adsis8300bcm/bcm.bob
+++ b/99-Shared/adsis8300bcm/bcm.bob
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<name>$(P) control group</name>
- <height>1050</height>
+ <width>798</width>
+ <height>1030</height>
<background_color>
<color red="240" green="240" blue="240">
</color>
@@ -226,7 +227,6 @@
<y>84</y>
<width>113</width>
<format>0</format>
- <precision>3</precision>
<background_color>
<color red="255" green="255" blue="255">
</color>
@@ -768,7 +768,6 @@ $(pv_value)</tooltip>
<y>107</y>
<width>113</width>
<format>0</format>
- <precision>3</precision>
<background_color>
<color red="255" green="255" blue="255">
</color>
@@ -2154,22 +2153,6 @@ $(pv_value)</tooltip>
</color>
</border_color>
</widget>
- <widget type="label" version="2.0.0">
- <name>Label_347</name>
- <text>Main clock missing</text>
- <x>25</x>
- <y>383</y>
- <width>156</width>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- <actions>
- </actions>
- <border_color>
- <color red="0" green="128" blue="255">
- </color>
- </border_color>
- </widget>
<widget type="led" version="2.0.0">
<name>LED_23</name>
<pv_name>$(P)$(R)MainClockMissingR</pv_name>
@@ -2498,7 +2481,7 @@ $(pv_value)</tooltip>
<target>tab</target>
</action>
</actions>
- <text>Mode LUT</text>
+ <text>More..</text>
<x>686</x>
<y>513</y>
<height>20</height>
@@ -2516,7 +2499,7 @@ $(pv_value)</tooltip>
<target>tab</target>
</action>
</actions>
- <text>Destination LUT</text>
+ <text>More..</text>
<x>686</x>
<y>532</y>
<height>20</height>
@@ -2544,7 +2527,7 @@ $(pv_value)</tooltip>
</widget>
<widget type="label" version="2.0.0">
<name>Label_361</name>
- <text>Beam destination LUT setup</text>
+ <text>Beam dest. LUT setup</text>
<x>409</x>
<y>532</y>
<width>166</width>
@@ -2721,8 +2704,8 @@ $(pv_value)</tooltip>
<file>../adsis8300/sis8300-evr.opi</file>
<x>36</x>
<y>834</y>
- <width>589</width>
- <height>162</height>
+ <width>699</width>
+ <height>171</height>
<resize>2</resize>
<actions>
</actions>
diff --git a/99-Shared/adsis8300bcm/bcm_instance.bob b/99-Shared/adsis8300bcm/bcm_instance.bob
index 17870da..b815d93 100644
--- a/99-Shared/adsis8300bcm/bcm_instance.bob
+++ b/99-Shared/adsis8300bcm/bcm_instance.bob
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
<name>$(P) top</name>
- <width>500</width>
- <height>200</height>
+ <width>420</width>
+ <height>171</height>
<background_color>
<color red="240" green="240" blue="240">
</color>
@@ -225,4 +225,52 @@ $(pv_value)</tooltip>
</background_color>
<tooltip>$(actions)</tooltip>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>Text Update_4</name>
+ <text>differential channels</text>
+ <x>6</x>
+ <y>144</y>
+ <width>260</width>
+ <font>
+ <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ </font>
+ </font>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+ <border_color>
+ <color red="0" green="128" blue="255">
+ </color>
+ </border_color>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>Action Button_12</name>
+ <actions>
+ <action type="open_display">
+ <file>channels.bob</file>
+ <macros>
+ <P>$(CG)</P>
+ <R></R>
+ </macros>
+ <target>tab</target>
+ </action>
+ </actions>
+ <text>more..</text>
+ <x>300</x>
+ <y>144</y>
+ <width>109</width>
+ <height>20</height>
+ <font>
+ <font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
+ </font>
+ </font>
+ <background_color>
+ <color red="240" green="240" blue="240">
+ </color>
+ </background_color>
+ <tooltip>$(actions)</tooltip>
+ </widget>
</display>
diff --git a/99-Shared/adsis8300bcm/diff_item.bob b/99-Shared/adsis8300bcm/diff_item.bob
index 9d39d02..0ee2218 100644
--- a/99-Shared/adsis8300bcm/diff_item.bob
+++ b/99-Shared/adsis8300bcm/diff_item.bob
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
+ <width>393</width>
+ <height>20</height>
<background_color>
<color red="240" green="240" blue="240">
</color>
@@ -9,9 +11,7 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_75</name>
<pv_name>$(P)DF$(IDX)-Name</pv_name>
- <x>12</x>
- <y>72</y>
- <width>260</width>
+ <width>230</width>
<font>
<font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
</font>
@@ -39,8 +39,7 @@
</action>
</actions>
<text>plot</text>
- <x>355</x>
- <y>72</y>
+ <x>344</x>
<width>49</width>
<height>20</height>
<font>
@@ -62,8 +61,7 @@
</action>
</actions>
<text>parameters</text>
- <x>271</x>
- <y>72</y>
+ <x>260</x>
<width>73</width>
<height>20</height>
<font>
@@ -76,4 +74,24 @@
</background_color>
<tooltip>$(actions)</tooltip>
</widget>
+ <widget type="label" version="2.0.0">
+ <name>Text Update_76</name>
+ <text>$(IDX)</text>
+ <x>230</x>
+ <width>30</width>
+ <font>
+ <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ </font>
+ </font>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ <actions>
+ </actions>
+ <tooltip>$(pv_name)
+$(pv_value)</tooltip>
+ <border_color>
+ <color red="0" green="128" blue="255">
+ </color>
+ </border_color>
+ </widget>
</display>
diff --git a/99-Shared/adsis8300bcm/diff_plot.bob b/99-Shared/adsis8300bcm/diff_plot.bob
index 4174489..dbe33b8 100644
--- a/99-Shared/adsis8300bcm/diff_plot.bob
+++ b/99-Shared/adsis8300bcm/diff_plot.bob
@@ -77,49 +77,31 @@
<actions>
</actions>
<rules>
- <rule name="buffer_0_size" prop_id="trace_0_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(P)PRB2-TR0-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="buffer_1_size" prop_id="trace_1_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(P)PRB3-TR0-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="buffer_2_size" prop_id="trace_2_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(P)PRB1-TR9-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="data_y_max" prop_id="axis_1_maximum" out_exp="true">
+ <rule name="data_y_max" prop_id="y_axes[0].maximum" out_exp="true">
<exp bool_exp="true">
<expression>pv0</expression>
</exp>
<pv_name>$(P)PRB2-TR0-ArraySize1_RBV</pv_name>
</rule>
- <rule name="data_x0_max" prop_id="axis_0_maximum" out_exp="true">
+ <rule name="data_x0_max" prop_id="x_axis.maximum" out_exp="true">
<exp bool_exp="true">
<expression>pv0</expression>
</exp>
<pv_name>$(P)PRB2-TR0-ArraySize0_RBV</pv_name>
</rule>
- <rule name="trace_0_name" prop_id="trace_0_name" out_exp="true">
+ <rule name="traces[0].name" prop_id="traces[0].name" out_exp="true">
<exp bool_exp="pvStr0!=""">
<expression>pvStr0</expression>
</exp>
<pv_name>$(P)PRB2-TR0-Name</pv_name>
</rule>
- <rule name="trace_1_name" prop_id="trace_1_name" out_exp="true">
+ <rule name="traces[1].name" prop_id="traces[1].name" out_exp="true">
<exp bool_exp="pvStr0!=""">
<expression>pvStr0</expression>
</exp>
<pv_name>$(P)PRB3-TR0-Name</pv_name>
</rule>
- <rule name="trace_2_name" prop_id="trace_2_name" out_exp="true">
+ <rule name="traces[2].name" prop_id="traces[2].name" out_exp="true">
<exp bool_exp="pvStr0!=""">
<expression>pvStr0</expression>
</exp>
@@ -219,7 +201,7 @@
<x_pv>$(P)PRB1-TR9-ArrayTimeUs</x_pv>
<y_pv>$(P)PRB1-TR9-ArrayData</y_pv>
<err_pv></err_pv>
- <axis>2</axis>
+ <axis>1</axis>
<trace_type>1</trace_type>
<color>
<color red="33" green="179" blue="33">
@@ -830,9 +812,9 @@
</actions>
<pv_name>$(P)PRB2-Recording</pv_name>
<text>Enable</text>
- <x>360</x>
- <y>94</y>
- <width>43</width>
+ <x>342</x>
+ <y>96</y>
+ <width>50</width>
<height>20</height>
<font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
@@ -879,9 +861,9 @@
</actions>
<pv_name>$(P)PRB2-Recording</pv_name>
<text>Disable</text>
- <x>419</x>
- <y>94</y>
- <width>43</width>
+ <x>401</x>
+ <y>96</y>
+ <width>50</width>
<height>20</height>
<font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
@@ -1644,9 +1626,9 @@
</actions>
<pv_name>$(P)PRB3-Recording</pv_name>
<text>Enable</text>
- <x>360</x>
- <y>390</y>
- <width>43</width>
+ <x>342</x>
+ <y>392</y>
+ <width>50</width>
<height>20</height>
<font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
@@ -1693,9 +1675,9 @@
</actions>
<pv_name>$(P)PRB3-Recording</pv_name>
<text>Disable</text>
- <x>419</x>
- <y>390</y>
- <width>43</width>
+ <x>401</x>
+ <y>392</y>
+ <width>50</width>
<height>20</height>
<font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
@@ -1863,14 +1845,14 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_10</name>
- <file>trace_item.opi</file>
<macros>
<R>PRB2-TR0-</R>
</macros>
+ <file>trace_item.opi</file>
<x>22</x>
<y>326</y>
- <width>438</width>
- <height>23</height>
+ <width>436</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>
@@ -1881,14 +1863,14 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_1</name>
- <file>trace_item.opi</file>
<macros>
<R>PRB3-TR0-</R>
</macros>
+ <file>trace_item.opi</file>
<x>22</x>
<y>621</y>
- <width>438</width>
- <height>23</height>
+ <width>436</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>
diff --git a/99-Shared/adsis8300bcm/lut_dest_acct_item.bob b/99-Shared/adsis8300bcm/lut_dest_acct_item.bob
index 325e242..924bdf8 100644
--- a/99-Shared/adsis8300bcm/lut_dest_acct_item.bob
+++ b/99-Shared/adsis8300bcm/lut_dest_acct_item.bob
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
+ <width>469</width>
+ <height>20</height>
<background_color>
<color red="240" green="240" blue="240">
</color>
@@ -9,8 +11,7 @@
<widget type="combo" version="2.0.0">
<name>Menu Button</name>
<pv_name>$(P)$(R)Lut$(N)BeamExists</pv_name>
- <x>369</x>
- <y>42</y>
+ <x>357</x>
<width>112</width>
<height>20</height>
<background_color>
@@ -22,8 +23,7 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update</name>
<pv_name>$(CG)Lut$(N)DestinationID</pv_name>
- <x>240</x>
- <y>42</y>
+ <x>228</x>
<width>112</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -41,8 +41,6 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_1</name>
<pv_name>$(CG)Lut$(N)DestinationName</pv_name>
- <x>12</x>
- <y>42</y>
<width>222</width>
<background_color>
<color red="255" green="255" blue="255">
diff --git a/99-Shared/adsis8300bcm/lut_dest_item.bob b/99-Shared/adsis8300bcm/lut_dest_item.bob
index a055c1c..ccd5a91 100644
--- a/99-Shared/adsis8300bcm/lut_dest_item.bob
+++ b/99-Shared/adsis8300bcm/lut_dest_item.bob
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
+ <width>346</width>
+ <height>20</height>
<background_color>
<color red="240" green="240" blue="240">
</color>
@@ -9,8 +11,6 @@
<widget type="textentry" version="3.0.0">
<name>Text Input_28</name>
<pv_name>$(P)$(R)Lut$(N)DestinationName</pv_name>
- <x>12</x>
- <y>42</y>
<width>222</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -32,8 +32,7 @@
<widget type="textentry" version="3.0.0">
<name>Text Input_29</name>
<pv_name>$(P)$(R)Lut$(N)DestinationID</pv_name>
- <x>246</x>
- <y>42</y>
+ <x>234</x>
<width>112</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
diff --git a/99-Shared/adsis8300bcm/lut_mode_acct_item.bob b/99-Shared/adsis8300bcm/lut_mode_acct_item.bob
index 69e2223..7205adf 100644
--- a/99-Shared/adsis8300bcm/lut_mode_acct_item.bob
+++ b/99-Shared/adsis8300bcm/lut_mode_acct_item.bob
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
+ <width>706</width>
+ <height>20</height>
<background_color>
<color red="240" green="240" blue="240">
</color>
@@ -9,8 +11,7 @@
<widget type="textentry" version="3.0.0">
<name>Text Input_24</name>
<pv_name>$(P)$(R)Lut$(N)UpperThreshold</pv_name>
- <x>366</x>
- <y>24</y>
+ <x>354</x>
<width>112</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -32,8 +33,7 @@
<widget type="textentry" version="3.0.0">
<name>Text Input_25</name>
<pv_name>$(P)$(R)Lut$(N)LowerThreshold</pv_name>
- <x>486</x>
- <y>24</y>
+ <x>474</x>
<width>112</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -55,8 +55,7 @@
<widget type="textentry" version="3.0.0">
<name>Text Input_26</name>
<pv_name>$(P)$(R)Lut$(N)MaxPulseLength</pv_name>
- <x>606</x>
- <y>24</y>
+ <x>594</x>
<width>112</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -78,8 +77,7 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update</name>
<pv_name>$(CG)Lut$(N)ModeID</pv_name>
- <x>240</x>
- <y>24</y>
+ <x>228</x>
<width>112</width>
<background_color>
<color red="255" green="255" blue="255">
@@ -97,8 +95,6 @@
<widget type="textupdate" version="2.0.0">
<name>Text Update_1</name>
<pv_name>$(CG)Lut$(N)ModeName</pv_name>
- <x>12</x>
- <y>24</y>
<width>222</width>
<background_color>
<color red="255" green="255" blue="255">
diff --git a/99-Shared/adsis8300bcm/lut_mode_item.bob b/99-Shared/adsis8300bcm/lut_mode_item.bob
index a084370..8e519b6 100644
--- a/99-Shared/adsis8300bcm/lut_mode_item.bob
+++ b/99-Shared/adsis8300bcm/lut_mode_item.bob
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
+ <width>345</width>
+ <height>20</height>
<background_color>
<color red="240" green="240" blue="240">
</color>
@@ -9,8 +11,7 @@
<widget type="textentry" version="3.0.0">
<name>Text Input_27</name>
<pv_name>$(P)$(R)Lut$(N)ModeID</pv_name>
- <x>245</x>
- <y>24</y>
+ <x>233</x>
<width>112</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
@@ -32,8 +33,6 @@
<widget type="textentry" version="3.0.0">
<name>Text Input_28</name>
<pv_name>$(P)$(R)Lut$(N)ModeName</pv_name>
- <x>12</x>
- <y>24</y>
<width>222</width>
<font>
<font family="Sans" style="REGULAR" size="10.891089108910892">
diff --git a/99-Shared/adsis8300bcm/processed.bob b/99-Shared/adsis8300bcm/processed.bob
index 2aa8892..00da151 100644
--- a/99-Shared/adsis8300bcm/processed.bob
+++ b/99-Shared/adsis8300bcm/processed.bob
@@ -523,9 +523,9 @@
</actions>
<pv_name>$(P)PRC-Recording</pv_name>
<text>Enable</text>
- <x>351</x>
- <y>66</y>
- <width>43</width>
+ <x>341</x>
+ <y>68</y>
+ <width>50</width>
<height>20</height>
<font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
@@ -572,9 +572,9 @@
</actions>
<pv_name>$(P)PRC-Recording</pv_name>
<text>Disable</text>
- <x>410</x>
- <y>66</y>
- <width>43</width>
+ <x>400</x>
+ <y>68</y>
+ <width>50</width>
<height>20</height>
<font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
@@ -1023,15 +1023,15 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container</name>
- <file>trace_item.opi</file>
<macros>
<P>$(CG)</P>
<R>PRB1-TR1-</R>
</macros>
+ <file>trace_item.opi</file>
<x>11</x>
<y>587</y>
- <width>438</width>
- <height>23</height>
+ <width>436</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>
@@ -1042,15 +1042,15 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_1</name>
- <file>trace_item.opi</file>
<macros>
<P>$(CG)</P>
<R>PRB1-TR2-</R>
</macros>
+ <file>trace_item.opi</file>
<x>11</x>
<y>609</y>
- <width>438</width>
- <height>23</height>
+ <width>436</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>
@@ -1061,15 +1061,15 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_2</name>
- <file>trace_item.opi</file>
<macros>
<P>$(CG)</P>
<R>PRB1-TR3-</R>
</macros>
+ <file>trace_item.opi</file>
<x>11</x>
<y>631</y>
- <width>438</width>
- <height>23</height>
+ <width>436</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>
@@ -1080,15 +1080,15 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_3</name>
- <file>trace_item.opi</file>
<macros>
<P>$(CG)</P>
<R>PRB1-TR4-</R>
</macros>
+ <file>trace_item.opi</file>
<x>11</x>
<y>653</y>
- <width>438</width>
- <height>23</height>
+ <width>436</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>
@@ -1099,15 +1099,15 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_4</name>
- <file>trace_item.opi</file>
<macros>
<P>$(CG)</P>
<R>PRB1-TR5-</R>
</macros>
+ <file>trace_item.opi</file>
<x>11</x>
<y>675</y>
- <width>438</width>
- <height>23</height>
+ <width>436</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>
@@ -1118,15 +1118,15 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_5</name>
- <file>trace_item.opi</file>
<macros>
<P>$(CG)</P>
<R>PRB1-TR6-</R>
</macros>
+ <file>trace_item.opi</file>
<x>11</x>
<y>697</y>
- <width>438</width>
- <height>23</height>
+ <width>436</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>
@@ -1137,15 +1137,15 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_6</name>
- <file>trace_item.opi</file>
<macros>
<P>$(CG)</P>
<R>PRB1-TR7-</R>
</macros>
+ <file>trace_item.opi</file>
<x>11</x>
<y>719</y>
- <width>438</width>
- <height>23</height>
+ <width>436</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>
@@ -1156,15 +1156,15 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_7</name>
- <file>trace_item.opi</file>
<macros>
<P>$(CG)</P>
<R>PRB1-TR8-</R>
</macros>
+ <file>trace_item.opi</file>
<x>11</x>
<y>741</y>
- <width>438</width>
- <height>23</height>
+ <width>436</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>
@@ -1175,15 +1175,15 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_8</name>
- <file>trace_item.opi</file>
<macros>
<P>$(CG)</P>
<R>PRB1-TR9-</R>
</macros>
+ <file>trace_item.opi</file>
<x>11</x>
<y>763</y>
- <width>438</width>
- <height>23</height>
+ <width>436</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>
@@ -1194,15 +1194,15 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_9</name>
- <file>trace_item.opi</file>
<macros>
<P>$(CG)</P>
<R>PRB1-TR0-</R>
</macros>
+ <file>trace_item.opi</file>
<x>10</x>
<y>565</y>
- <width>438</width>
- <height>23</height>
+ <width>436</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>
@@ -1213,14 +1213,14 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_10</name>
- <file>trace_item.opi</file>
<macros>
<R>PRC-TR1-</R>
</macros>
+ <file>trace_item.opi</file>
<x>12</x>
<y>263</y>
- <width>438</width>
- <height>23</height>
+ <width>436</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>
@@ -1247,217 +1247,151 @@
<actions>
</actions>
<rules>
- <rule name="buffer_0_size" prop_id="trace_0_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(P)PRC-TR1-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="buffer_1_size" prop_id="trace_1_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(CG)PRB1-TR0-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="buffer_2_size" prop_id="trace_2_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(CG)PRB1-TR1-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="buffer_3_size" prop_id="trace_3_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(CG)PRB1-TR2-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="buffer_4_size" prop_id="trace_4_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(CG)PRB1-TR3-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="buffer_5_size" prop_id="trace_5_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(CG)PRB1-TR4-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="buffer_6_size" prop_id="trace_6_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(CG)PRB1-TR5-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="buffer_7_size" prop_id="trace_7_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(CG)PRB1-TR6-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="buffer_8_size" prop_id="trace_8_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(CG)PRB1-TR7-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="buffer_9_size" prop_id="trace_9_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(CG)PRB1-TR8-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="buffer_10_size" prop_id="trace_10_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(CG)PRB1-TR9-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="data_y_max" prop_id="axis_1_maximum" out_exp="true">
+ <rule name="data_y_max" prop_id="y_axes[0].maximum" out_exp="true">
<exp bool_exp="true">
<expression>pv0</expression>
</exp>
<pv_name>$(P)PRC-TR1-ArraySize1_RBV</pv_name>
</rule>
- <rule name="data_x0_max" prop_id="axis_0_maximum" out_exp="true">
+ <rule name="data_x0_max" prop_id="x_axis.maximum" out_exp="true">
<exp bool_exp="true">
<expression>pv0</expression>
</exp>
<pv_name>$(P)PRC-TR1-ArraySize0_RBV</pv_name>
</rule>
- <rule name="y_title" prop_id="axis_1_axis_title" out_exp="true">
+ <rule name="y_title" prop_id="y_axes[0].title" out_exp="true">
<exp bool_exp="pv0 != 0">
<expression>"mA"</expression>
</exp>
<pv_name>$(P)PRC-ConvertingR</pv_name>
</rule>
- <rule name="trace0_visible" prop_id="trace_0_visible" out_exp="false">
+ <rule name="trace0_visible" prop_id="traces[0].visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
<pv_name>$(P)PRC-TR1-EnableCallbacks_RBV</pv_name>
</rule>
- <rule name="trace1_visible" prop_id="trace_1_visible" out_exp="false">
+ <rule name="trace1_visible" prop_id="traces[1].visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
<pv_name>$(CG)PRB1-TR0-EnableCallbacks_RBV</pv_name>
</rule>
- <rule name="trace2_visible" prop_id="trace_2_visible" out_exp="false">
+ <rule name="trace2_visible" prop_id="traces[2].visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
<pv_name>$(CG)PRB1-TR1-EnableCallbacks_RBV</pv_name>
</rule>
- <rule name="trace3_visible" prop_id="trace_3_visible" out_exp="false">
+ <rule name="trace3_visible" prop_id="traces[3].visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
<pv_name>$(CG)PRB1-TR2-EnableCallbacks_RBV</pv_name>
</rule>
- <rule name="trace4_visible" prop_id="trace_4_visible" out_exp="false">
+ <rule name="trace4_visible" prop_id="traces[4].visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
<pv_name>$(CG)PRB1-TR3-EnableCallbacks_RBV</pv_name>
</rule>
- <rule name="trace5_visible" prop_id="trace_5_visible" out_exp="false">
+ <rule name="trace5_visible" prop_id="traces[5].visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
<pv_name>$(CG)PRB1-TR4-EnableCallbacks_RBV</pv_name>
</rule>
- <rule name="trace6_visible" prop_id="trace_6_visible" out_exp="false">
+ <rule name="trace6_visible" prop_id="traces[6].visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
<pv_name>$(CG)PRB1-TR5-EnableCallbacks_RBV</pv_name>
</rule>
- <rule name="trace7_visible" prop_id="trace_7_visible" out_exp="false">
+ <rule name="trace7_visible" prop_id="traces[7].visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
<pv_name>$(CG)PRB1-TR6-EnableCallbacks_RBV</pv_name>
</rule>
- <rule name="trace8_visible" prop_id="trace_8_visible" out_exp="false">
+ <rule name="trace8_visible" prop_id="traces[8].visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
<pv_name>$(CG)PRB1-TR7-EnableCallbacks_RBV</pv_name>
</rule>
- <rule name="trace9_visible" prop_id="trace_9_visible" out_exp="false">
+ <rule name="trace9_visible" prop_id="traces[9].visible" out_exp="false">
<exp bool_exp="pv0==0">
<value>false</value>
</exp>
<pv_name>$(CG)PRB1-TR8-EnableCallbacks_RBV</pv_name>
</rule>
- <rule name="trace10_visible" prop_id="trace_10_visible" out_exp="false">
+ <rule name="trace10_visible" prop_id="traces[10].visible" out_exp="false">
<exp bool_exp="pv0==0">
- <value>false</value>
+ <value>true</value>
</exp>
<pv_name>$(CG)PRB1-TR9-EnableCallbacks_RBV</pv_name>
</rule>
- <rule name="trace_0_name" prop_id="trace_0_name" out_exp="true">
+ <rule name="traces[0].name" prop_id="traces[0].name" out_exp="true">
<exp bool_exp="pvStr0!=""">
<expression>pvStr0</expression>
</exp>
<pv_name>$(P)PRC-TR1-Name</pv_name>
</rule>
- <rule name="trace_1_name" prop_id="trace_1_name" out_exp="true">
+ <rule name="traces[1].name" prop_id="traces[1].name" out_exp="true">
<exp bool_exp="pvStr0!=""">
<expression>pvStr0</expression>
</exp>
<pv_name>$(CG)PRB1-TR0-Name</pv_name>
</rule>
- <rule name="trace_2_name" prop_id="trace_2_name" out_exp="true">
+ <rule name="traces[2].name" prop_id="traces[2].name" out_exp="true">
<exp bool_exp="pvStr0!=""">
<expression>pvStr0</expression>
</exp>
<pv_name>$(CG)PRB1-TR1-Name</pv_name>
</rule>
- <rule name="trace_3_name" prop_id="trace_3_name" out_exp="true">
+ <rule name="traces[3].name" prop_id="traces[3].name" out_exp="true">
<exp bool_exp="pvStr0!=""">
<expression>pvStr0</expression>
</exp>
<pv_name>$(CG)PRB1-TR2-Name</pv_name>
</rule>
- <rule name="trace_4_name" prop_id="trace_4_name" out_exp="true">
+ <rule name="traces[4].name" prop_id="traces[4].name" out_exp="true">
<exp bool_exp="pvStr0!=""">
<expression>pvStr0</expression>
</exp>
<pv_name>$(CG)PRB1-TR3-Name</pv_name>
</rule>
- <rule name="trace_5_name" prop_id="trace_5_name" out_exp="true">
+ <rule name="traces[5].name" prop_id="traces[5].name" out_exp="true">
<exp bool_exp="pvStr0!=""">
<expression>pvStr0</expression>
</exp>
<pv_name>$(CG)PRB1-TR4-Name</pv_name>
</rule>
- <rule name="trace_6_name" prop_id="trace_6_name" out_exp="true">
+ <rule name="traces[6].name" prop_id="traces[6].name" out_exp="true">
<exp bool_exp="pvStr0!=""">
<expression>pvStr0</expression>
</exp>
<pv_name>$(CG)PRB1-TR5-Name</pv_name>
</rule>
- <rule name="trace_7_name" prop_id="trace_7_name" out_exp="true">
+ <rule name="traces[7].name" prop_id="traces[7].name" out_exp="true">
<exp bool_exp="pvStr0!=""">
<expression>pvStr0</expression>
</exp>
<pv_name>$(CG)PRB1-TR6-Name</pv_name>
</rule>
- <rule name="trace_8_name" prop_id="trace_8_name" out_exp="true">
+ <rule name="traces[8].name" prop_id="traces[8].name" out_exp="true">
<exp bool_exp="pvStr0!=""">
<expression>pvStr0</expression>
</exp>
<pv_name>$(CG)PRB1-TR7-Name</pv_name>
</rule>
- <rule name="trace_9_name" prop_id="trace_9_name" out_exp="true">
+ <rule name="traces[9].name" prop_id="traces[9].name" out_exp="true">
<exp bool_exp="pvStr0!=""">
<expression>pvStr0</expression>
</exp>
<pv_name>$(CG)PRB1-TR8-Name</pv_name>
</rule>
- <rule name="trace_10_name" prop_id="trace_10_name" out_exp="true">
+ <rule name="traces[10].name" prop_id="traces[10].name" out_exp="true">
<exp bool_exp="pvStr0!=""">
<expression>pvStr0</expression>
</exp>
@@ -1540,7 +1474,7 @@
<x_pv>$(CG)PRB1-TR0-ArrayTimeUs</x_pv>
<y_pv>$(CG)PRB1-TR0-ArrayData</y_pv>
<err_pv></err_pv>
- <axis>2</axis>
+ <axis>1</axis>
<trace_type>1</trace_type>
<color>
<color red="242" green="26" blue="26">
@@ -1557,7 +1491,7 @@
<x_pv>$(CG)PRB1-TR1-ArrayTimeUs</x_pv>
<y_pv>$(CG)PRB1-TR1-ArrayData</y_pv>
<err_pv></err_pv>
- <axis>2</axis>
+ <axis>1</axis>
<trace_type>1</trace_type>
<color>
<color red="33" green="179" blue="33">
@@ -1574,7 +1508,7 @@
<x_pv>$(CG)PRB1-TR2-ArrayTimeUs</x_pv>
<y_pv>$(CG)PRB1-TR2-ArrayData</y_pv>
<err_pv></err_pv>
- <axis>2</axis>
+ <axis>1</axis>
<trace_type>1</trace_type>
<color>
<color red="0" green="0" blue="0">
@@ -1591,7 +1525,7 @@
<x_pv>$(CG)PRB1-TR3-ArrayTimeUs</x_pv>
<y_pv>$(CG)PRB1-TR3-ArrayData</y_pv>
<err_pv></err_pv>
- <axis>2</axis>
+ <axis>1</axis>
<trace_type>1</trace_type>
<color>
<color red="128" green="0" blue="255">
@@ -1608,7 +1542,7 @@
<x_pv>$(CG)PRB1-TR4-ArrayTimeUs</x_pv>
<y_pv>$(CG)PRB1-TR4-ArrayData</y_pv>
<err_pv></err_pv>
- <axis>2</axis>
+ <axis>1</axis>
<trace_type>1</trace_type>
<color>
<color red="255" green="170" blue="0">
@@ -1625,7 +1559,7 @@
<x_pv>$(CG)PRB1-TR5-ArrayTimeUs</x_pv>
<y_pv>$(CG)PRB1-TR5-ArrayData</y_pv>
<err_pv></err_pv>
- <axis>2</axis>
+ <axis>1</axis>
<trace_type>1</trace_type>
<color>
<color red="255" green="0" blue="240">
@@ -1642,7 +1576,7 @@
<x_pv>$(CG)PRB1-TR6-ArrayTimeUs</x_pv>
<y_pv>$(CG)PRB1-TR6-ArrayData</y_pv>
<err_pv></err_pv>
- <axis>2</axis>
+ <axis>1</axis>
<trace_type>1</trace_type>
<color>
<color red="243" green="132" blue="132">
@@ -1659,7 +1593,7 @@
<x_pv>$(CG)PRB1-TR7-ArrayTimeUs</x_pv>
<y_pv>$(CG)PRB1-TR7-ArrayData</y_pv>
<err_pv></err_pv>
- <axis>2</axis>
+ <axis>1</axis>
<trace_type>1</trace_type>
<color>
<color red="0" green="255" blue="11">
@@ -1676,7 +1610,7 @@
<x_pv>$(CG)PRB1-TR8-ArrayTimeUs</x_pv>
<y_pv>$(CG)PRB1-TR8-ArrayData</y_pv>
<err_pv></err_pv>
- <axis>2</axis>
+ <axis>1</axis>
<trace_type>1</trace_type>
<color>
<color red="0" green="214" blue="255">
@@ -1693,7 +1627,7 @@
<x_pv>$(CG)PRB1-TR9-ArrayTimeUs</x_pv>
<y_pv>$(CG)PRB1-TR9-ArrayData</y_pv>
<err_pv></err_pv>
- <axis>2</axis>
+ <axis>1</axis>
<trace_type>1</trace_type>
<color>
<color red="114" green="40" blue="3">
@@ -2304,9 +2238,9 @@
</actions>
<pv_name>$(CG)PRB1-Recording</pv_name>
<text>Enable</text>
- <x>351</x>
- <y>330</y>
- <width>43</width>
+ <x>341</x>
+ <y>332</y>
+ <width>50</width>
<height>20</height>
<font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
@@ -2353,9 +2287,9 @@
</actions>
<pv_name>$(CG)PRB1-Recording</pv_name>
<text>Disable</text>
- <x>410</x>
- <y>330</y>
- <width>43</width>
+ <x>400</x>
+ <y>332</y>
+ <width>50</width>
<height>20</height>
<font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
diff --git a/99-Shared/adsis8300bcm/raw.bob b/99-Shared/adsis8300bcm/raw.bob
index acd3232..60bb54f 100644
--- a/99-Shared/adsis8300bcm/raw.bob
+++ b/99-Shared/adsis8300bcm/raw.bob
@@ -523,9 +523,9 @@
</actions>
<pv_name>$(P)RAW-Recording</pv_name>
<text>Enable</text>
- <x>352</x>
- <y>66</y>
- <width>43</width>
+ <x>342</x>
+ <y>68</y>
+ <width>50</width>
<height>20</height>
<font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
@@ -572,9 +572,9 @@
</actions>
<pv_name>$(P)RAW-Recording</pv_name>
<text>Disable</text>
- <x>411</x>
- <y>66</y>
- <width>43</width>
+ <x>400</x>
+ <y>68</y>
+ <width>50</width>
<height>20</height>
<font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
@@ -1023,14 +1023,14 @@
</widget>
<widget type="embedded" version="2.0.0">
<name>Linking Container_10</name>
- <file>trace_item.opi</file>
<macros>
<R>RAW-TR1-</R>
</macros>
+ <file>trace_item.opi</file>
<x>13</x>
<y>263</y>
- <width>438</width>
- <height>23</height>
+ <width>436</width>
+ <height>20</height>
<resize>2</resize>
<actions>
</actions>
@@ -1057,31 +1057,25 @@
<actions>
</actions>
<rules>
- <rule name="buffer_size" prop_id="trace_0_buffer_size" out_exp="true">
- <exp bool_exp="true">
- <expression>pv0</expression>
- </exp>
- <pv_name>$(P)RAW-TR1-ArraySize0_RBV</pv_name>
- </rule>
- <rule name="data_y_max" prop_id="axis_1_maximum" out_exp="true">
+ <rule name="data_y_max" prop_id="y_axes[0].maximum" out_exp="true">
<exp bool_exp="true">
<expression>pv0</expression>
</exp>
<pv_name>$(P)RAW-TR1-ArraySize1_RBV</pv_name>
</rule>
- <rule name="data_x0_max" prop_id="axis_0_maximum" out_exp="true">
+ <rule name="data_x0_max" prop_id="x_axis.maximum" out_exp="true">
<exp bool_exp="true">
<expression>pv0</expression>
</exp>
<pv_name>$(P)RAW-TR1-ArraySize0_RBV</pv_name>
</rule>
- <rule name="y_title" prop_id="axis_1_axis_title" out_exp="true">
+ <rule name="y_title" prop_id="y_axes[0].title" out_exp="true">
<exp bool_exp="pv0 != 0">
<expression>"mA"</expression>
</exp>
<pv_name>$(P)RAW-ConvertingR</pv_name>
</rule>
- <rule name="trace_0_name" prop_id="trace_0_name" out_exp="true">
+ <rule name="traces[0].name" prop_id="traces[0].name" out_exp="true">
<exp bool_exp="true">
<expression>pvStr0</expression>
</exp>
diff --git a/99-Shared/adsis8300bcm/trace_item.bob b/99-Shared/adsis8300bcm/trace_item.bob
index a948fe2..772d2f2 100644
--- a/99-Shared/adsis8300bcm/trace_item.bob
+++ b/99-Shared/adsis8300bcm/trace_item.bob
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
+ <width>436</width>
+ <height>20</height>
<background_color>
<color red="240" green="240" blue="240">
</color>
@@ -15,9 +17,8 @@
</action>
</actions>
<text>More..</text>
- <x>654</x>
- <y>207</y>
- <width>49</width>
+ <x>386</x>
+ <width>50</width>
<height>20</height>
<font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
@@ -32,8 +33,8 @@
<widget type="led" version="2.0.0">
<name>LED_1</name>
<pv_name>$(P)$(R)EnableCallbacks_RBV</pv_name>
- <x>518</x>
- <y>209</y>
+ <x>250</x>
+ <y>2</y>
<width>16</width>
<height>16</height>
<off_color>
@@ -65,9 +66,8 @@
</actions>
<pv_name>$(P)$(R)EnableCallbacks</pv_name>
<text>Enable</text>
- <x>559</x>
- <y>207</y>
- <width>43</width>
+ <x>291</x>
+ <width>50</width>
<height>20</height>
<font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
@@ -88,9 +88,8 @@
</actions>
<pv_name>$(P)$(R)EnableCallbacks</pv_name>
<text>Disable</text>
- <x>601</x>
- <y>207</y>
- <width>43</width>
+ <x>340</x>
+ <width>50</width>
<height>20</height>
<font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0">
@@ -104,8 +103,7 @@
<widget type="textentry" version="3.0.0">
<name>Text Input</name>
<pv_name>$(P)$(R)Name</pv_name>
- <x>268</x>
- <y>208</y>
+ <y>1</y>
<width>219</width>
<height>18</height>
<font>
--
GitLab