PyDMConverter 1.0.4__tar.gz → 1.0.5__tar.gz

{pydmconverter-1.0.4 → pydmconverter-1.0.5}/.github/workflows/gh-pages.yml

@@ -7,6 +7,9 @@ on:
     branches:
       - main
 
+permissions:
+  contents: write
+
 jobs:
   deploy:
     if: ${{ github.repository == 'slaclab/pydm-converter-tool' }}
@@ -16,8 +19,8 @@ jobs:
         os: [ubuntu-latest]
         python-version: [3.9]
     steps:
-      - uses: actions/checkout@v4
-      - uses: conda-incubator/setup-miniconda@v3
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+      - uses: conda-incubator/setup-miniconda@fc2d68f6413eb2d87b895e92f8584b5b94a10167 # v3
         with:
           miniforge-version: latest
           use-mamba: true
@@ -32,7 +35,7 @@ jobs:
           mkdocs build
 
       - name: Deploy to gh-pages
-        uses: peaceiris/actions-gh-pages@v4
+        uses: peaceiris/actions-gh-pages@84c30a85c19949d7eee79c4ff27748b70285e453 # v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./site/

{pydmconverter-1.0.4 → pydmconverter-1.0.5}/.github/workflows/lint.yml

@@ -8,11 +8,11 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
         with:
           fetch-depth: 1
       - name: Install Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
         with:
           python-version: "3.12"
       - name: Install dependencies

{pydmconverter-1.0.4 → pydmconverter-1.0.5}/.github/workflows/pypi_release.yml

@@ -11,11 +11,11 @@ jobs:
     permissions:
       id-token: write # IMPORTANT: this permission is mandatory for trusted publishing
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
         with:
           fetch-depth: 0
       - name: Set up Python 3.12
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
         with:
           python-version: 3.12
       - name: Install pypa/build
@@ -25,4 +25,4 @@ jobs:
         run: |
           python -m build --sdist --outdir dist/ .
       - name: Publish package distributions to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b # release/v1

{pydmconverter-1.0.4 → pydmconverter-1.0.5}/.github/workflows/tests.yml

@@ -20,10 +20,10 @@ jobs:
       DISPLAY: ':99.0'
       QT_MAC_WANTS_LAYER: 1  # PyQT gui tests involving qtbot interaction on macOS will fail without this
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
 
       - name: Setup Miniforge
-        uses: conda-incubator/setup-miniconda@v3
+        uses: conda-incubator/setup-miniconda@fc2d68f6413eb2d87b895e92f8584b5b94a10167 # v3
         with:
           miniforge-version: latest
           activate-environment: pydm-converter-tool-dev
@@ -54,11 +54,11 @@ jobs:
   test-pypi-build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
         with:
           fetch-depth: 0
       - name: Set up Python 3.10
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
         with:
           python-version: '3.10'
       - name: Install pypa/build

{pydmconverter-1.0.4 → pydmconverter-1.0.5}/.gitignore

@@ -123,3 +123,7 @@ ENV/
 # Canopy IR data files (generated schema + vendored widget registry) are tracked assets
 !pydmconverter/ir/data/*.json
 !pydmconverter/ir/data/widget-registry/*.json
+
+# EDM->IR combined integration snapshot (committed regression fixture;
+# see tests/edm/test_integration_combined.py for how to regenerate it deliberately)
+!tests/edm/fixtures/integration_combined.screen.json

{pydmconverter-1.0.4 → pydmconverter-1.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyDMConverter
-Version: 1.0.4
+Version: 1.0.5
 Summary: converter to generate pydm .ui files from other display managers.
 Author: Devan Agrawal, Zach Domke, Ryan McClanahan, Alexander Ng, Logan Somoza, Alexandria Ikuma
 Author-email: Yekta Yazar <yazar@slac.stanford.edu>

{pydmconverter-1.0.4 → pydmconverter-1.0.5}/PyDMConverter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyDMConverter
-Version: 1.0.4
+Version: 1.0.5
 Summary: converter to generate pydm .ui files from other display managers.
 Author: Devan Agrawal, Zach Domke, Ryan McClanahan, Alexander Ng, Logan Somoza, Alexandria Ikuma
 Author-email: Yekta Yazar <yazar@slac.stanford.edu>

{pydmconverter-1.0.4 → pydmconverter-1.0.5}/PyDMConverter.egg-info/SOURCES.txt

@@ -81,28 +81,38 @@ pydmconverter/ir/registry.py
 pydmconverter/ir/schema.py
 pydmconverter/ir/source.py
 pydmconverter/ir/transforms.py
+pydmconverter/ir/data/VENDORED_SCHEMA.md
 pydmconverter/ir/data/screen-ir.schema.json
 pydmconverter/ir/data/widget-registry/.beaver-snapshot-sha
 pydmconverter/ir/data/widget-registry/absolute-canvas.json
+pydmconverter/ir/data/widget-registry/arc.json
+pydmconverter/ir/data/widget-registry/ellipse.json
 pydmconverter/ir/data/widget-registry/embedded-display.json
 pydmconverter/ir/data/widget-registry/frame.json
 pydmconverter/ir/data/widget-registry/group-box.json
+pydmconverter/ir/data/widget-registry/group.json
 pydmconverter/ir/data/widget-registry/image-view.json
+pydmconverter/ir/data/widget-registry/line.json
 pydmconverter/ir/data/widget-registry/pv-button.json
 pydmconverter/ir/data/widget-registry/pv-byte-led.json
 pydmconverter/ir/data/widget-registry/pv-checkbox.json
 pydmconverter/ir/data/widget-registry/pv-enum-combobox.json
 pydmconverter/ir/data/widget-registry/pv-label.json
 pydmconverter/ir/data/widget-registry/pv-led.json
+pydmconverter/ir/data/widget-registry/pv-meter.json
 pydmconverter/ir/data/widget-registry/pv-progress-bar.json
 pydmconverter/ir/data/widget-registry/pv-radio-group.json
 pydmconverter/ir/data/widget-registry/pv-slider.json
 pydmconverter/ir/data/widget-registry/pv-text-input.json
+pydmconverter/ir/data/widget-registry/qwidget-container.json
+pydmconverter/ir/data/widget-registry/rectangle.json
 pydmconverter/ir/data/widget-registry/regular-button.json
 pydmconverter/ir/data/widget-registry/related-display-button.json
 pydmconverter/ir/data/widget-registry/scroll-area.json
+pydmconverter/ir/data/widget-registry/shell-command-button.json
 pydmconverter/ir/data/widget-registry/tabs.json
 pydmconverter/ir/data/widget-registry/text-label.json
+pydmconverter/ir/data/widget-registry/waveform-plot.json
 pydmconverter/sites/__init__.py
 pydmconverter/sites/slac.py
 pydmconverter/ui/__init__.py
@@ -115,16 +125,40 @@ tests/test_react.py
 tests/test_sites.py
 tests/test_widgets.py
 tests/test_widgets_helpers.py
+tests/edm/test_byte_and_related.py
+tests/edm/test_colors.py
+tests/edm/test_control_widgets.py
 tests/edm/test_converter.py
 tests/edm/test_converter_helpers.py
+tests/edm/test_graphics_widgets.py
+tests/edm/test_integration_combined.py
 tests/edm/test_ir_adapter.py
-tests/edm/test_p1_widgets.py
 tests/edm/test_parser.py
 tests/edm/test_parser_helpers.py
 tests/edm/test_visibility_rules.py
-tests/edm/fixtures/p0_min.edl
-tests/edm/fixtures/p0_vis.edl
-tests/edm/fixtures/p1_widgets.edl
+tests/edm/fixtures/basic_widgets.edl
+tests/edm/fixtures/byte_and_related.edl
+tests/edm/fixtures/colors.edl
+tests/edm/fixtures/colors.list
+tests/edm/fixtures/exit_button.edl
+tests/edm/fixtures/graphics_arc.edl
+tests/edm/fixtures/graphics_bars.edl
+tests/edm/fixtures/graphics_circle.edl
+tests/edm/fixtures/graphics_group.edl
+tests/edm/fixtures/graphics_line.edl
+tests/edm/fixtures/graphics_rect.edl
+tests/edm/fixtures/indicator.edl
+tests/edm/fixtures/integration_combined.edl
+tests/edm/fixtures/integration_combined.screen.json
+tests/edm/fixtures/meter.edl
+tests/edm/fixtures/misc_buttons.edl
+tests/edm/fixtures/mmv_multiline.edl
+tests/edm/fixtures/png.edl
+tests/edm/fixtures/radio.edl
+tests/edm/fixtures/shell_cmd.edl
+tests/edm/fixtures/textdsp.edl
+tests/edm/fixtures/unknown.edl
+tests/edm/fixtures/visibility.edl
 tests/ir/__init__.py
 tests/ir/conftest.py
 tests/ir/test_ir_builder.py
@@ -136,7 +170,8 @@ tests/ir/test_ir_registry.py
 tests/ir/test_ir_schema.py
 tests/ir/test_ir_transforms.py
 tests/ui/__init__.py
+tests/ui/test_byte_and_related.py
 tests/ui/test_ir_adapter.py
-tests/ui/test_p1_widgets.py
-tests/ui/fixtures/p0_min.ui
-tests/ui/fixtures/p1_widgets.ui
+tests/ui/fixtures/basic_widgets.ui
+tests/ui/fixtures/byte_and_related.ui
+tests/ui/fixtures/newly_supported.ui

{pydmconverter-1.0.4 → pydmconverter-1.0.5}/PyDMConverter.egg-info/scm_file_list.json

@@ -41,19 +41,44 @@
     "tests/ir/test_ir_schema.py",
     "tests/ui/__init__.py",
     "tests/ui/test_ir_adapter.py",
-    "tests/ui/test_p1_widgets.py",
-    "tests/ui/fixtures/p1_widgets.ui",
-    "tests/ui/fixtures/p0_min.ui",
+    "tests/ui/test_byte_and_related.py",
+    "tests/ui/fixtures/byte_and_related.ui",
+    "tests/ui/fixtures/basic_widgets.ui",
+    "tests/ui/fixtures/newly_supported.ui",
     "tests/edm/test_converter_helpers.py",
     "tests/edm/test_ir_adapter.py",
     "tests/edm/test_parser_helpers.py",
+    "tests/edm/test_integration_combined.py",
     "tests/edm/test_parser.py",
     "tests/edm/test_converter.py",
-    "tests/edm/test_p1_widgets.py",
+    "tests/edm/test_byte_and_related.py",
+    "tests/edm/test_graphics_widgets.py",
+    "tests/edm/test_control_widgets.py",
+    "tests/edm/test_colors.py",
     "tests/edm/test_visibility_rules.py",
-    "tests/edm/fixtures/p0_vis.edl",
-    "tests/edm/fixtures/p1_widgets.edl",
-    "tests/edm/fixtures/p0_min.edl",
+    "tests/edm/fixtures/graphics_arc.edl",
+    "tests/edm/fixtures/textdsp.edl",
+    "tests/edm/fixtures/graphics_rect.edl",
+    "tests/edm/fixtures/unknown.edl",
+    "tests/edm/fixtures/exit_button.edl",
+    "tests/edm/fixtures/basic_widgets.edl",
+    "tests/edm/fixtures/integration_combined.edl",
+    "tests/edm/fixtures/visibility.edl",
+    "tests/edm/fixtures/shell_cmd.edl",
+    "tests/edm/fixtures/colors.list",
+    "tests/edm/fixtures/graphics_bars.edl",
+    "tests/edm/fixtures/mmv_multiline.edl",
+    "tests/edm/fixtures/misc_buttons.edl",
+    "tests/edm/fixtures/colors.edl",
+    "tests/edm/fixtures/graphics_line.edl",
+    "tests/edm/fixtures/radio.edl",
+    "tests/edm/fixtures/indicator.edl",
+    "tests/edm/fixtures/byte_and_related.edl",
+    "tests/edm/fixtures/png.edl",
+    "tests/edm/fixtures/integration_combined.screen.json",
+    "tests/edm/fixtures/graphics_circle.edl",
+    "tests/edm/fixtures/meter.edl",
+    "tests/edm/fixtures/graphics_group.edl",
     "app/resources/file_minus.png",
     "app/resources/folder_search.png",
     "app/resources/play_circle_outline.png",
@@ -91,6 +116,9 @@
     "pydmconverter/ir/registry.py",
     "pydmconverter/ir/base.py",
     "pydmconverter/ir/data/screen-ir.schema.json",
+    "pydmconverter/ir/data/VENDORED_SCHEMA.md",
+    "pydmconverter/ir/data/widget-registry/qwidget-container.json",
+    "pydmconverter/ir/data/widget-registry/rectangle.json",
     "pydmconverter/ir/data/widget-registry/pv-byte-led.json",
     "pydmconverter/ir/data/widget-registry/pv-label.json",
     "pydmconverter/ir/data/widget-registry/pv-button.json",
@@ -99,16 +127,23 @@
     "pydmconverter/ir/data/widget-registry/text-label.json",
     "pydmconverter/ir/data/widget-registry/pv-slider.json",
     "pydmconverter/ir/data/widget-registry/tabs.json",
+    "pydmconverter/ir/data/widget-registry/ellipse.json",
     "pydmconverter/ir/data/widget-registry/pv-checkbox.json",
     "pydmconverter/ir/data/widget-registry/group-box.json",
     "pydmconverter/ir/data/widget-registry/image-view.json",
+    "pydmconverter/ir/data/widget-registry/group.json",
     "pydmconverter/ir/data/widget-registry/pv-enum-combobox.json",
+    "pydmconverter/ir/data/widget-registry/line.json",
     "pydmconverter/ir/data/widget-registry/pv-text-input.json",
     "pydmconverter/ir/data/widget-registry/.beaver-snapshot-sha",
     "pydmconverter/ir/data/widget-registry/scroll-area.json",
     "pydmconverter/ir/data/widget-registry/absolute-canvas.json",
     "pydmconverter/ir/data/widget-registry/frame.json",
+    "pydmconverter/ir/data/widget-registry/pv-meter.json",
+    "pydmconverter/ir/data/widget-registry/arc.json",
     "pydmconverter/ir/data/widget-registry/embedded-display.json",
+    "pydmconverter/ir/data/widget-registry/waveform-plot.json",
+    "pydmconverter/ir/data/widget-registry/shell-command-button.json",
     "pydmconverter/ir/data/widget-registry/related-display-button.json",
     "pydmconverter/ir/data/widget-registry/pv-radio-group.json",
     "pydmconverter/ir/data/widget-registry/pv-led.json",

pydmconverter-1.0.5/PyDMConverter.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "1.0.5",
+  "distance": 0,
+  "node": "g7cbd6b5e2dea4189905b196980ab68efcb1ec455",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-07-10"
+}

{pydmconverter-1.0.4 → pydmconverter-1.0.5}/pydmconverter/edm/edm_qt.py

@@ -1,4 +1,4 @@
-"""EDM -> Qt class and prop name maps for the IR adapter (P0 widgets).
+"""EDM -> Qt class and prop name maps for the IR adapter.
 
 The shared IR builder resolves widgets and props by Qt vocabulary (the keys
 Beaver's ``qtMapping``/``qtPropMap`` use). The EDM front-end therefore translates
@@ -13,8 +13,8 @@ from __future__ import annotations
 
 from typing import Any
 
-# EDM class (lowercased) -> Qt class the registry knows. P0 subset; everything
-# else falls through to an unknown-widget node (D11).
+# EDM class (lowercased) -> Qt class the registry knows; everything
+# else falls through to an unknown-widget node.
 EDM_TO_QT_CLASS: dict[str, str] = {
     "activextextclass": "PyDMLabel",  # split to QLabel (text-label) when static, see resolve_qt_class
     "textupdateclass": "PyDMLabel",
@@ -31,13 +31,35 @@ EDM_TO_QT_CLASS: dict[str, str] = {
     "activetriumfsliderclass": "PyDMSlider",
     "activechoicebuttonclass": "PyDMEnumComboBox",
     "activepipclass": "PyDMEmbeddedDisplay",
-    # P1
+    # byte indicator / related display
     "byteclass": "PyDMByteIndicator",
     "relateddisplayclass": "PyDMRelatedDisplayButton",
+    # graphics
+    "activerectangleclass": "PyDMDrawingRectangle",
+    "activecircleclass": "PyDMDrawingEllipse",
+    "activelineclass": "PyDMDrawingPolyline",
+    "activearcclass": "PyDMDrawingArc",
+    "activebarclass": "PyDMScaleIndicator",
+    "activeslacbarclass": "PyDMScaleIndicator",
+    "activevsbarclass": "PyDMScaleIndicator",
+    # text / buttons / indicators
+    "activextextdspclassnoedit": "PyDMLabel",  # the parser strips the colon from activeXTextDspClass:noedit
+    "shellcmdclass": "QPushButton",
+    "activeexitbuttonclass": "QPushButton",
+    "activepngclass": "PyDMDrawingImage",
+    "activemeterclass": "PyDMAnalogIndicator",
+    "activeindicatorclass": "PyDMScaleIndicator",
+    "activeradiobuttonclass": "PyDMEnumButton",
+    "activefreezebuttonclass": "QPushButton",  # corpus: 0/102 samples carry a controlPv (freeze/unfreeze is local-only)
+    "activerampbuttonclass": "PyDMPushButton",
+    "activeupdownbuttonclass": "PyDMPushButton",
+    "mmvclass": "PyDMSlider",
+    "multilinetextentryclass": "PyDMLineEdit",
+    # menuMuxClass deliberately absent: macro-muxing needs a design; stays unknown-widget.
 }
 
 # EDM attributes that name a PV channel.
-EDM_CHANNEL_ATTRS = ("controlPv", "indicatorPv", "readPv", "alarmPv", "pv", "filePv", "nullPv")
+EDM_CHANNEL_ATTRS = ("controlPv", "indicatorPv", "readPv", "alarmPv", "pv", "filePv", "nullPv", "ctrl1Pv")
 
 # EDM attribute name -> Qt prop name (the key Beaver's qtPropMap consumes).
 EDM_TO_QT_PROP: dict[str, str] = {
@@ -49,6 +71,7 @@ EDM_TO_QT_PROP: dict[str, str] = {
     "pv": "channel",
     "filePv": "channel",
     "nullPv": "channel",
+    "ctrl1Pv": "channel",  # mmvClass
     # text / labels (Beaver maps "text" -> text/label per widget)
     "value": "text",
     "label": "text",
@@ -57,6 +80,7 @@ EDM_TO_QT_PROP: dict[str, str] = {
     "precision": "precision",
     "showUnits": "showUnits",
     "displayFormat": "displayFormat",
+    "format": "displayFormat",  # activeXTextDspClass(:noedit) EDM format string
     # alarm sensitivity
     "fgAlarm": "alarmSensitiveContent",
     "alarmSensitiveContent": "alarmSensitiveContent",
@@ -74,13 +98,30 @@ EDM_TO_QT_PROP: dict[str, str] = {
     "fileName": "filename",
     "symbols": "macros",
     "macro": "macros",
-    # related display (P1): a list of target files -> "filenames" (firstOf -> file)
+    # related display: a list of target files -> "filenames" (firstOf -> file)
     "displayFileName": "filenames",
-    # byte indicator (P1)
+    # byte indicator
     "numBits": "numBits",
     "shift": "shift",
     # alignment
     "fontAlign": "alignment",
+    # colors (resolved to hex by the adapter)
+    "fgColor": "foregroundColor",
+    "bgColor": "backgroundColor",
+    # British-spelled EDM keys emitted by some classes (multiLineTextEntryClass, mmvClass et al.)
+    "fgColour": "foregroundColor",
+    "bgColour": "backgroundColor",
+    # drawing
+    "lineColor": "penColor",
+    "fillColor": "brushColor",
+    "lineWidth": "penWidth",
+    "lineStyle": "penStyle",
+    "fill": "brushFill",
+    "startAngle": "startAngle",
+    "totalAngle": "spanAngle",
+    # bar/scale range
+    "min": "userMinimum",
+    "max": "userMaximum",
 }