Merge pull request #113 from epics-containers/screen-label

Use screen label as tab in phoebus
epics-containers · Mar 28, 2024 · 66df55f · 66df55f
2 parents 21cb12e + 4e79574
commit 66df55f
Show file tree

Hide file tree

Showing 15 changed files with 16 additions and 15 deletions.
diff --git a/src/pvi/_format/dls.py b/src/pvi/_format/dls.py
@@ -4,7 +4,7 @@
 from lxml import etree
 from pydantic import Field
 
-from pvi._format.bob import BobTemplate
+from pvi._format.bob import BobTemplate, find_element
 from pvi._format.edl import EdlTemplate
 from pvi._format.screen import (
     ScreenFormatterFactory,
@@ -387,4 +387,5 @@ def write_bob(screen_formatter: GroupFormatter, path: Path):
     for element in texts[:0:-1]:
         ET.insert(ET.index(ET.find("grid_step_y")) + 1, element)
     ET = ET.getroottree()
+    find_element(ET, "name").text = screen_formatter.title
     ET.write(str(path), pretty_print=True)
diff --git a/tests/format/output/button.bob b/tests/format/output/button.bob
@@ -1,5 +1,5 @@
 <display version="2.0.0">
-  <name>Display</name>
+  <name>Simple Device - $(P)</name>
   <x>0</x>
   <y use_class="true">0</y>
   <width>274</width>

diff --git a/tests/format/output/combo_box.bob b/tests/format/output/combo_box.bob
@@ -1,5 +1,5 @@
 <display version="2.0.0">
-  <name>Display</name>
+  <name>Device - $(P)</name>
   <x>0</x>
   <y use_class="true">0</y>
   <width>274</width>

diff --git a/tests/format/output/device_ref.bob b/tests/format/output/device_ref.bob
@@ -1,5 +1,5 @@
 <display version="2.0.0">
-  <name>Display</name>
+  <name>Device - $(P)</name>
   <x>0</x>
   <y use_class="true">0</y>
   <width>274</width>

diff --git a/tests/format/output/index.bob b/tests/format/output/index.bob
@@ -1,5 +1,5 @@
 <display version="2.0.0">
-  <name>Display</name>
+  <name>Index</name>
   <x>0</x>
   <y use_class="true">0</y>
   <width>388</width>

diff --git a/tests/format/output/mixedWidgets.bob b/tests/format/output/mixedWidgets.bob
@@ -1,5 +1,5 @@
 <display version="2.0.0">
-  <name>Display</name>
+  <name>Mixed Widgets - $(P)$(R)</name>
   <x>0</x>
   <y use_class="true">0</y>
   <width>576</width>

diff --git a/tests/format/output/pva_table.bob b/tests/format/output/pva_table.bob
@@ -1,5 +1,5 @@
 <display version="2.0.0">
-  <name>Display</name>
+  <name>TableDevice - $(P)</name>
   <x>0</x>
   <y use_class="true">0</y>
   <width>226</width>

diff --git a/tests/format/output/pva_table_panda.bob b/tests/format/output/pva_table_panda.bob
@@ -1,5 +1,5 @@
 <display version="2.0.0">
-  <name>Display</name>
+  <name>TableDevice</name>
   <x>0</x>
   <y use_class="true">0</y>
   <width>1726</width>

diff --git a/tests/format/output/signal_default_widgets.bob b/tests/format/output/signal_default_widgets.bob
@@ -1,5 +1,5 @@
 <display version="2.0.0">
-  <name>Display</name>
+  <name>label</name>
   <x>0</x>
   <y use_class="true">0</y>
   <width>274</width>

diff --git a/tests/format/output/static_table.bob b/tests/format/output/static_table.bob
@@ -1,5 +1,5 @@
 <display version="2.0.0">
-  <name>Display</name>
+  <name>StaticTable - $(P)$(R)</name>
   <x>0</x>
   <y use_class="true">0</y>
   <width>274</width>

diff --git a/tests/format/output/static_table_BigTable.bob b/tests/format/output/static_table_BigTable.bob
@@ -1,5 +1,5 @@
 <display version="2.0.0">
-  <name>Display</name>
+  <name>BigTable</name>
   <x>0</x>
   <y use_class="true">0</y>
   <width>1030</width>

diff --git a/tests/format/output/sub_screen.bob b/tests/format/output/sub_screen.bob
@@ -1,5 +1,5 @@
 <display version="2.0.0">
-  <name>Display</name>
+  <name>Device</name>
   <x>0</x>
   <y use_class="true">0</y>
   <width>290</width>

diff --git a/tests/format/output/sub_screen_Group1.bob b/tests/format/output/sub_screen_Group1.bob
@@ -1,5 +1,5 @@
 <display version="2.0.0">
-  <name>Display</name>
+  <name>Group1</name>
   <x>0</x>
   <y use_class="true">0</y>
   <width>290</width>

diff --git a/tests/format/output/sub_screen_Group4.bob b/tests/format/output/sub_screen_Group4.bob
@@ -1,5 +1,5 @@
 <display version="2.0.0">
-  <name>Display</name>
+  <name>Group4</name>
   <x>0</x>
   <y use_class="true">0</y>
   <width>290</width>

diff --git a/tests/format/output/text_format.bob b/tests/format/output/text_format.bob
@@ -1,5 +1,5 @@
 <display version="2.0.0">
-  <name>Display</name>
+  <name>Text Device - $(P)</name>
   <x>0</x>
   <y use_class="true">0</y>
   <width>274</width>