Skip to content
Snippets Groups Projects
Commit 75a6ddd3 authored by Joao Paulo Martins's avatar Joao Paulo Martins
Browse files

Merge branch 'master' into 'master'

FC: updated daq IOC name and added ecmc iocstats

See merge request !7
parents 434ba6ea 978b8554
No related branches found
No related tags found
1 merge request!7FC: updated daq IOC name and added ecmc iocstats
Pipeline #99323 failed
......@@ -5,7 +5,7 @@
<FCscreen>../../99-Shared/adsis8300fc/channel.bob</FCscreen>
<TITLE>FC IOCs</TITLE>
</macros>
<width>920</width>
<width>750</width>
<height>470</height>
<actions>
</actions>
......@@ -24,7 +24,7 @@
<R4>PBI-FC-001:</R4>
</macros>
<file>instance.bob</file>
<x>110</x>
<x>30</x>
<y>70</y>
<width>320</width>
<height>380</height>
......@@ -38,7 +38,7 @@
</widget>
<widget type="group" version="2.0.0">
<name>Titlebar_1</name>
<width>800</width>
<width>750</width>
<height>50</height>
<style>3</style>
<transparent>true</transparent>
......@@ -47,7 +47,7 @@
<class>TITLE-BAR</class>
<x use_class="true">0</x>
<y use_class="true">0</y>
<width>920</width>
<width>750</width>
<height use_class="true">50</height>
<line_width use_class="true">0</line_width>
<background_color use_class="true">
......@@ -61,7 +61,7 @@
<text>FC : Engineering Screen (IOC)</text>
<x use_class="true">20</x>
<y use_class="true">0</y>
<width>770</width>
<width>460</width>
<height use_class="true">50</height>
<font use_class="true">
<font name="Header 1" family="Source Sans Pro" style="BOLD_ITALIC" size="36.0">
......@@ -86,7 +86,7 @@
</action>
</actions>
<text>Operator</text>
<x>530</x>
<x>490</x>
<y>10</y>
<width>120</width>
<tooltip>$(actions)</tooltip>
......@@ -100,97 +100,175 @@
</action>
</actions>
<text>Machine Expert</text>
<x>660</x>
<x>620</x>
<y>10</y>
<width>120</width>
<tooltip>$(actions)</tooltip>
</widget>
</widget>
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-titlebar_8</name>
<x>470</x>
<widget type="group" version="2.0.0">
<name>EVR</name>
<x>390</x>
<y>70</y>
<width>330</width>
<height>150</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="rectangle" version="2.0.0">
<name>BGGrey03-background_13</name>
<x>490</x>
<y>120</y>
<width>290</width>
<height>80</height>
<line_width>0</line_width>
<background_color>
<color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
</color>
</background_color>
<corner_width>5</corner_width>
<corner_height>5</corner_height>
<style>3</style>
<transparent>true</transparent>
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-titlebar_8</name>
<width>330</width>
<height>150</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="rectangle" version="2.0.0">
<name>BGGrey03-background_13</name>
<x>20</x>
<y>50</y>
<width>290</width>
<height>80</height>
<line_width>0</line_width>
<background_color>
<color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
</color>
</background_color>
<corner_width>5</corner_width>
<corner_height>5</corner_height>
</widget>
<widget type="label" version="2.0.0">
<name>BGGrey02-title_23</name>
<text>PBI-FC01:Ctrl-EVR-101</text>
<width>330</width>
<height>50</height>
<font>
<font family="Source Sans Pro" style="BOLD_ITALIC" size="24.0">
</font>
</font>
<foreground_color>
<color name="WHITE" red="255" green="255" blue="255">
</color>
</foreground_color>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<wrap_words>false</wrap_words>
</widget>
<widget type="action_button" version="3.0.0">
<name>Action Button RFLab_1</name>
<actions>
<action type="open_display">
<file>../../99-Shared/mrfioc2_new/evr-mtca-300u.bob</file>
<macros>
<EVR>PBI-FC01:Ctrl-EVR-101</EVR>
<P>PBI-FC01:</P>
<R>Ctrl-EVR-101:</R>
</macros>
<target>tab</target>
<description>Open Display</description>
</action>
</actions>
<text>EVR Engineer OPI</text>
<x>40</x>
<y>70</y>
<width>250</width>
<height>40</height>
<tooltip>$(actions)</tooltip>
</widget>
</widget>
<widget type="label" version="2.0.0">
<name>BGGrey02-title_23</name>
<text>PBI-FC01:Ctrl-EVR-101</text>
<x>470</x>
<y>70</y>
<widget type="group" version="2.0.0">
<name>IOC Stats</name>
<x>390</x>
<y>240</y>
<width>330</width>
<height>50</height>
<font>
<font family="Source Sans Pro" style="BOLD_ITALIC" size="24.0">
<height>150</height>
<style>3</style>
<transparent>true</transparent>
<widget type="rectangle" version="2.0.0">
<name>BGGrey03-titlebar_9</name>
<width>330</width>
<height>150</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="rectangle" version="2.0.0">
<name>BGGrey03-background_14</name>
<x>20</x>
<y>50</y>
<width>290</width>
<height>80</height>
<line_width>0</line_width>
<background_color>
<color name="GROUP-BACKGROUND" red="200" green="205" blue="201">
</color>
</background_color>
<corner_width>5</corner_width>
<corner_height>5</corner_height>
</widget>
<widget type="label" version="2.0.0">
<name>BGGrey02-title_24</name>
<text>IOC Stats</text>
<width>330</width>
<height>50</height>
<font>
<font family="Source Sans Pro" style="BOLD_ITALIC" size="24.0">
</font>
</font>
</font>
<foreground_color>
<color name="WHITE" red="255" green="255" blue="255">
</color>
</foreground_color>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<wrap_words>false</wrap_words>
</widget>
<widget type="action_button" version="3.0.0">
<name>Action Button RFLab_1</name>
<actions>
<action type="open_display">
<file>../../99-Shared/mrfioc2_new/evr-mtca-300u.bob</file>
<macros>
<EVR>PBI-FC01:Ctrl-EVR-101</EVR>
<P>PBI-FC01:</P>
<R>Ctrl-EVR-101:</R>
</macros>
<target>tab</target>
<description>Open Display</description>
</action>
</actions>
<text>EVR Engineer OPI</text>
<x>510</x>
<y>140</y>
<width>250</width>
<height>40</height>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
<name>Action Button_1</name>
<actions>
<action type="open_display">
<file>../../99-Shared/iocStats/iocStats.bob</file>
<macros>
<P>PBI-FC01:</P>
<R></R>
</macros>
<target>window</target>
<description>Open Display</description>
</action>
</actions>
<text>IOC Stats</text>
<x>790</x>
<y>10</y>
<width>120</width>
<tooltip>$(actions)</tooltip>
<foreground_color>
<color name="WHITE" red="255" green="255" blue="255">
</color>
</foreground_color>
<horizontal_alignment>1</horizontal_alignment>
<vertical_alignment>1</vertical_alignment>
<wrap_words>false</wrap_words>
</widget>
<widget type="action_button" version="3.0.0">
<name>Action Button_1</name>
<actions>
<action type="open_display">
<file>../../99-Shared/iocStats/iocStats.bob</file>
<macros>
<P>PBI-FC01:</P>
<R>Ctrl-IOC-101:</R>
</macros>
<target>window</target>
<description>Open Display</description>
</action>
</actions>
<text>Data Acq</text>
<x>40</x>
<y>70</y>
<width>120</width>
<height>40</height>
<tooltip>$(actions)</tooltip>
</widget>
<widget type="action_button" version="3.0.0">
<name>Action Button_2</name>
<actions>
<action type="open_display">
<file>../../99-Shared/iocStats/iocStats.bob</file>
<macros>
<P>PBI-FC01:</P>
<R>Ctrl-IOC-102:</R>
</macros>
<target>window</target>
<description>Open Display</description>
</action>
</actions>
<text>Motion &amp; HV</text>
<x>170</x>
<y>70</y>
<width>120</width>
<height>40</height>
<tooltip>$(actions)</tooltip>
</widget>
</widget>
</display>
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