Merge pull request #1066 from phys-cgarnier/master

ENH: added new pydm drawing rules for all drawing widgets that allow for p…
slaclab · Apr 15, 2024 · ec62b26 · ec62b26
2 parents 56f94b4 + 261af4f
commit ec62b26
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/pydm/widgets/drawing.py b/pydm/widgets/drawing.py
@@ -16,6 +16,7 @@
     "Set Pen Color": ["penColor", QColor],
     "Set Pen Style": ["penStyle", int],
     "Set Pen Width": ["penWidth", float],
+    "Set Brush Color": ["brush", QBrush],
 }
 
 
@@ -57,7 +58,7 @@ def qt_to_deg(deg):
     return deg / 16.0
 
 
-class PyDMDrawing(QWidget, PyDMWidget):
+class PyDMDrawing(QWidget, PyDMWidget, new_properties=_penRuleProperties):
     """
     Base class to be used for all PyDM Drawing Widgets.
     This class inherits from QWidget and PyDMWidget.
@@ -453,7 +454,7 @@ def alarm_severity_changed(self, new_alarm_severity):
                 self.penStyle = self._original_pen_style
 
 
-class PyDMDrawingLine(PyDMDrawing, new_properties=_penRuleProperties):
+class PyDMDrawingLine(PyDMDrawing):
     """
     A widget with a line drawn in it.
     This class inherits from PyDMDrawing.

diff --git a/pydm/widgets/rules.py b/pydm/widgets/rules.py
@@ -5,7 +5,7 @@
 
 from qtpy.QtCore import QThread, QMutex, Signal
 from qtpy.QtWidgets import QWidget, QApplication
-from qtpy.QtGui import QColor
+from qtpy.QtGui import QColor, QBrush
 from ..utilities import is_qt_designer
 from .channel import PyDMChannel
 
@@ -361,7 +361,7 @@ def calculate_expression(self, widget_ref, idx, rule):
                     pass
             calc_vals.append(v)
 
-        eval_env = {"np": np, "ch": calc_vals, "QColor": QColor}
+        eval_env = {"np": np, "ch": calc_vals, "QColor": QColor, "QBrush": QBrush}
         eval_env.update({k: v for k, v in math.__dict__.items() if k[0] != "_"})
 
         expression = rule["rule"]["expression"]