Skip to content
Snippets Groups Projects
Commit 777a061d authored by Benjamin Bertrand's avatar Benjamin Bertrand
Browse files

Merge branch 'master' into 'master' 

Updated MEBT vacuum OPI according to latest diagram

See merge request !231
parents ea82774f f7581eac
No related branches found
No related tags found
1 merge request!231Updated MEBT vacuum OPI according to latest diagram
Pipeline #49100 failed
Stage: deploy
    Expand all Hide whitespace changes
    Inline Side-by-side
    NON-APPROVED/lebt-010_vac/LEBT.bob
    + 121
    − 121
    View file @ 777a061d
    This diff is collapsed.
    NON-APPROVED/mebt-010_vac/MEBT.bob
    + 235
    − 299
    View file @ 777a061d
    This diff is collapsed.
    NON-APPROVED/rfq-010_vac/RFQ.bob
    + 35
    − 35
    View file @ 777a061d
    ......@@ -41,7 +41,7 @@
    <action type="open_display">
    <file>Trending RFQ-010 VGC.bob</file>
    <target>tab</target>
    <description>Open Display</description>
    <description>Open VGC Trends</description>
    </action>
    </actions>
    <text>Open
    ......@@ -66,8 +66,8 @@ VGC Trends</text>
    <actions>
    <action type="open_display">
    <file>diagnostics.bob</file>
    <target>standalone</target>
    <description>Open Display</description>
    <target>window</target>
    <description>Open Diagnostics</description>
    </action>
    </actions>
    <text>Open
    ......@@ -92,8 +92,8 @@ Diagnostics</text>
    <actions>
    <action type="open_display">
    <file>$(WIDGET_ROOT)/COMMON/legend.bob</file>
    <target>standalone</target>
    <description>Open Display</description>
    <target>window</target>
    <description>Open Legend</description>
    </action>
    </actions>
    <text>Open
    ......@@ -152,17 +152,17 @@ Legend</text>
    <name>$(SEC)-$(SECTOR) Separator</name>
    <width>800</width>
    <height>800</height>
    <line_color>
    <color red="169" green="169" blue="169" alpha="128">
    </color>
    </line_color>
    <line_style>2</line_style>
    <points>
    <point x="800.0" y="0.0">
    </point>
    <point x="800.0" y="800.0">
    </point>
    </points>
    <line_color>
    <color red="169" green="169" blue="169" alpha="128">
    </color>
    </line_color>
    <line_style>2</line_style>
    </widget>
    <widget type="label" version="2.0.0">
    <name>$(SEC)-$(SECTOR)</name>
    ......@@ -500,17 +500,17 @@ Legend</text>
    <name>$(SEC)-$(SECTOR) Separator</name>
    <width>400</width>
    <height>800</height>
    <line_color>
    <color red="169" green="169" blue="169" alpha="128">
    </color>
    </line_color>
    <line_style>2</line_style>
    <points>
    <point x="400.0" y="0.0">
    </point>
    <point x="400.0" y="800.0">
    </point>
    </points>
    <line_color>
    <color red="169" green="169" blue="169" alpha="128">
    </color>
    </line_color>
    <line_style>2</line_style>
    </widget>
    <widget type="label" version="2.0.0">
    <name>$(SEC)-$(SECTOR)</name>
    ......@@ -640,17 +640,17 @@ Legend</text>
    <name>$(SEC)-$(SECTOR) Separator</name>
    <width>300</width>
    <height>800</height>
    <line_color>
    <color red="169" green="169" blue="169" alpha="128">
    </color>
    </line_color>
    <line_style>2</line_style>
    <points>
    <point x="300.0" y="0.0">
    </point>
    <point x="300.0" y="800.0">
    </point>
    </points>
    <line_color>
    <color red="169" green="169" blue="169" alpha="128">
    </color>
    </line_color>
    <line_style>2</line_style>
    </widget>
    <widget type="label" version="2.0.0">
    <name>$(SEC)-$(SECTOR)</name>
    ......@@ -741,17 +741,17 @@ Legend</text>
    <name>$(SEC)-$(SECTOR) Separator</name>
    <width>400</width>
    <height>800</height>
    <line_color>
    <color red="169" green="169" blue="169" alpha="128">
    </color>
    </line_color>
    <line_style>2</line_style>
    <points>
    <point x="400.0" y="0.0">
    </point>
    <point x="400.0" y="800.0">
    </point>
    </points>
    <line_color>
    <color red="169" green="169" blue="169" alpha="128">
    </color>
    </line_color>
    <line_style>2</line_style>
    </widget>
    <widget type="label" version="2.0.0">
    <name>$(SEC)-$(SECTOR)</name>
    ......@@ -882,17 +882,17 @@ Legend</text>
    <name>$(SEC)-$(SECTOR) Separator</name>
    <width>600</width>
    <height>800</height>
    <line_color>
    <color red="169" green="169" blue="169" alpha="128">
    </color>
    </line_color>
    <line_style>2</line_style>
    <points>
    <point x="600.0" y="0.0">
    </point>
    <point x="600.0" y="800.0">
    </point>
    </points>
    <line_color>
    <color red="169" green="169" blue="169" alpha="128">
    </color>
    </line_color>
    <line_style>2</line_style>
    </widget>
    <widget type="label" version="2.0.0">
    <name>$(SEC)-$(SECTOR)</name>
    ......@@ -1252,16 +1252,16 @@ Leak Testing</text>
    <y>300</y>
    <width>1</width>
    <height>810</height>
    <line_color>
    <color name="Grid" red="169" green="169" blue="169">
    </color>
    </line_color>
    <line_style>1</line_style>
    <points>
    <point x="0.0" y="0.0">
    </point>
    <point x="0.0" y="810.0">
    </point>
    </points>
    <line_color>
    <color name="Grid" red="169" green="169" blue="169">
    </color>
    </line_color>
    <line_style>1</line_style>
    </widget>
    </display>
    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