Skip to content
Snippets Groups Projects
Commit 5e1ada0f authored by Thomas Fay's avatar Thomas Fay
Browse files

Merge branch 'master' into 'master'

Master

See merge request !211
parents 43959c2d eebaed4b
No related branches found
No related tags found
1 merge request!211Master
Pipeline #39814 passed
...@@ -24,19 +24,19 @@ ...@@ -24,19 +24,19 @@
<rule name="alarmRule" prop_id="background_color" out_exp="false"> <rule name="alarmRule" prop_id="background_color" out_exp="false">
<exp bool_exp="pv0==1"> <exp bool_exp="pv0==1">
<value> <value>
<color name="MAJOR" red="255" green="0" blue="0"> <color name="MAJOR" red="252" green="13" blue="27">
</color> </color>
</value> </value>
</exp> </exp>
<exp bool_exp="pv1==1"> <exp bool_exp="pv1==1">
<value> <value>
<color name="Attention" red="255" green="160" blue="0"> <color name="Attention" red="252" green="242" blue="17">
</color> </color>
</value> </value>
</exp> </exp>
<exp bool_exp="(pv0==0) &amp;&amp; (pv1==0)"> <exp bool_exp="(pv0==0) &amp;&amp; (pv1==0)">
<value> <value>
<color name="OK" red="0" green="255" blue="0"> <color name="OK" red="61" green="216" blue="61">
</color> </color>
</value> </value>
</exp> </exp>
......
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0"> <display version="2.0.0">
<name>rflpsAFsignal_v03</name> <name>rflpsAFsignal_v03</name>
<width>740</width> <width use_class="true">1200</width>
<height>710</height> <height use_class="true">900</height>
<actions> <actions>
</actions> </actions>
<widget type="group" version="2.0.0"> <widget type="group" version="2.0.0">
...@@ -764,7 +764,7 @@ $(pv_value)</tooltip> ...@@ -764,7 +764,7 @@ $(pv_value)</tooltip>
<pv_name>$(PREFIX):$(SGNL).DESC</pv_name> <pv_name>$(PREFIX):$(SGNL).DESC</pv_name>
<x>14</x> <x>14</x>
<y>33</y> <y>33</y>
<width>340</width> <width>376</width>
<background_color> <background_color>
<color name="RED" red="252" green="13" blue="27"> <color name="RED" red="252" green="13" blue="27">
</color> </color>
...@@ -786,7 +786,7 @@ $(pv_value)</tooltip> ...@@ -786,7 +786,7 @@ $(pv_value)</tooltip>
<text>NULL</text> <text>NULL</text>
<x>14</x> <x>14</x>
<y>5</y> <y>5</y>
<width>306</width> <width>376</width>
<height>30</height> <height>30</height>
<font> <font>
<font family="Source Sans Pro" style="BOLD" size="18.0"> <font family="Source Sans Pro" style="BOLD" size="18.0">
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0"> <display version="2.0.0">
<name>rflpsDIOsignal_v03.bob</name> <name>rflpsDIOsignal_v03.bob</name>
<width>660</width> <width use_class="true">1200</width>
<height>520</height> <height use_class="true">900</height>
<actions> <actions>
</actions> </actions>
<grid_visible>false</grid_visible> <grid_visible>false</grid_visible>
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<text>$(PREFIX):$(SGNL)</text> <text>$(PREFIX):$(SGNL)</text>
<x>10</x> <x>10</x>
<y>5</y> <y>5</y>
<width>300</width> <width>380</width>
<height>30</height> <height>30</height>
<font> <font>
<font family="Source Sans Pro" style="BOLD" size="18.0"> <font family="Source Sans Pro" style="BOLD" size="18.0">
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
<pv_name>$(PREFIX):$(SGNL).DESC</pv_name> <pv_name>$(PREFIX):$(SGNL).DESC</pv_name>
<x>10</x> <x>10</x>
<y>32</y> <y>32</y>
<width>300</width> <width>380</width>
<background_color> <background_color>
<color name="Background" red="220" green="225" blue="221"> <color name="Background" red="220" green="225" blue="221">
</color> </color>
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment