random adjustments

BCDA-APS · Jun 21, 2024 · c1cb959 · c1cb959
1 parent 5e7bb58
commit c1cb959
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/templates/beamline/__pycache__/__init__.cpython-310.pyc b/templates/beamline/__pycache__/__init__.cpython-310.pyc
diff --git a/templates/commonPlugins/__pycache__/__init__.cpython-310.pyc b/templates/commonPlugins/__pycache__/__init__.cpython-310.pyc
diff --git a/templates/multimotor/__pycache__/__init__.cpython-310.pyc b/templates/multimotor/__pycache__/__init__.cpython-310.pyc
diff --git a/templates/multimotor/layout.yml b/templates/multimotor/layout.yml
@@ -60,7 +60,7 @@ motor_grid: !grid
 
                     alignment: Center
 
-                    geometry: 3x1 x 154x21
+                    geometry: 154x21
 
                     pv: "$(P)$(M{N}).DESC"
 

diff --git a/templates/widgets.yml b/templates/widgets.yml
@@ -127,26 +127,41 @@ _OnOffText: !Template:OnOffText
 
 _LabeledReadback: !Template:LabeledReadback
     - !Defaults 
+        text-height: 20
         spacing: 15
         fontname: "Liberation Sans"
+        fontsize: 11
         highlight: *transparent
+        units: False
 
     - !hflow
-        padding: "{spacing}"
         children:
             - !Text
-                geometry: "{text-width}x20"
-                font: "-{fontname} -Regular -11"
-                alignment: CenterRight
+                geometry: "{text-width}x{text-height}"
+                font: "-{fontname} -Regular -{fontsize}"
+                alignment: Right
                 text: "{label}"
+
+            - !Spacer { geometry: "{spacing}x0" }
 
             - !TextMonitor
                 foreground: *header_blue
                 background: "{highlight}"
-                geometry: "0x1 x {read-width}x18"
-                font: "-{fontname} -Regular -10"
+                geometry: "{read-width}x{text-height}"
+                font: "-{fontname} -Regular -{fontsize}"
                 pv: "{read-pv}"
 
+            - !Conditional
+                condition: "{units}"
+
+                children:
+                    - !Text
+                        geometry: "{spacing}x0 x {units-width}x{text-height}"
+                        alignment: Left
+                        font: "-{fontname} -Regular -{fontsize}"
+                        text: "{units}"
+
+
 
 _LabeledEntry: !Template:LabeledEntry
     - !Defaults