Merge pull request #87 from BCDA-APS/86-polygon-point-representation

Convert MEDM polygon to PyDMDrawingIrregularPolygon widget
BCDA-APS · May 11, 2022 · 64c568a · 64c568a
2 parents fc37af3 + 94d3d06
commit 64c568a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/adl2pydm/symbols.py b/adl2pydm/symbols.py
@@ -68,8 +68,7 @@
     "message button": dict(type="controller", pydm_widget="PyDMPushButton"),
     "meter": dict(type="monitor", pydm_widget="PyDMScaleIndicator"),
     "oval": dict(type="static", pydm_widget="PyDMDrawingEllipse"),
-    # "polygon" : dict(type="static", pydm_widget="PyDMDrawingIrregularPolygon"),
-    "polygon": dict(type="static", pydm_widget="PyDMDrawingPolyline"),
+    "polygon" : dict(type="static", pydm_widget="PyDMDrawingIrregularPolygon"),
     "polyline": dict(type="static", pydm_widget="PyDMDrawingPolyline"),
     "rectangle": dict(type="static", pydm_widget="PyDMDrawingRectangle"),
     "related display": dict(type="static", pydm_widget="PyDMRelatedDisplayButton"),
@@ -147,6 +146,9 @@
     PyDMDrawingPolyline=PyDM_CustomWidget(
         "PyDMDrawingPolyline", "QWidget", "pydm.widgets.drawing"
     ),
+    PyDMDrawingIrregularPolygon=PyDM_CustomWidget(
+        "PyDMDrawingIrregularPolygon", "QWidget", "pydm.widgets.drawing"
+    ),
     PyDMEmbeddedDisplay=PyDM_CustomWidget(
         "PyDMEmbeddedDisplay", "QFrame", "pydm.widgets.embedded_display"
     ),

diff --git a/adl2pydm/tests/test_symbols.py b/adl2pydm/tests/test_symbols.py
@@ -6,7 +6,7 @@
     "widget_set, length", 
     [
         [symbols.adl_widgets, 24],
-        [symbols.pydm_widgets, 33],
+        [symbols.pydm_widgets, 34],
     ]
 )
 def test_symbols_dict(widget_set, length):