Skip to content
Snippets Groups Projects
Commit ee007b29 authored by Anders Harrisson's avatar Anders Harrisson
Browse files

Merge branch 'master' into 'master'

Fixed a swapped PV.

See merge request !284
parents 84045cb8 6c0cae69
No related branches found
No related tags found
1 merge request!284Fixed a swapped PV.
Pipeline #96380 failed
...@@ -570,7 +570,7 @@ $(pv_value)</tooltip> ...@@ -570,7 +570,7 @@ $(pv_value)</tooltip>
<height>151</height> <height>151</height>
<macros> <macros>
<include_parent_macros>true</include_parent_macros> <include_parent_macros>true</include_parent_macros>
<PRE>CDS:TestWOCC:</PRE> <PRE>CDS:TestWCC:</PRE>
<STARTCMD>WOCCTestCmd:StrtStop</STARTCMD> <STARTCMD>WOCCTestCmd:StrtStop</STARTCMD>
</macros> </macros>
<name>Linking Container_3</name> <name>Linking Container_3</name>
...@@ -710,7 +710,7 @@ $(pv_value)</tooltip> ...@@ -710,7 +710,7 @@ $(pv_value)</tooltip>
<height>151</height> <height>151</height>
<macros> <macros>
<include_parent_macros>true</include_parent_macros> <include_parent_macros>true</include_parent_macros>
<PRE>CDS:TestWCC:</PRE> <PRE>CDS:TestWOCC:</PRE>
<STARTCMD>WCCTestCmd:StrtStop</STARTCMD> <STARTCMD>WCCTestCmd:StrtStop</STARTCMD>
</macros> </macros>
<name>Linking Container_4</name> <name>Linking Container_4</name>
...@@ -771,4 +771,84 @@ $(pv_value)</tooltip> ...@@ -771,4 +771,84 @@ $(pv_value)</tooltip>
<x>439</x> <x>439</x>
<y>610</y> <y>610</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 red="255" green="255" blue="255" />
</background_color>
<border_color>
<color red="0" green="128" blue="255" />
</border_color>
<border_style>0</border_style>
<border_width>1</border_width>
<enabled>true</enabled>
<font>
<opifont.name fontName=".AppleSystemUIFont" height="11" style="0" pixels="false">Default</opifont.name>
</font>
<foreground_color>
<color red="0" green="0" blue="0" />
</foreground_color>
<height>20</height>
<horizontal_alignment>1</horizontal_alignment>
<name>Label_5</name>
<rules />
<scale_options>
<width_scalable>true</width_scalable>
<height_scalable>true</height_scalable>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<scripts />
<text>Reversed!</text>
<tooltip></tooltip>
<transparent>true</transparent>
<vertical_alignment>1</vertical_alignment>
<visible>false</visible>
<widget_type>Label</widget_type>
<width>80</width>
<wrap_words>false</wrap_words>
<wuid>-9c5837e:17bba1f3e9d:-7c14</wuid>
<x>700</x>
<y>608</y>
</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 red="255" green="255" blue="255" />
</background_color>
<border_color>
<color red="0" green="128" blue="255" />
</border_color>
<border_style>0</border_style>
<border_width>1</border_width>
<enabled>true</enabled>
<font>
<opifont.name fontName=".AppleSystemUIFont" height="11" style="0" pixels="false">Default</opifont.name>
</font>
<foreground_color>
<color red="0" green="0" blue="0" />
</foreground_color>
<height>20</height>
<horizontal_alignment>1</horizontal_alignment>
<name>Label_6</name>
<rules />
<scale_options>
<width_scalable>true</width_scalable>
<height_scalable>true</height_scalable>
<keep_wh_ratio>false</keep_wh_ratio>
</scale_options>
<scripts />
<text>Reversed!</text>
<tooltip></tooltip>
<transparent>true</transparent>
<vertical_alignment>1</vertical_alignment>
<visible>false</visible>
<widget_type>Label</widget_type>
<width>80</width>
<wrap_words>false</wrap_words>
<wuid>-9c5837e:17bba1f3e9d:-7c0a</wuid>
<x>290</x>
<y>608</y>
</widget>
</display> </display>
\ No newline at end of file
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