Skip to content

Remove ':' removal from macro assignment of an embedded screen #218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OCopping merged 2 commits into from
May 13, 2026
Merged

Remove ':' removal from macro assignment of an embedded screen #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1416098
Remove ':' removal from macro assignment of an embedded screen
OCopping May 11, 2026
85e1569
Fix tests
OCopping May 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/techui_builder/generate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,9 +228,7 @@ def _allocate_widget(
# Add macros to the widgets
new_widget.macro(self.P, component.P)
if suffix_label != "":
new_widget.macro(
f"{suffix_label}", suffix.removeprefix(":").removesuffix(":")
)
new_widget.macro(f"{suffix_label}", suffix)
new_widget.macro("label", name.removeprefix(":").removesuffix(":"))
# TODO: Change this to pvi_button
if True:
Expand Down
18 changes: 9 additions & 9 deletions tests/test_files/motor_embed.bob
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<description>$(name)</description>
</action>
</actions>
<pv_name>$(P):$(M).TWR</pv_name>
<pv_name>$(P)$(M).TWR</pv_name>
<text>-</text>
<y>10</y>
<width>30</width>
Expand Down Expand Up @@ -52,7 +52,7 @@
<description>$(name)</description>
</action>
</actions>
<pv_name>$(P):$(M).TWF</pv_name>
<pv_name>$(P)$(M).TWF</pv_name>
<text>+</text>
<x>140</x>
<y>10</y>
Expand All @@ -78,7 +78,7 @@
<action type="open_display">
<file>$(IOC)/pmacAxis.pvi.bob</file>
<macros>
<M>:$(M)</M>
<M>$(M)</M>
<P>$(P)</P>
</macros>
<target>tab</target>
Expand Down Expand Up @@ -112,7 +112,7 @@
<description>$(name)</description>
</action>
</actions>
<pv_name>$(P):$(M).STOP</pv_name>
<pv_name>$(P)$(M).STOP</pv_name>
<text>STOP</text>
<x>130</x>
<y>60</y>
Expand All @@ -134,7 +134,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>TextEntry_27</name>
<pv_name>$(P):$(M).TWV</pv_name>
<pv_name>$(P)$(M).TWV</pv_name>
<x>45</x>
<y>60</y>
<width>80</width>
Expand All @@ -155,7 +155,7 @@
</widget>
<widget type="byte_monitor" version="2.0.0">
<name>Moving</name>
<pv_name>$(P):$(M).DMOV</pv_name>
<pv_name>$(P)$(M).DMOV</pv_name>
<x>150</x>
<y>35</y>
<width>20</width>
Expand All @@ -175,7 +175,7 @@
</widget>
<widget type="byte_monitor" version="2.0.0">
<name>Serverity</name>
<pv_name>$(P):$(M).SEVR</pv_name>
<pv_name>$(P)$(M).SEVR</pv_name>
<y>35</y>
<width>20</width>
<numBits>1</numBits>
Expand All @@ -194,7 +194,7 @@
</widget>
<widget type="textentry" version="3.0.0">
<name>PV</name>
<pv_name>$(P):$(M)</pv_name>
<pv_name>$(P)$(M)</pv_name>
<x>35</x>
<y>10</y>
<font>
Expand All @@ -214,7 +214,7 @@
</widget>
<widget type="textupdate" version="2.0.0">
<name>Readback PV</name>
<pv_name>$(P):$(M).RBV</pv_name>
<pv_name>$(P)$(M).RBV</pv_name>
<x>25</x>
<y>35</y>
<width>120</width>
Expand Down
2 changes: 1 addition & 1 deletion tests/test_files/widget.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<file>techui-support/bob/ADAravis/ADAravis_summary.bob</file>
<macros>
<P>BL01T-DI-IOC-01</P>
<R>CAM</R>
<R>:CAM:</R>
<label>CAM</label>
<IOC>test_url/bl01t-di-ioc-01</IOC>
</macros>
Expand Down
8 changes: 4 additions & 4 deletions tests/test_generate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def test_generator_create_widget_keyerror(generator, caplog):
P="BL01T-DI-IOC-01",
desc=None,
M=None,
R="CAM:",
R=":CAM:",
)

result = generator._create_widget(name=screen_name, component=component)
Expand All @@ -142,7 +142,7 @@ def test_generator_create_widget_is_list_of_dicts(generator):
P="BL01T-DI-IOC-01",
desc=None,
M=None,
R="CAM:",
R=":CAM:",
)
widget = generator._create_widget(name=screen_name, component=component)
for value in widget:
Expand All @@ -160,7 +160,7 @@ def test_generator_create_widget_embedded(generator):
P="BL01T-DI-IOC-01",
desc=None,
M=None,
R="CAM:",
R=":CAM:",
)

widget = generator._create_widget(
Expand Down Expand Up @@ -254,7 +254,7 @@ def test_generator_allocate_widget(generator):
P="BL01T-DI-IOC-01",
desc=None,
M=None,
R="CAM:",
R=":CAM:",
)
widget = generator._allocate_widget(scrn_mapping, component)
control_widget = Path("tests/test_files/widget.xml")
Expand Down