Skip to content
Snippets Groups Projects
Commit 7f4b2e1d authored by Hinko Kocevar's avatar Hinko Kocevar
Browse files

Merge branch 'master' into 'master' 

Fixed some graphical issues of some embedded / linked screens of the BPM.

See merge request opis/10-acc/999-pbi/engineer!3
parents 10f874ea 6caa9984
No related branches found
No related tags found
1 merge request!3Fixed some graphical issues of some embedded / linked screens of the BPM.
Hide whitespace changes
Inline Side-by-side
99-Shared/adsis8300bpm/aiChannelItem.bob
+ 12
− 14
View file @ 7f4b2e1d
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0"> <display version="2.0.0">
<class></class>
<width>307</width>
<height>20</height>
<background_color> <background_color>
<color red="240" green="240" blue="240"> <color red="240" green="240" blue="240">
</color> </color>
...@@ -9,11 +12,9 @@ ...@@ -9,11 +12,9 @@
<widget type="textupdate" version="2.0.0"> <widget type="textupdate" version="2.0.0">
<name>Text Update_75</name> <name>Text Update_75</name>
<pv_name>$(P)$(R)$(CH)Name</pv_name> <pv_name>$(P)$(R)$(CH)Name</pv_name>
<x>174</x>
<y>72</y>
<width>145</width> <width>145</width>
<font> <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> </font>
</font> </font>
<background_color> <background_color>
...@@ -33,8 +34,8 @@ ...@@ -33,8 +34,8 @@
<widget type="led" version="2.0.0"> <widget type="led" version="2.0.0">
<name>LED_1</name> <name>LED_1</name>
<pv_name>$(P)$(R)$(CH)ControlR</pv_name> <pv_name>$(P)$(R)$(CH)ControlR</pv_name>
<x>320</x> <x>146</x>
<y>74</y> <y>2</y>
<width>16</width> <width>16</width>
<height>16</height> <height>16</height>
<off_color> <off_color>
...@@ -66,12 +67,11 @@ ...@@ -66,12 +67,11 @@
</actions> </actions>
<pv_name>$(P)$(R)$(CH)Control</pv_name> <pv_name>$(P)$(R)$(CH)Control</pv_name>
<text>Enable</text> <text>Enable</text>
<x>337</x> <x>163</x>
<y>72</y>
<width>43</width> <width>43</width>
<height>20</height> <height>20</height>
<font> <font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0"> <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font> </font>
</font> </font>
<background_color> <background_color>
...@@ -89,12 +89,11 @@ ...@@ -89,12 +89,11 @@
</actions> </actions>
<pv_name>$(P)$(R)$(CH)Control</pv_name> <pv_name>$(P)$(R)$(CH)Control</pv_name>
<text>Disable</text> <text>Disable</text>
<x>379</x> <x>205</x>
<y>72</y>
<width>43</width> <width>43</width>
<height>20</height> <height>20</height>
<font> <font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0"> <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font> </font>
</font> </font>
<background_color> <background_color>
...@@ -111,12 +110,11 @@ ...@@ -111,12 +110,11 @@
</action> </action>
</actions> </actions>
<text>More..</text> <text>More..</text>
<x>432</x> <x>258</x>
<y>72</y>
<width>49</width> <width>49</width>
<height>20</height> <height>20</height>
<font> <font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0"> <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font> </font>
</font> </font>
<background_color> <background_color>
......
99-Shared/adsis8300bpm/bpmChannelAverageItem.bob
+ 12
− 14
View file @ 7f4b2e1d
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0"> <display version="2.0.0">
<class></class>
<width>307</width>
<height>20</height>
<background_color> <background_color>
<color red="240" green="240" blue="240"> <color red="240" green="240" blue="240">
</color> </color>
...@@ -9,11 +12,9 @@ ...@@ -9,11 +12,9 @@
<widget type="textupdate" version="2.0.0"> <widget type="textupdate" version="2.0.0">
<name>Text Update_75</name> <name>Text Update_75</name>
<pv_name>$(P)$(R)$(CH)Name</pv_name> <pv_name>$(P)$(R)$(CH)Name</pv_name>
<x>240</x>
<y>75</y>
<width>145</width> <width>145</width>
<font> <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> </font>
</font> </font>
<background_color> <background_color>
...@@ -33,8 +34,8 @@ ...@@ -33,8 +34,8 @@
<widget type="led" version="2.0.0"> <widget type="led" version="2.0.0">
<name>LED_1</name> <name>LED_1</name>
<pv_name>$(P)$(R)$(CH)Status</pv_name> <pv_name>$(P)$(R)$(CH)Status</pv_name>
<x>386</x> <x>146</x>
<y>77</y> <y>2</y>
<width>16</width> <width>16</width>
<height>16</height> <height>16</height>
<off_color> <off_color>
...@@ -66,12 +67,11 @@ ...@@ -66,12 +67,11 @@
</actions> </actions>
<pv_name>$(P)$(R)$(CH)Control</pv_name> <pv_name>$(P)$(R)$(CH)Control</pv_name>
<text>Enable</text> <text>Enable</text>
<x>403</x> <x>163</x>
<y>75</y>
<width>43</width> <width>43</width>
<height>20</height> <height>20</height>
<font> <font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0"> <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font> </font>
</font> </font>
<background_color> <background_color>
...@@ -89,12 +89,11 @@ ...@@ -89,12 +89,11 @@
</actions> </actions>
<pv_name>$(P)$(R)$(CH)Control</pv_name> <pv_name>$(P)$(R)$(CH)Control</pv_name>
<text>Disable</text> <text>Disable</text>
<x>445</x> <x>205</x>
<y>75</y>
<width>43</width> <width>43</width>
<height>20</height> <height>20</height>
<font> <font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0"> <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font> </font>
</font> </font>
<background_color> <background_color>
...@@ -111,12 +110,11 @@ ...@@ -111,12 +110,11 @@
</action> </action>
</actions> </actions>
<text>More..</text> <text>More..</text>
<x>498</x> <x>258</x>
<y>75</y>
<width>49</width> <width>49</width>
<height>20</height> <height>20</height>
<font> <font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0"> <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font> </font>
</font> </font>
<background_color> <background_color>
......
99-Shared/adsis8300bpm/bpmChannelItem.bob
+ 12
− 14
View file @ 7f4b2e1d
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<display version="2.0.0"> <display version="2.0.0">
<class></class>
<width>307</width>
<height>20</height>
<background_color> <background_color>
<color red="240" green="240" blue="240"> <color red="240" green="240" blue="240">
</color> </color>
...@@ -9,11 +12,9 @@ ...@@ -9,11 +12,9 @@
<widget type="textupdate" version="2.0.0"> <widget type="textupdate" version="2.0.0">
<name>Text Update_75</name> <name>Text Update_75</name>
<pv_name>$(P)$(R)$(CH)Name</pv_name> <pv_name>$(P)$(R)$(CH)Name</pv_name>
<x>240</x>
<y>75</y>
<width>145</width> <width>145</width>
<font> <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> </font>
</font> </font>
<background_color> <background_color>
...@@ -33,8 +34,8 @@ ...@@ -33,8 +34,8 @@
<widget type="led" version="2.0.0"> <widget type="led" version="2.0.0">
<name>LED_1</name> <name>LED_1</name>
<pv_name>$(P)$(R)$(CH)Status</pv_name> <pv_name>$(P)$(R)$(CH)Status</pv_name>
<x>386</x> <x>146</x>
<y>77</y> <y>2</y>
<width>16</width> <width>16</width>
<height>16</height> <height>16</height>
<off_color> <off_color>
...@@ -66,12 +67,11 @@ ...@@ -66,12 +67,11 @@
</actions> </actions>
<pv_name>$(P)$(R)$(CH)Control</pv_name> <pv_name>$(P)$(R)$(CH)Control</pv_name>
<text>Enable</text> <text>Enable</text>
<x>403</x> <x>163</x>
<y>75</y>
<width>43</width> <width>43</width>
<height>20</height> <height>20</height>
<font> <font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0"> <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font> </font>
</font> </font>
<background_color> <background_color>
...@@ -89,12 +89,11 @@ ...@@ -89,12 +89,11 @@
</actions> </actions>
<pv_name>$(P)$(R)$(CH)Control</pv_name> <pv_name>$(P)$(R)$(CH)Control</pv_name>
<text>Disable</text> <text>Disable</text>
<x>445</x> <x>205</x>
<y>75</y>
<width>43</width> <width>43</width>
<height>20</height> <height>20</height>
<font> <font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0"> <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font> </font>
</font> </font>
<background_color> <background_color>
...@@ -111,12 +110,11 @@ ...@@ -111,12 +110,11 @@
</action> </action>
</actions> </actions>
<text>More..</text> <text>More..</text>
<x>498</x> <x>258</x>
<y>75</y>
<width>49</width> <width>49</width>
<height>20</height> <height>20</height>
<font> <font>
<font name="Fine Print" family="Liberation Sans" style="REGULAR" size="12.0"> <font name="Fine Print" family="Source Sans Pro" style="REGULAR" size="14.0">
</font> </font>
</font> </font>
<background_color> <background_color>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment