diff --git a/99-Shared/adcore/NDStatsTimeSeriesPlot.bob b/99-Shared/adcore/NDStatsTimeSeriesPlot.bob
index ef7523d10dc34060668bfef42e1152e4296dbc80..0564cf57adefd58e11249d49a2443c13cd595c69 100644
--- a/99-Shared/adcore/NDStatsTimeSeriesPlot.bob
+++ b/99-Shared/adcore/NDStatsTimeSeriesPlot.bob
@@ -3,34 +3,65 @@
<name>NDStatsTimeSeriesPlot</name>
<x>370</x>
<y>223</y>
- <width>500</width>
- <height>415</height>
+ <width>700</width>
+ <height>700</height>
<background_color>
- <color red="187" green="187" blue="187">
+ <color red="240" green="240" blue="240">
</color>
</background_color>
- <grid_visible>false</grid_visible>
- <grid_step_x>5</grid_step_x>
+ <actions>
+ </actions>
+ <widget type="rectangle" version="2.0.0">
+ <name>BGGrey02-background_1</name>
+ <y>50</y>
+ <width>690</width>
+ <height>510</height>
+ <line_width>2</line_width>
+ <line_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </line_color>
+ <background_color>
+ <color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
+ </color>
+ </background_color>
+ <corner_height>10</corner_height>
+ </widget>
<widget type="xyplot" version="2.0.0">
- <name>cartesian plot #6</name>
- <x>5</x>
- <y>55</y>
- <width>490</width>
- <height>275</height>
+ <name>XY Graph</name>
+ <x>30</x>
+ <y>210</y>
+ <width>590</width>
+ <height>310</height>
+ <foreground_color>
+ <color red="0" green="0" blue="0">
+ </color>
+ </foreground_color>
+ <background_color>
+ <color red="240" green="240" blue="240">
+ </color>
+ </background_color>
<title>$(P)$(RN) Time Series</title>
+ <title_font>
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
+ </font>
+ </title_font>
+ <show_toolbar>true</show_toolbar>
+ <actions>
+ </actions>
<x_axis>
<title>Time (s)</title>
<autoscale>true</autoscale>
<log_scale>false</log_scale>
<minimum>0.0</minimum>
<maximum>100.0</maximum>
- <show_grid>false</show_grid>
+ <show_grid>true</show_grid>
<title_font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</title_font>
<scale_font>
- <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+ <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
</font>
</scale_font>
<visible>true</visible>
@@ -42,13 +73,13 @@
<log_scale>false</log_scale>
<minimum>0.0</minimum>
<maximum>100.0</maximum>
- <show_grid>false</show_grid>
+ <show_grid>true</show_grid>
<title_font>
- <font name="Default Bold" family="Liberation Sans" style="BOLD" size="14.0">
+ <font name="Default Bold" family="Source Sans Pro" style="BOLD" size="16.0">
</font>
</title_font>
<scale_font>
- <font name="Default" family="Liberation Sans" style="REGULAR" size="14.0">
+ <font name="Default" family="Source Sans Pro" style="REGULAR" size="16.0">
</font>
</scale_font>
<visible>true</visible>
@@ -69,243 +100,217 @@
<line_width>1</line_width>
<line_style>0</line_style>
<point_type>0</point_type>
- <point_size>10</point_size>
+ <point_size>4</point_size>
<visible>true</visible>
</trace>
</traces>
</widget>
- <widget type="group" version="2.0.0">
- <name>composite #13</name>
- <y>5</y>
- <width>500</width>
- <height>45</height>
- <style>3</style>
- <transparent>true</transparent>
- <widget type="label" version="2.0.0">
- <name>text #16</name>
- <text>$(P)$(RN)</text>
- <width>500</width>
- <font>
- <font family="Liberation Sans" style="REGULAR" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color red="10" green="0" blue="184">
- </color>
- </foreground_color>
- <horizontal_alignment>1</horizontal_alignment>
- </widget>
- <widget type="textupdate" version="2.0.0">
- <name>text update #19</name>
- <pv_name>$(P)$(R)TSAcquiring</pv_name>
- <x>282</x>
- <y>26</y>
- <height>18</height>
- <font>
- <font family="Liberation Sans" style="REGULAR" size="16.0">
- </font>
- </font>
- <foreground_color>
- <color red="10" green="0" blue="184">
- </color>
- </foreground_color>
- <background_color>
- <color red="70" green="70" blue="70">
- </color>
- </background_color>
- <format>6</format>
- <show_units>false</show_units>
- </widget>
- <widget type="action_button" version="3.0.0">
- <name>message button #23</name>
- <actions>
- <action type="write_pv">
- <pv_name>$(P)$(R)TSAcquire</pv_name>
- <value>0</value>
- <description>Write</description>
- </action>
- </actions>
- <pv_name>$(P)$(R)TSAcquire</pv_name>
- <text>Stop</text>
- <x>191</x>
- <y>25</y>
- <width>85</width>
- <height>20</height>
- <background_color>
- <color red="115" green="223" blue="255">
- </color>
- </background_color>
- </widget>
- <widget type="action_button" version="3.0.0">
- <name>message button #26</name>
- <actions>
- <action type="write_pv">
- <pv_name>$(P)$(R)TSAcquire</pv_name>
- <value>1</value>
- <description>Write</description>
- </action>
- </actions>
- <pv_name>$(P)$(R)TSAcquire</pv_name>
- <text>Erase/Start</text>
- <x>101</x>
- <y>25</y>
- <width>85</width>
- <height>20</height>
- <background_color>
- <color red="115" green="223" blue="255">
- </color>
- </background_color>
- </widget>
- <widget type="label" version="2.0.0">
- <name>text #29</name>
- <text>Acquire</text>
- <x>26</x>
- <y>25</y>
- <width>70</width>
- <font>
- <font family="Liberation Sans" style="REGULAR" size="16.0">
- </font>
- </font>
- <auto_size>true</auto_size>
- </widget>
- </widget>
<widget type="combo" version="2.0.0">
- <name>menu #32</name>
+ <name>Menu Button</name>
<pv_name>$(P)$(R)TSAcquireMode</pv_name>
- <x>395</x>
- <y>340</y>
+ <x>513</x>
+ <y>101</y>
<height>20</height>
+ <foreground_color>
+ <color red="0" green="0" blue="0">
+ </color>
+ </foreground_color>
<background_color>
- <color red="115" green="223" blue="255">
+ <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>text #35</name>
- <text>AcquireMode</text>
- <x>280</x>
- <y>340</y>
+ <name>Label</name>
+ <text>AcquireMode:</text>
+ <x>382</x>
+ <y>101</y>
<width>110</width>
- <font>
- <font family="Liberation Sans" style="REGULAR" size="16.0">
- </font>
- </font>
- <auto_size>true</auto_size>
+ <foreground_color>
+ <color name="BLACK" 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="action_button" version="3.0.0">
- <name>message button #38</name>
+ <name>Action Button</name>
<actions>
<action type="write_pv">
<pv_name>$(P)$(R)TSRead</pv_name>
<value>1</value>
- <description>Write</description>
</action>
</actions>
<pv_name>$(P)$(R)TSRead</pv_name>
<text>Read</text>
- <x>190</x>
- <y>340</y>
- <width>67</width>
+ <x>290</x>
+ <y>101</y>
+ <width>85</width>
<height>20</height>
+ <foreground_color>
+ <color red="0" green="0" blue="0">
+ </color>
+ </foreground_color>
<background_color>
- <color red="115" green="223" blue="255">
+ <color name="BLACK-TEXT" red="255" green="255" blue="255">
</color>
</background_color>
</widget>
<widget type="combo" version="2.0.0">
- <name>menu #41</name>
+ <name>Menu Button</name>
<pv_name>$(P)$(R)TSRead.SCAN</pv_name>
- <x>105</x>
- <y>341</y>
- <width>80</width>
- <height>18</height>
+ <x>180</x>
+ <y>101</y>
+ <width>85</width>
+ <height>20</height>
+ <foreground_color>
+ <color red="0" green="0" blue="0">
+ </color>
+ </foreground_color>
<background_color>
- <color red="115" green="223" blue="255">
+ <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>text #44</name>
- <text>Read rate</text>
- <x>10</x>
- <y>340</y>
+ <name>Label</name>
+ <text>Read rate:</text>
+ <x>71</x>
+ <y>104</y>
<width>90</width>
- <font>
- <font family="Liberation Sans" style="REGULAR" size="16.0">
- </font>
- </font>
- <auto_size>true</auto_size>
+ <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="label" version="2.0.0">
- <name>text #47</name>
- <text>Number of points</text>
- <x>10</x>
- <y>365</y>
+ <name>Label</name>
+ <text>Number of points:</text>
+ <y>134</y>
<width>160</width>
- <font>
- <font family="Liberation Sans" style="REGULAR" size="16.0">
- </font>
- </font>
+ <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 entry #50</name>
+ <name>Text Input</name>
<pv_name>$(P)$(R)TSNumPoints</pv_name>
- <x>175</x>
- <y>366</y>
- <width>60</width>
- <height>19</height>
- <font>
- <font family="Liberation Sans" style="REGULAR" size="16.0">
- </font>
- </font>
+ <x>180</x>
+ <y>132</y>
+ <width>85</width>
+ <foreground_color>
+ <color red="0" green="0" blue="0">
+ </color>
+ </foreground_color>
<background_color>
- <color red="115" green="223" blue="255">
+ <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>text #54</name>
- <text>Current point</text>
- <x>270</x>
- <y>365</y>
+ <name>Label</name>
+ <text>Current point:</text>
+ <x>360</x>
+ <y>132</y>
<width>130</width>
- <font>
- <font family="Liberation Sans" style="REGULAR" size="16.0">
- </font>
- </font>
+ <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="textupdate" version="2.0.0">
- <name>text update #57</name>
+ <name>Text Update</name>
<pv_name>$(P)$(R)TSCurrentPoint</pv_name>
- <x>405</x>
- <y>366</y>
+ <x>513</x>
+ <y>132</y>
<width>90</width>
- <height>18</height>
- <font>
- <font family="Liberation Sans" style="REGULAR" size="16.0">
- </font>
- </font>
<foreground_color>
- <color red="10" green="0" blue="184">
+ <color name="BLACK" red="0" green="0" blue="0">
</color>
</foreground_color>
<background_color>
- <color red="187" green="187" blue="187">
+ <color name="BLACK-TEXT" red="255" green="255" blue="255">
</color>
</background_color>
<format>1</format>
<show_units>false</show_units>
- <border_alarm_sensitive>false</border_alarm_sensitive>
+ <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>related display #61</name>
+ <name>Action Button</name>
<actions>
<action type="open_display">
<file>NDPluginTimeSeries.opi</file>
@@ -314,12 +319,176 @@
</action>
</actions>
<text>More</text>
- <x>10</x>
- <y>390</y>
+ <x>180</x>
+ <y>170</y>
+ <width>85</width>
+ <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>
+ <tooltip>$(actions)</tooltip>
+ </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>
+ <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="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>290</x>
+ <y>71</y>
+ <width>85</width>
+ <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>
+ </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>
+ <width>85</width>
<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>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label</name>
+ <text>Acquire:</text>
+ <x>90</x>
+ <y>71</y>
+ <width>70</width>
+ <foreground_color>
+ <color red="0" green="0" blue="0">
+ </color>
+ </foreground_color>
<background_color>
- <color red="115" green="223" blue="255">
+ <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="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</name>
+ <text></text>
+ <x>620</x>
+ <y>330</y>
+ <width>500</width>
+ <font>
+ <font family="Sans" style="REGULAR" size="10.891089108910892">
+ </font>
+ </font>
+ <foreground_color>
+ <color red="10" green="0" blue="184">
+ </color>
+ </foreground_color>
+ <background_color>
+ <color red="255" green="255" blue="255">
+ </color>
+ </background_color>
+ <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="label" version="2.0.0">
+ <name>Label_1</name>
+ <class>TITLE</class>
+ <text>$(P)$(RN)</text>
+ <x use_class="true">20</x>
+ <y use_class="true">0</y>
+ <width>740</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">
+ </font>
+ </font>
+ <foreground_color use_class="true">
+ <color name="HEADER-TEXT" red="0" green="0" blue="0">
+ </color>
+ </foreground_color>
+ <transparent use_class="true">true</transparent>
+ <horizontal_alignment use_class="true">0</horizontal_alignment>
+ <vertical_alignment use_class="true">1</vertical_alignment>
+ <wrap_words use_class="true">false</wrap_words>
</widget>
</display>