From 720729386549728bf925026003fd56677f4ff060 Mon Sep 17 00:00:00 2001
From: Elena Donegani <elena.donegani@ess.eu>
Date: Wed, 10 Jun 2020 18:22:47 +0200
Subject: [PATCH] Replace NDStatsTimeSeriesPlot.bob
---
99-Shared/adcore/NDStatsTimeSeriesPlot.bob | 388 +++++++++++++--------
1 file changed, 252 insertions(+), 136 deletions(-)
diff --git a/99-Shared/adcore/NDStatsTimeSeriesPlot.bob b/99-Shared/adcore/NDStatsTimeSeriesPlot.bob
index 0564cf5..a22a963 100644
--- a/99-Shared/adcore/NDStatsTimeSeriesPlot.bob
+++ b/99-Shared/adcore/NDStatsTimeSeriesPlot.bob
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0">
- <name>NDStatsTimeSeriesPlot</name>
+ <name>NDTimeSeriesPlot</name>
<x>370</x>
<y>223</y>
<width>700</width>
@@ -12,10 +12,11 @@
<actions>
</actions>
<widget type="rectangle" version="2.0.0">
- <name>BGGrey02-background_1</name>
- <y>50</y>
- <width>690</width>
- <height>510</height>
+ <name>BGGrey02-background</name>
+ <x>10</x>
+ <y>60</y>
+ <width>680</width>
+ <height>550</height>
<line_width>2</line_width>
<line_color>
<color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -30,9 +31,9 @@
<widget type="xyplot" version="2.0.0">
<name>XY Graph</name>
<x>30</x>
- <y>210</y>
+ <y>270</y>
<width>590</width>
- <height>310</height>
+ <height>280</height>
<foreground_color>
<color red="0" green="0" blue="0">
</color>
@@ -41,7 +42,7 @@
<color red="240" green="240" blue="240">
</color>
</background_color>
- <title>$(P)$(RN) Time Series</title>
+ <title>$(P)$(RN)TimeSeries</title>
<title_font>
<font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
@@ -68,7 +69,7 @@
</x_axis>
<y_axes>
<y_axis>
- <title>$(P)$(RN)</title>
+ <title>$(P)$(RN)TimeSeries</title>
<autoscale>true</autoscale>
<log_scale>false</log_scale>
<minimum>0.0</minimum>
@@ -89,7 +90,7 @@
<trace>
<name>$(traces[0].y_pv)</name>
<x_pv>$(P)$(R)TSTimeAxis</x_pv>
- <y_pv>$(P)$(RN)</y_pv>
+ <y_pv>$(P)$(RN)TimeSeries</y_pv>
<err_pv></err_pv>
<axis>0</axis>
<trace_type>1</trace_type>
@@ -105,32 +106,14 @@
</trace>
</traces>
</widget>
- <widget type="combo" version="2.0.0">
- <name>Menu Button</name>
- <pv_name>$(P)$(R)TSAcquireMode</pv_name>
- <x>513</x>
- <y>101</y>
- <height>20</height>
- <foreground_color>
- <color red="0" green="0" blue="0">
- </color>
- </foreground_color>
- <background_color>
- <color name="BLACK-TEXT" red="255" green="255" blue="255">
- </color>
- </background_color>
- <actions>
- </actions>
- <border_alarm_sensitive>false</border_alarm_sensitive>
- </widget>
<widget type="label" version="2.0.0">
<name>Label</name>
- <text>AcquireMode:</text>
- <x>382</x>
- <y>101</y>
- <width>110</width>
+ <text>Acquire:</text>
+ <x>90</x>
+ <y>80</y>
+ <width>70</width>
<foreground_color>
- <color name="BLACK" red="0" green="0" blue="0">
+ <color red="0" green="0" blue="0">
</color>
</foreground_color>
<background_color>
@@ -151,18 +134,18 @@
<name>Action Button</name>
<actions>
<action type="write_pv">
- <pv_name>$(P)$(R)TSRead</pv_name>
+ <pv_name>$(P)$(R)TSAcquire</pv_name>
<value>1</value>
</action>
</actions>
- <pv_name>$(P)$(R)TSRead</pv_name>
- <text>Read</text>
- <x>290</x>
- <y>101</y>
+ <pv_name>$(P)$(R)TSAcquire</pv_name>
+ <text>Erase/Start</text>
+ <x>185</x>
+ <y>80</y>
<width>85</width>
<height>20</height>
<foreground_color>
- <color red="0" green="0" blue="0">
+ <color name="BLACK" red="0" green="0" blue="0">
</color>
</foreground_color>
<background_color>
@@ -170,40 +153,68 @@
</color>
</background_color>
</widget>
- <widget type="combo" version="2.0.0">
- <name>Menu Button</name>
- <pv_name>$(P)$(R)TSRead.SCAN</pv_name>
- <x>180</x>
- <y>101</y>
+ <widget type="action_button" version="3.0.0">
+ <name>Action Button</name>
+ <actions>
+ <action type="write_pv">
+ <pv_name>$(P)$(R)TSAcquire</pv_name>
+ <value>0</value>
+ </action>
+ </actions>
+ <pv_name>$(P)$(R)TSAcquire</pv_name>
+ <text>Stop</text>
+ <x>275</x>
+ <y>80</y>
<width>85</width>
<height>20</height>
<foreground_color>
- <color red="0" green="0" blue="0">
+ <color name="BLACK" red="0" green="0" blue="0">
</color>
</foreground_color>
<background_color>
<color name="BLACK-TEXT" red="255" green="255" blue="255">
</color>
</background_color>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update</name>
+ <pv_name>$(P)$(R)TSAcquiring</pv_name>
+ <x>390</x>
+ <y>80</y>
+ <foreground_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </foreground_color>
+ <background_color>
+ <color name="BLACK-TEXT" red="255" green="255" blue="255">
+ </color>
+ </background_color>
+ <format>6</format>
+ <show_units>false</show_units>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
<actions>
</actions>
<border_alarm_sensitive>false</border_alarm_sensitive>
+ <border_color>
+ <color red="0" green="128" blue="255">
+ </color>
+ </border_color>
</widget>
<widget type="label" version="2.0.0">
<name>Label</name>
- <text>Read rate:</text>
- <x>71</x>
- <y>104</y>
- <width>90</width>
+ <text>$(P)$(RN)</text>
+ <y>30</y>
+ <width>500</width>
<foreground_color>
- <color red="0" green="0" blue="0">
+ <color name="BLACK" red="0" green="0" blue="0">
</color>
</foreground_color>
<background_color>
- <color red="255" green="255" blue="255">
+ <color name="BLACK-TEXT" red="255" green="255" blue="255">
</color>
</background_color>
- <horizontal_alignment>2</horizontal_alignment>
+ <horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<wrap_words>false</wrap_words>
<actions>
@@ -215,9 +226,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label</name>
- <text>Number of points:</text>
- <y>134</y>
- <width>160</width>
+ <text>Signal name:</text>
+ <x>382</x>
+ <y>186</y>
+ <width>110</width>
<foreground_color>
<color red="0" green="0" blue="0">
</color>
@@ -238,9 +250,9 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>Text Input</name>
- <pv_name>$(P)$(R)TSNumPoints</pv_name>
- <x>180</x>
- <y>132</y>
+ <pv_name>$(P)$(RN)Name</pv_name>
+ <x>510</x>
+ <y>186</y>
<width>85</width>
<foreground_color>
<color red="0" green="0" blue="0">
@@ -262,10 +274,10 @@
</widget>
<widget type="label" version="2.0.0">
<name>Label</name>
- <text>Current point:</text>
- <x>360</x>
- <y>132</y>
- <width>130</width>
+ <text>Avg.time:</text>
+ <x>80</x>
+ <y>185</y>
+ <width>80</width>
<foreground_color>
<color red="0" green="0" blue="0">
</color>
@@ -284,12 +296,36 @@
</color>
</border_color>
</widget>
+ <widget type="textentry" version="3.0.0">
+ <name>Text Input</name>
+ <pv_name>$(P)$(R)TSAveragingTime</pv_name>
+ <x>185</x>
+ <y>185</y>
+ <width>85</width>
+ <foreground_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </foreground_color>
+ <background_color>
+ <color name="BLACK-TEXT" red="255" green="255" blue="255">
+ </color>
+ </background_color>
+ <format>2</format>
+ <show_units>false</show_units>
+ <actions>
+ </actions>
+ <border_alarm_sensitive>false</border_alarm_sensitive>
+ <border_color>
+ <color red="0" green="128" blue="255">
+ </color>
+ </border_color>
+ </widget>
<widget type="textupdate" version="2.0.0">
<name>Text Update</name>
- <pv_name>$(P)$(R)TSCurrentPoint</pv_name>
- <x>513</x>
- <y>132</y>
- <width>90</width>
+ <pv_name>$(P)$(R)TSAveragingTime_RBV</pv_name>
+ <x>275</x>
+ <y>185</y>
+ <width>85</width>
<foreground_color>
<color name="BLACK" red="0" green="0" blue="0">
</color>
@@ -298,7 +334,7 @@
<color name="BLACK-TEXT" red="255" green="255" blue="255">
</color>
</background_color>
- <format>1</format>
+ <format>2</format>
<show_units>false</show_units>
<vertical_alignment>1</vertical_alignment>
<wrap_words>false</wrap_words>
@@ -309,18 +345,11 @@
</color>
</border_color>
</widget>
- <widget type="action_button" version="3.0.0">
- <name>Action Button</name>
- <actions>
- <action type="open_display">
- <file>NDPluginTimeSeries.opi</file>
- <target>tab</target>
- <description>Time series plugin</description>
- </action>
- </actions>
- <text>More</text>
- <x>180</x>
- <y>170</y>
+ <widget type="combo" version="2.0.0">
+ <name>Menu Button</name>
+ <pv_name>$(P)$(R)TSAcquireMode</pv_name>
+ <x>510</x>
+ <y>115</y>
<width>85</width>
<height>20</height>
<foreground_color>
@@ -331,29 +360,29 @@
<color name="BLACK-TEXT" red="255" green="255" blue="255">
</color>
</background_color>
- <tooltip>$(actions)</tooltip>
+ <actions>
+ </actions>
+ <border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
- <widget type="textupdate" version="2.0.0">
- <name>Text Update</name>
- <pv_name>$(P)$(R)TSAcquiring</pv_name>
- <x>403</x>
- <y>71</y>
- <width>85</width>
+ <widget type="label" version="2.0.0">
+ <name>Label</name>
+ <text>AcquireMode:</text>
+ <x>382</x>
+ <y>115</y>
+ <width>110</width>
<foreground_color>
- <color name="BLACK" red="0" green="0" blue="0">
+ <color red="0" green="0" blue="0">
</color>
</foreground_color>
<background_color>
- <color name="BLACK-TEXT" red="255" green="255" blue="255">
+ <color red="255" green="255" blue="255">
</color>
</background_color>
- <format>6</format>
- <show_units>false</show_units>
+ <horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<wrap_words>false</wrap_words>
<actions>
</actions>
- <border_alarm_sensitive>false</border_alarm_sensitive>
<border_color>
<color red="0" green="128" blue="255">
</color>
@@ -363,14 +392,14 @@
<name>Action Button</name>
<actions>
<action type="write_pv">
- <pv_name>$(P)$(R)TSAcquire</pv_name>
- <value>0</value>
+ <pv_name>$(P)$(R)TSRead</pv_name>
+ <value>1</value>
</action>
</actions>
- <pv_name>$(P)$(R)TSAcquire</pv_name>
- <text>Stop</text>
- <x>290</x>
- <y>71</y>
+ <pv_name>$(P)$(R)TSRead</pv_name>
+ <text>Read</text>
+ <x>275</x>
+ <y>115</y>
<width>85</width>
<height>20</height>
<foreground_color>
@@ -382,35 +411,31 @@
</color>
</background_color>
</widget>
- <widget type="action_button" version="3.0.0">
- <name>Action Button</name>
- <actions>
- <action type="write_pv">
- <pv_name>$(P)$(R)TSAcquire</pv_name>
- <value>1</value>
- </action>
- </actions>
- <pv_name>$(P)$(R)TSAcquire</pv_name>
- <text>Erase/Start</text>
- <x>180</x>
- <y>71</y>
+ <widget type="combo" version="2.0.0">
+ <name>Menu Button</name>
+ <pv_name>$(P)$(R)TSRead.SCAN</pv_name>
+ <x>185</x>
+ <y>115</y>
<width>85</width>
<height>20</height>
<foreground_color>
- <color red="0" green="0" blue="0">
+ <color name="BLACK" red="0" green="0" blue="0">
</color>
</foreground_color>
<background_color>
<color name="BLACK-TEXT" red="255" green="255" blue="255">
</color>
</background_color>
+ <actions>
+ </actions>
+ <border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
<widget type="label" version="2.0.0">
<name>Label</name>
- <text>Acquire:</text>
- <x>90</x>
- <y>71</y>
- <width>70</width>
+ <text>Read rate:</text>
+ <x>70</x>
+ <y>115</y>
+ <width>90</width>
<foreground_color>
<color red="0" green="0" blue="0">
</color>
@@ -429,38 +454,68 @@
</color>
</border_color>
</widget>
- <widget type="rectangle" version="2.0.0">
- <name>Rectangle</name>
- <class>TITLE-BAR</class>
- <x use_class="true">0</x>
- <y use_class="true">0</y>
- <width>690</width>
- <height use_class="true">50</height>
- <line_width use_class="true">0</line_width>
- <background_color use_class="true">
- <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+ <widget type="label" version="2.0.0">
+ <name>Label</name>
+ <text>Number of points:</text>
+ <y>150</y>
+ <width>160</width>
+ <foreground_color>
+ <color red="0" green="0" blue="0">
+ </color>
+ </foreground_color>
+ <background_color>
+ <color red="255" green="255" blue="255">
+ </color>
+ </background_color>
+ <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="textentry" version="3.0.0">
+ <name>Text Input</name>
+ <pv_name>$(P)$(R)TSNumPoints</pv_name>
+ <x>185</x>
+ <y>150</y>
+ <width>85</width>
+ <foreground_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </foreground_color>
+ <background_color>
+ <color name="BLACK-TEXT" red="255" green="255" blue="255">
</color>
</background_color>
+ <format>1</format>
+ <show_units>false</show_units>
+ <actions>
+ </actions>
+ <border_alarm_sensitive>false</border_alarm_sensitive>
+ <border_color>
+ <color red="0" green="128" blue="255">
+ </color>
+ </border_color>
</widget>
<widget type="label" version="2.0.0">
<name>Label</name>
- <text></text>
- <x>620</x>
- <y>330</y>
- <width>500</width>
- <font>
- <font family="Sans" style="REGULAR" size="10.891089108910892">
- </font>
- </font>
+ <text>Current point:</text>
+ <x>360</x>
+ <y>150</y>
+ <width>130</width>
<foreground_color>
- <color red="10" green="0" blue="184">
+ <color red="0" green="0" blue="0">
</color>
</foreground_color>
<background_color>
<color red="255" green="255" blue="255">
</color>
</background_color>
- <horizontal_alignment>1</horizontal_alignment>
+ <horizontal_alignment>2</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<wrap_words>false</wrap_words>
<actions>
@@ -470,13 +525,74 @@
</color>
</border_color>
</widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update</name>
+ <pv_name>$(P)$(R)TSCurrentPoint</pv_name>
+ <x>510</x>
+ <y>150</y>
+ <width>85</width>
+ <foreground_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </foreground_color>
+ <background_color>
+ <color name="BLACK-TEXT" red="255" green="255" blue="255">
+ </color>
+ </background_color>
+ <format>1</format>
+ <show_units>false</show_units>
+ <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="action_button" version="3.0.0">
+ <name>Action Button</name>
+ <actions>
+ <action type="open_display">
+ <file>NDPluginTimeSeries.opi</file>
+ <target>tab</target>
+ <description>Time series plugin</description>
+ </action>
+ </actions>
+ <text>More</text>
+ <x>185</x>
+ <y>223</y>
+ <height>20</height>
+ <foreground_color>
+ <color name="BLACK" red="0" green="0" blue="0">
+ </color>
+ </foreground_color>
+ <background_color>
+ <color name="BLACK-TEXT" red="255" green="255" blue="255">
+ </color>
+ </background_color>
+ <tooltip>$(actions)</tooltip>
+ </widget>
+ <widget type="rectangle" version="2.0.0">
+ <name>Rectangle</name>
+ <class>TITLE-BAR</class>
+ <x use_class="true">0</x>
+ <y use_class="true">0</y>
+ <width>690</width>
+ <height use_class="true">50</height>
+ <line_width use_class="true">0</line_width>
+ <background_color use_class="true">
+ <color name="PRIMARY-HEADER-BACKGROUND" red="151" green="188" blue="202">
+ </color>
+ </background_color>
+ </widget>
<widget type="label" version="2.0.0">
<name>Label_1</name>
<class>TITLE</class>
- <text>$(P)$(RN)</text>
+ <text>$(P)$(RN)Name</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
- <width>740</width>
+ <width>390</width>
<height use_class="true">50</height>
<font use_class="true">
<font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
--
GitLab