From 8fce4bd69ad98c32db1fa49cf45083537e003229 Mon Sep 17 00:00:00 2001
From: Ollie Copping <oliver.copping@diamond.ac.uk>
Date: Mon, 18 May 2026 13:37:44 +0100
Subject: [PATCH 1/2] Fix M macro in slits screens

---
 bob/slits/slit-4axis-individual-embed.bob  | 9 ++++-----
 bob/slits/slit-4axis-size-center-embed.bob | 9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/bob/slits/slit-4axis-individual-embed.bob b/bob/slits/slit-4axis-individual-embed.bob
index 45e2c7a..d08c0d6 100644
--- a/bob/slits/slit-4axis-individual-embed.bob
+++ b/bob/slits/slit-4axis-individual-embed.bob
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Saved on 2026-02-02 10:45:12 by ryi58813-->
 <display version="2.0.0">
   <name>slit-4axis-individual-embed</name>
   <macros>
@@ -219,7 +218,7 @@
       <name>X Center</name>
       <macros>
         <P>$(P)</P>
-        <M>Y:POS</M>
+        <M>:Y:POS</M>
         <IOC>$(IOC)</IOC>
       </macros>
       <file>../pmac/motor_embed.bob</file>
@@ -232,7 +231,7 @@
       <name>Y Size</name>
       <macros>
         <P>$(P)</P>
-        <M>Y:NEG</M>
+        <M>:Y:NEG</M>
         <IOC>$(IOC)</IOC>
       </macros>
       <file>../pmac/motor_embed.bob</file>
@@ -245,7 +244,7 @@
       <name>X Size</name>
       <macros>
         <P>$(P)</P>
-        <M>X:NEG</M>
+        <M>:X:NEG</M>
         <IOC>$(IOC)</IOC>
       </macros>
       <file>../pmac/motor_embed.bob</file>
@@ -257,7 +256,7 @@
       <name>Y Center</name>
       <macros>
         <P>$(P)</P>
-        <M>X:POS</M>
+        <M>:X:POS</M>
         <IOC>$(IOC)</IOC>
       </macros>
       <file>../pmac/motor_embed.bob</file>
diff --git a/bob/slits/slit-4axis-size-center-embed.bob b/bob/slits/slit-4axis-size-center-embed.bob
index e827594..7b1430c 100644
--- a/bob/slits/slit-4axis-size-center-embed.bob
+++ b/bob/slits/slit-4axis-size-center-embed.bob
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Saved on 2026-02-02 10:48:42 by ryi58813-->
 <display version="2.0.0">
   <name>slit-4axis-size-center-embed</name>
   <width>750</width>
@@ -30,7 +29,7 @@
       <name>X Center</name>
       <macros>
         <P>$(P)</P>
-        <M>X:CENTER</M>
+        <M>:X:CENTER</M>
         <IOC>$(IOC)</IOC>
       </macros>
       <file>../pmac/motor_embed.bob</file>
@@ -43,7 +42,7 @@
       <name>Y Center</name>
       <macros>
         <P>$(P)</P>
-        <M>Y:CENTER</M>
+        <M>:Y:CENTER</M>
         <IOC>$(IOC)</IOC>
       </macros>
       <file>../pmac/motor_embed.bob</file>
@@ -56,7 +55,7 @@
       <name>Y Size</name>
       <macros>
         <P>$(P)</P>
-        <M>Y:SIZE</M>
+        <M>:Y:SIZE</M>
         <IOC>$(IOC)</IOC>
       </macros>
       <file>../pmac/motor_embed.bob</file>
@@ -69,7 +68,7 @@
       <name>X Size</name>
       <macros>
         <P>$(P)</P>
-        <M>X:SIZE</M>
+        <M>:X:SIZE</M>
         <IOC>$(IOC)</IOC>
       </macros>
       <file>../pmac/motor_embed.bob</file>

From 5a903952b6ab8fc03374367abe90745297ee9ebb Mon Sep 17 00:00:00 2001
From: Ollie Copping <oliver.copping@diamond.ac.uk>
Date: Mon, 18 May 2026 13:45:21 +0100
Subject: [PATCH 2/2] Fix label macros for embedded motors

---
 bob/slits/slit-4axis-individual-embed.bob  | 38 +++++++++++++++++-----
 bob/slits/slit-4axis-size-center-embed.bob | 14 +++++---
 2 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/bob/slits/slit-4axis-individual-embed.bob b/bob/slits/slit-4axis-individual-embed.bob
index d08c0d6..5b277b9 100644
--- a/bob/slits/slit-4axis-individual-embed.bob
+++ b/bob/slits/slit-4axis-individual-embed.bob
@@ -4,9 +4,10 @@
   <macros>
     <P>$(P)</P>
   </macros>
+  <y use_class="true">0</y>
   <width>750</width>
   <height>500</height>
-  <background_color>
+  <background_color use_class="true">
     <color name="Read_Background" red="240" green="240" blue="240">
     </color>
   </background_color>
@@ -16,15 +17,16 @@
     <name>4-Axis Slits - Individual</name>
     <width>720</width>
     <height>470</height>
-    <font>
+    <style use_class="true">0</style>
+    <font use_class="true">
       <font family="Arial" style="REGULAR" size="15.0">
       </font>
     </font>
-    <foreground_color>
+    <foreground_color use_class="true">
       <color red="29" green="41" blue="69">
       </color>
     </foreground_color>
-    <background_color>
+    <background_color use_class="true">
       <color name="Read_Background" red="240" green="240" blue="240">
       </color>
     </background_color>
@@ -188,14 +190,22 @@
         <y>87</y>
         <width>22</width>
         <height>22</height>
-        <font>
+        <font use_class="true">
           <font family="Arial" style="REGULAR" size="14.0">
           </font>
         </font>
-        <foreground_color>
+        <foreground_color use_class="true">
           <color red="29" green="41" blue="69">
           </color>
         </foreground_color>
+        <background_color use_class="true">
+          <color name="Background" red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <horizontal_alignment use_class="true">0</horizontal_alignment>
+        <vertical_alignment use_class="true">0</vertical_alignment>
+        <rotation_step use_class="true">0</rotation_step>
+        <wrap_words use_class="true">true</wrap_words>
       </widget>
       <widget type="label" version="2.0.0">
         <name>Label_3</name>
@@ -204,14 +214,22 @@
         <y>23</y>
         <width>22</width>
         <height>22</height>
-        <font>
+        <font use_class="true">
           <font family="Arial" style="REGULAR" size="14.0">
           </font>
         </font>
-        <foreground_color>
+        <foreground_color use_class="true">
           <color red="29" green="41" blue="69">
           </color>
         </foreground_color>
+        <background_color use_class="true">
+          <color name="Background" red="255" green="255" blue="255">
+          </color>
+        </background_color>
+        <horizontal_alignment use_class="true">0</horizontal_alignment>
+        <vertical_alignment use_class="true">0</vertical_alignment>
+        <rotation_step use_class="true">0</rotation_step>
+        <wrap_words use_class="true">true</wrap_words>
       </widget>
     </widget>
     <widget type="embedded" version="2.0.0">
@@ -220,6 +238,7 @@
         <P>$(P)</P>
         <M>:Y:POS</M>
         <IOC>$(IOC)</IOC>
+        <label>Y Pos</label>
       </macros>
       <file>../pmac/motor_embed.bob</file>
       <x>230</x>
@@ -233,6 +252,7 @@
         <P>$(P)</P>
         <M>:Y:NEG</M>
         <IOC>$(IOC)</IOC>
+        <label>Y Neg</label>
       </macros>
       <file>../pmac/motor_embed.bob</file>
       <x>230</x>
@@ -246,6 +266,7 @@
         <P>$(P)</P>
         <M>:X:NEG</M>
         <IOC>$(IOC)</IOC>
+        <label>X Neg</label>
       </macros>
       <file>../pmac/motor_embed.bob</file>
       <y>160</y>
@@ -258,6 +279,7 @@
         <P>$(P)</P>
         <M>:X:POS</M>
         <IOC>$(IOC)</IOC>
+        <label>X Pos</label>
       </macros>
       <file>../pmac/motor_embed.bob</file>
       <x>460</x>
diff --git a/bob/slits/slit-4axis-size-center-embed.bob b/bob/slits/slit-4axis-size-center-embed.bob
index 7b1430c..a0a61b6 100644
--- a/bob/slits/slit-4axis-size-center-embed.bob
+++ b/bob/slits/slit-4axis-size-center-embed.bob
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <display version="2.0.0">
   <name>slit-4axis-size-center-embed</name>
+  <y use_class="true">0</y>
   <width>750</width>
   <height>500</height>
-  <background_color>
+  <background_color use_class="true">
     <color name="Read_Background" red="240" green="240" blue="240">
     </color>
   </background_color>
@@ -13,15 +14,16 @@
     <name>4-Axis Slits - Size and Center</name>
     <width>710</width>
     <height>470</height>
-    <font>
+    <style use_class="true">0</style>
+    <font use_class="true">
       <font family="Arial" style="REGULAR" size="15.0">
       </font>
     </font>
-    <foreground_color>
+    <foreground_color use_class="true">
       <color red="29" green="41" blue="69">
       </color>
     </foreground_color>
-    <background_color>
+    <background_color use_class="true">
       <color name="Read_Background" red="240" green="240" blue="240">
       </color>
     </background_color>
@@ -31,6 +33,7 @@
         <P>$(P)</P>
         <M>:X:CENTER</M>
         <IOC>$(IOC)</IOC>
+        <label>X Center</label>
       </macros>
       <file>../pmac/motor_embed.bob</file>
       <x>15</x>
@@ -44,6 +47,7 @@
         <P>$(P)</P>
         <M>:Y:CENTER</M>
         <IOC>$(IOC)</IOC>
+        <label>Y Center</label>
       </macros>
       <file>../pmac/motor_embed.bob</file>
       <x>435</x>
@@ -57,6 +61,7 @@
         <P>$(P)</P>
         <M>:Y:SIZE</M>
         <IOC>$(IOC)</IOC>
+        <label>Y Size</label>
       </macros>
       <file>../pmac/motor_embed.bob</file>
       <x>435</x>
@@ -70,6 +75,7 @@
         <P>$(P)</P>
         <M>:X:SIZE</M>
         <IOC>$(IOC)</IOC>
+        <label>X Size</label>
       </macros>
       <file>../pmac/motor_embed.bob</file>
       <x>15</x>