From ea8f0e0e76a5598b72ad49f50d2150e07a5311b7 Mon Sep 17 00:00:00 2001
From: Hinko Kocevar <hinko.kocevar@ess.eu>
Date: Tue, 26 Oct 2021 15:04:50 +0200
Subject: [PATCH] ROI fields in time domain
---
99-Shared/adsis8300bpm/bpm.bob | 55 +++++++++++++++++-
99-Shared/adsis8300bpm/bpmChannelAverage.bob | 61 ++++++++++++++++++--
2 files changed, 108 insertions(+), 8 deletions(-)
diff --git a/99-Shared/adsis8300bpm/bpm.bob b/99-Shared/adsis8300bpm/bpm.bob
index 26e2250..137d6bb 100644
--- a/99-Shared/adsis8300bpm/bpm.bob
+++ b/99-Shared/adsis8300bpm/bpm.bob
@@ -1640,7 +1640,6 @@
<x>1458</x>
<y>180</y>
<width>60</width>
- <border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="led" version="2.0.0">
<name>LED_3</name>
@@ -2056,7 +2055,7 @@
</color>
</off_color>
<on_color>
- <color name="IO Normal Level Alarm" red="0" green="255" blue="0">
+ <color name="ERROR" red="252" green="13" blue="27">
</color>
</on_color>
<actions>
@@ -2075,7 +2074,6 @@
<x>1920</x>
<y>180</y>
<width>60</width>
- <border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="label" version="2.0.0">
<name>Label_360</name>
@@ -2713,4 +2711,55 @@
<height>40</height>
<tooltip>$(actions)</tooltip>
</widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_125</name>
+ <pv_name>$(P)$(R)RoiSampleCountUsR</pv_name>
+ <x>1510</x>
+ <y>740</y>
+ <width>88</width>
+ <height>30</height>
+ <horizontal_alignment>1</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="textupdate" version="2.0.0">
+ <name>Text Update_139</name>
+ <pv_name>$(P)$(R)RoiFirstSampleUsR</pv_name>
+ <x>1510</x>
+ <y>780</y>
+ <width>88</width>
+ <height>30</height>
+ <horizontal_alignment>1</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="textupdate" version="2.0.0">
+ <name>Text Update_140</name>
+ <pv_name>$(P)$(R)RoiLastSampleUsR</pv_name>
+ <x>1510</x>
+ <y>820</y>
+ <width>88</width>
+ <height>30</height>
+ <horizontal_alignment>1</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>
</display>
diff --git a/99-Shared/adsis8300bpm/bpmChannelAverage.bob b/99-Shared/adsis8300bpm/bpmChannelAverage.bob
index b7ae765..f64f2ea 100644
--- a/99-Shared/adsis8300bpm/bpmChannelAverage.bob
+++ b/99-Shared/adsis8300bpm/bpmChannelAverage.bob
@@ -489,7 +489,7 @@
<color name="ActiveText" red="254" green="194" blue="81">
</color>
</color>
- <pv_name>$(P)$(R)$(CH)RoiFirstSampleR</pv_name>
+ <pv_name>$(P)$(R)$(CH)RoiFirstSampleUsR</pv_name>
<interactive>false</interactive>
</marker>
<marker>
@@ -497,7 +497,7 @@
<color name="ATTENTION" red="252" green="242" blue="17">
</color>
</color>
- <pv_name>$(P)$(R)$(CH)RoiLastSampleR</pv_name>
+ <pv_name>$(P)$(R)$(CH)RoiLastSampleUsR</pv_name>
<interactive>false</interactive>
</marker>
</marker>
@@ -1945,7 +1945,7 @@
<pv_name>$(P)$(R)$(CH)RoiLastSampleR</pv_name>
<x>670</x>
<y>220</y>
- <width>230</width>
+ <width>110</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1962,7 +1962,7 @@
<pv_name>$(P)$(R)$(CH)RoiFirstSampleR</pv_name>
<x>670</x>
<y>180</y>
- <width>230</width>
+ <width>110</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -1979,7 +1979,7 @@
<pv_name>$(P)$(R)$(CH)RoiSampleCountR</pv_name>
<x>670</x>
<y>140</y>
- <width>230</width>
+ <width>110</width>
<height>30</height>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
@@ -2010,4 +2010,55 @@
<vertical_alignment>1</vertical_alignment>
<wrap_words>false</wrap_words>
</widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_131</name>
+ <pv_name>$(P)$(R)$(CH)RoiLastSampleUsR</pv_name>
+ <x>810</x>
+ <y>225</y>
+ <width>110</width>
+ <height>30</height>
+ <horizontal_alignment>1</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="textupdate" version="2.0.0">
+ <name>Text Update_132</name>
+ <pv_name>$(P)$(R)$(CH)RoiFirstSampleUsR</pv_name>
+ <x>810</x>
+ <y>185</y>
+ <width>110</width>
+ <height>30</height>
+ <horizontal_alignment>1</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="textupdate" version="2.0.0">
+ <name>Text Update_133</name>
+ <pv_name>$(P)$(R)$(CH)RoiSampleCountUsR</pv_name>
+ <x>810</x>
+ <y>145</y>
+ <width>110</width>
+ <height>30</height>
+ <horizontal_alignment>1</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>
</display>
--
GitLab