Added check for invalid frequencies

Author: DominicOram

base/uk.ac.stfc.isis.ibex.opis/resources/astrium_choppers/astrium_choppers.opi

@@ -172,7 +172,7 @@
     <tooltip></tooltip>
     <visible>true</visible>
     <widget_type>Tabbed Container</widget_type>
-    <width>661</width>
+    <width>619</width>
     <wuid>1a3f5bca:1687651dcc1:-72de</wuid>
     <x>6</x>
     <y>78</y>
@@ -212,7 +212,7 @@
       <transparent>true</transparent>
       <visible>true</visible>
       <widget_type>Grouping Container</widget_type>
-      <width>659</width>
+      <width>617</width>
       <wuid>1a3f5bca:1687651dcc1:-72dd</wuid>
       <x>1</x>
       <y>1</y>
@@ -234,7 +234,7 @@
           <color name="ISIS_OPI_Foreground" red="192" green="192" blue="192" />
         </foreground_color>
         <group_name></group_name>
-        <height>272</height>
+        <height>290</height>
         <macros>
           <include_parent_macros>true</include_parent_macros>
           <PV_ROOT>$(P)$(ASTRIUM):CH1</PV_ROOT>
@@ -294,7 +294,7 @@
       <transparent>true</transparent>
       <visible>false</visible>
       <widget_type>Grouping Container</widget_type>
-      <width>659</width>
+      <width>617</width>
       <wuid>1a3f5bca:1687651dcc1:-72d9</wuid>
       <x>1</x>
       <y>1</y>
@@ -357,7 +357,7 @@
           <color name="ISIS_OPI_Foreground" red="192" green="192" blue="192" />
         </foreground_color>
         <group_name></group_name>
-        <height>272</height>
+        <height>290</height>
         <macros>
           <include_parent_macros>true</include_parent_macros>
           <PV_ROOT>$(P)$(ASTRIUM):CH2</PV_ROOT>
@@ -435,7 +435,7 @@ $(pv_value)</tooltip>
     <widget_type>Action Button</widget_type>
     <width>90</width>
     <wuid>1a3f5bca:1687651dcc1:-6fa0</wuid>
-    <x>577</x>
+    <x>535</x>
     <y>420</y>
   </widget>
 </display>

base/uk.ac.stfc.isis.ibex.opis/resources/astrium_choppers/single_chopper.opi

@@ -872,10 +872,10 @@ $(pv_value)</tooltip>
     <transparent>false</transparent>
     <visible>true</visible>
     <widget_type>Grouping Container</widget_type>
-    <width>319</width>
+    <width>277</width>
     <wuid>2f70796b:15b334751c5:-73ad</wuid>
-    <x>276</x>
-    <y>114</y>
+    <x>0</x>
+    <y>132</y>
     <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
       <actions hook="false" hook_all="false" />
       <auto_size>false</auto_size>
@@ -1342,4 +1342,53 @@ $(pv_value)</tooltip>
       <y>102</y>
     </widget>
   </widget>
+  <widget typeId="org.csstudio.opibuilder.widgets.Label" version="1.0.0">
+    <actions hook="false" hook_all="false" />
+    <auto_size>false</auto_size>
+    <background_color>
+      <color name="ISIS_Label_Background" red="240" green="240" blue="240" />
+    </background_color>
+    <border_color>
+      <color name="ISIS_Border" red="0" green="0" blue="0" />
+    </border_color>
+    <border_style>0</border_style>
+    <border_width>1</border_width>
+    <enabled>true</enabled>
+    <font>
+      <opifont.name fontName="Segoe UI" height="9" style="1" pixels="false">ISIS_Label_NEW</opifont.name>
+    </font>
+    <foreground_color>
+      <color name="Major" red="255" green="0" blue="0" />
+    </foreground_color>
+    <height>35</height>
+    <horizontal_alignment>0</horizontal_alignment>
+    <name>Label_2</name>
+    <rules>
+      <rule name="Disallowed Value" prop_id="visible" out_exp="false">
+        <exp bool_exp="pv0 != pv1">
+          <value>true</value>
+        </exp>
+        <pv trig="true">$(PV_ROOT):FREQ:SP</pv>
+        <pv trig="true">$(PV_ROOT):FREQ:SP_ACTUAL</pv>
+      </rule>
+    </rules>
+    <scale_options>
+      <width_scalable>true</width_scalable>
+      <height_scalable>true</height_scalable>
+      <keep_wh_ratio>false</keep_wh_ratio>
+    </scale_options>
+    <scripts />
+    <show_scrollbar>false</show_scrollbar>
+    <text>The specified frequency setpoint is not allowed for the device</text>
+    <tooltip></tooltip>
+    <transparent>false</transparent>
+    <vertical_alignment>1</vertical_alignment>
+    <visible>false</visible>
+    <widget_type>Label</widget_type>
+    <width>199</width>
+    <wrap_words>true</wrap_words>
+    <wuid>62e32fa0:16894c76a10:-7ea9</wuid>
+    <x>336</x>
+    <y>120</y>
+  </widget>
 </display>