diff --git a/NON-APPROVED/odh/ODH_Expert_Monit.bob b/NON-APPROVED/odh/ODH_Expert_Monit.bob
index 5274c67f6a20faa1310a3c2c2ecdefce8f7669fe..a0c72f007ea6f7cf9a95a07955e09f2f45a00e91 100644
--- a/NON-APPROVED/odh/ODH_Expert_Monit.bob
+++ b/NON-APPROVED/odh/ODH_Expert_Monit.bob
@@ -2,13 +2,13 @@
<display version="2.0.0">
<name>ODH Monitor</name>
<width>300</width>
- <height>410</height>
+ <height>450</height>
<widget type="group" version="2.0.0">
<name>Monitors Panel</name>
<x>10</x>
<y>10</y>
<width>280</width>
- <height>390</height>
+ <height>430</height>
<style>3</style>
<background_color>
<color name="BACKGROUND" red="220" green="225" blue="221">
@@ -17,7 +17,7 @@
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-titlebar_1</name>
<width>280</width>
- <height>390</height>
+ <height>430</height>
<line_width>0</line_width>
<background_color>
<color name="GROUP-BORDER" red="150" green="155" blue="151">
@@ -31,13 +31,13 @@
<x>10</x>
<y>50</y>
<width>260</width>
- <height>330</height>
+ <height>370</height>
<style>3</style>
<transparent>true</transparent>
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-background_1</name>
<width>260</width>
- <height>330</height>
+ <height>370</height>
<line_width>0</line_width>
<background_color>
<color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
@@ -51,13 +51,62 @@
<x>10</x>
<y>10</y>
<width>240</width>
- <height>310</height>
+ <height>350</height>
<style>3</style>
+ <widget type="label" version="2.0.0">
+ <name>LB_O2LEVEL</name>
+ <text>Oxygen Level:</text>
+ <x>20</x>
+ <y>20</y>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="textupdate" version="2.0.0">
+ <name>Text Update_O2Level</name>
+ <pv_name>$(P):O2Level</pv_name>
+ <x>126</x>
+ <y>20</y>
+ <width>62</width>
+ <precision>1</precision>
+ <horizontal_alignment>2</horizontal_alignment>
+ <vertical_alignment>1</vertical_alignment>
+ <wrap_words>false</wrap_words>
+ </widget>
+ <widget type="action_button" version="3.0.0">
+ <name>Action Button</name>
+ <actions>
+ <action type="open_display">
+ <file>ODH_Trend.bob</file>
+ <target>standalone</target>
+ <description>Open Trend window</description>
+ </action>
+ </actions>
+ <text>Open Trend Window</text>
+ <x>20</x>
+ <y>59</y>
+ <width>168</width>
+ <tooltip>$(actions)</tooltip>
+ </widget>
+ <widget type="rectangle" version="2.0.0">
+ <name>Rectangle_3</name>
+ <x>20</x>
+ <y>98</y>
+ <width>200</width>
+ <height>1</height>
+ <line_width>1</line_width>
+ <line_color>
+ <color name="Grid" red="169" green="169" blue="169">
+ </color>
+ </line_color>
+ <background_color>
+ <color name="Grid" red="169" green="169" blue="169">
+ </color>
+ </background_color>
+ </widget>
<widget type="led" version="2.0.0">
<name>LED_LA</name>
<pv_name>$(P):ODHAlarm</pv_name>
<x>24</x>
- <y>78</y>
+ <y>118</y>
<off_color>
<color name="Grid" red="169" green="169" blue="169">
</color>
@@ -71,7 +120,7 @@
<name>LED_LB</name>
<pv_name>$(P):ODHWarning</pv_name>
<x>24</x>
- <y>105</y>
+ <y>145</y>
<off_color>
<color name="Grid" red="169" green="169" blue="169">
</color>
@@ -85,7 +134,7 @@
<name>LED_OK</name>
<pv_name>$(P):MonitHealthyErr</pv_name>
<x>24</x>
- <y>132</y>
+ <y>172</y>
<off_color>
<color name="LED-GREEN-ON" red="70" green="255" blue="70">
</color>
@@ -99,7 +148,7 @@
<name>LED_WARNING</name>
<pv_name>$(P):Maint</pv_name>
<x>24</x>
- <y>160</y>
+ <y>200</y>
<off_color>
<color name="Grid" red="169" green="169" blue="169">
</color>
@@ -113,7 +162,7 @@
<name>LED_ALARM</name>
<pv_name>$(P):MonitWarning</pv_name>
<x>24</x>
- <y>187</y>
+ <y>227</y>
<off_color>
<color name="Grid" red="169" green="169" blue="169">
</color>
@@ -127,7 +176,7 @@
<name>LB_LA</name>
<text>ODH Alarm (18%)</text>
<x>72</x>
- <y>78</y>
+ <y>118</y>
<width>116</width>
<height>21</height>
<vertical_alignment>1</vertical_alignment>
@@ -137,7 +186,7 @@
<name>LB_LB</name>
<text>ODH Warning (19.5%)</text>
<x>72</x>
- <y>105</y>
+ <y>145</y>
<width>160</width>
<vertical_alignment>1</vertical_alignment>
</widget>
@@ -145,7 +194,7 @@
<name>LB_OK</name>
<text>Monitor Healthy</text>
<x>72</x>
- <y>132</y>
+ <y>172</y>
<width>108</width>
<height>21</height>
<vertical_alignment>1</vertical_alignment>
@@ -155,39 +204,22 @@
<name>LB_WARNING</name>
<text>Maintenance</text>
<x>72</x>
- <y>160</y>
+ <y>200</y>
<vertical_alignment>1</vertical_alignment>
</widget>
<widget type="label" version="2.0.0">
<name>LB_ALARM</name>
<text>Monitor Warning</text>
<x>72</x>
- <y>187</y>
+ <y>227</y>
<width>150</width>
<vertical_alignment>1</vertical_alignment>
</widget>
- <widget type="textupdate" version="2.0.0">
- <name>Text Update_O2Level</name>
- <pv_name>$(P):O2Level</pv_name>
- <x>126</x>
- <y>20</y>
- <width>52</width>
- <precision>1</precision>
- <horizontal_alignment>2</horizontal_alignment>
- <vertical_alignment>1</vertical_alignment>
- <wrap_words>false</wrap_words>
- </widget>
- <widget type="label" version="2.0.0">
- <name>LB_O2LEVEL</name>
- <text>Oxygen Level:</text>
- <x>20</x>
- <y>20</y>
- </widget>
<widget type="led" version="2.0.0">
<name>LED_ALARM_1</name>
<pv_name>$(P):WarmUp</pv_name>
<x>24</x>
- <y>215</y>
+ <y>255</y>
<off_color>
<color name="LED-RED-ON" red="255" green="60" blue="46">
</color>
@@ -201,7 +233,7 @@
<name>LB_ALARM_1</name>
<text>Warm-Up Status</text>
<x>72</x>
- <y>215</y>
+ <y>255</y>
<width>110</width>
<height>21</height>
<vertical_alignment>1</vertical_alignment>
@@ -211,7 +243,7 @@
<name>LED_ALARM_2</name>
<pv_name>$(P):SysOK</pv_name>
<x>24</x>
- <y>242</y>
+ <y>282</y>
<off_color>
<color name="Grid" red="169" green="169" blue="169">
</color>
@@ -225,7 +257,7 @@
<name>LB_ALARM_2</name>
<text>SysOK</text>
<x>72</x>
- <y>242</y>
+ <y>282</y>
<width>43</width>
<height>21</height>
<vertical_alignment>1</vertical_alignment>
@@ -235,7 +267,7 @@
<name>LED_ALARM_3</name>
<pv_name>$(P):ConnLost</pv_name>
<x>24</x>
- <y>268</y>
+ <y>308</y>
<off_color>
<color name="Grid" red="169" green="169" blue="169">
</color>
@@ -249,28 +281,12 @@
<name>LB_ALARM_3</name>
<text>Lost Communication</text>
<x>72</x>
- <y>268</y>
+ <y>308</y>
<width>140</width>
<height>21</height>
<vertical_alignment>1</vertical_alignment>
<auto_size>true</auto_size>
</widget>
- <widget type="rectangle" version="2.0.0">
- <name>Rectangle_3</name>
- <x>20</x>
- <y>58</y>
- <width>200</width>
- <height>1</height>
- <line_width>1</line_width>
- <line_color>
- <color name="Grid" red="169" green="169" blue="169">
- </color>
- </line_color>
- <background_color>
- <color name="Grid" red="169" green="169" blue="169">
- </color>
- </background_color>
- </widget>
</widget>
</widget>
<widget type="label" version="2.0.0">
@@ -279,7 +295,7 @@
<width>280</width>
<height>50</height>
<font>
- <font family="Source Sans Pro" style="BOLD_ITALIC" size="20.0">
+ <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
</font>
</font>
<foreground_color>
diff --git a/NON-APPROVED/odh/ODH_Trend.bob b/NON-APPROVED/odh/ODH_Trend.bob
new file mode 100644
index 0000000000000000000000000000000000000000..fb589deb7fdaa91b88431ad38d894acdf3dd3630
--- /dev/null
+++ b/NON-APPROVED/odh/ODH_Trend.bob
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<display version="2.0.0">
+ <name>ODH Trend</name>
+ <width>2200</width>
+ <height>1200</height>
+ <widget type="rectangle" version="2.0.0">
+ <name>Rectangle</name>
+ <x>10</x>
+ <y>10</y>
+ <width>2180</width>
+ <height>50</height>
+ <line_width>0</line_width>
+ <background_color>
+ <color name="GROUP-BORDER" red="150" green="155" blue="151">
+ </color>
+ </background_color>
+ <corner_width>10</corner_width>
+ <corner_height>10</corner_height>
+ </widget>
+ <widget type="label" version="2.0.0">
+ <name>Label</name>
+ <text>Oxygen concentration trend for $(P)</text>
+ <x>30</x>
+ <y>20</y>
+ <width>1000</width>
+ <height>30</height>
+ <font>
+ <font name="Header 2" family="Source Sans Pro" style="BOLD_ITALIC" size="21.0">
+ </font>
+ </font>
+ <vertical_alignment>1</vertical_alignment>
+ </widget>
+ <widget type="databrowser" version="2.0.0">
+ <name>Data Browser</name>
+ <file>ODH_Trend.plt</file>
+ <x>20</x>
+ <y>80</y>
+ <width>2160</width>
+ <height>1100</height>
+ </widget>
+</display>
diff --git a/NON-APPROVED/odh/ODH_Trend.plt b/NON-APPROVED/odh/ODH_Trend.plt
new file mode 100644
index 0000000000000000000000000000000000000000..16e93e63c074cb83f07fa626d3e5e61622054640
--- /dev/null
+++ b/NON-APPROVED/odh/ODH_Trend.plt
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<databrowser>
+ <title></title>
+ <save_changes>true</save_changes>
+ <show_legend>false</show_legend>
+ <show_toolbar>true</show_toolbar>
+ <grid>false</grid>
+ <scroll>true</scroll>
+ <update_period>3.0</update_period>
+ <scroll_step>5</scroll_step>
+ <start>-1.00 h</start>
+ <end>now</end>
+ <archive_rescale>NONE</archive_rescale>
+ <foreground>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </foreground>
+ <background>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </background>
+ <title_font>Liberation Sans|20|1</title_font>
+ <label_font>Liberation Sans|14|1</label_font>
+ <scale_font>Liberation Sans|12|0</scale_font>
+ <legend_font>Liberation Sans|14|0</legend_font>
+ <axes>
+ <axis>
+ <visible>true</visible>
+ <name>Oxygen contentration</name>
+ <use_axis_name>true</use_axis_name>
+ <use_trace_names>false</use_trace_names>
+ <right>false</right>
+ <color>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ <min>0.0</min>
+ <max>100.0</max>
+ <grid>false</grid>
+ <autoscale>false</autoscale>
+ <log_scale>false</log_scale>
+ </axis>
+ </axes>
+ <annotations>
+ </annotations>
+ <pvlist>
+ <pv>
+ <display_name>Oxygen concentration</display_name>
+ <visible>true</visible>
+ <name>$(P):O2Level</name>
+ <axis>0</axis>
+ <color>
+ <red>255</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ <trace_type>LINES</trace_type>
+ <linewidth>1</linewidth>
+ <point_type>NONE</point_type>
+ <point_size>2</point_size>
+ <waveform_index>0</waveform_index>
+ <period>0.0</period>
+ <ring_size>5000</ring_size>
+ <request>RAW</request>
+ <archive>
+ <name>ESS Archiver</name>
+ <url>pbraw://archiver-02.tn.esss.lu.se:17668/retrieval</url>
+ <key>1</key>
+ </archive>
+ </pv>
+ </pvlist>
+</databrowser>