PyDMConverter 1.0.5__tar.gz → 1.1.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyDMConverter
-Version: 1.0.5
+Version: 1.1.0
 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.5 → pydmconverter-1.1.0}/PyDMConverter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyDMConverter
-Version: 1.0.5
+Version: 1.1.0
 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.5 → pydmconverter-1.1.0}/PyDMConverter.egg-info/SOURCES.txt

@@ -93,6 +93,7 @@ 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/polygon.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
@@ -103,6 +104,7 @@ 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-spinbox.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
@@ -123,21 +125,30 @@ tests/test_main.py
 tests/test_options_model.py
 tests/test_react.py
 tests/test_sites.py
+tests/test_ui_rules.py
 tests/test_widgets.py
 tests/test_widgets_helpers.py
+tests/edm/test_batch2_widget_fixes.py
 tests/edm/test_byte_and_related.py
+tests/edm/test_calc_rules_and_locals.py
+tests/edm/test_channel_attrs_and_alarm_rules.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_fidelity_edm_batch.py
 tests/edm/test_graphics_widgets.py
 tests/edm/test_integration_combined.py
 tests/edm/test_ir_adapter.py
 tests/edm/test_parser.py
 tests/edm/test_parser_helpers.py
+tests/edm/test_pip_and_macro_declarations.py
+tests/edm/test_symbol_states.py
 tests/edm/test_visibility_rules.py
 tests/edm/fixtures/basic_widgets.edl
 tests/edm/fixtures/byte_and_related.edl
+tests/edm/fixtures/calc.list
+tests/edm/fixtures/calc_rules.edl
 tests/edm/fixtures/colors.edl
 tests/edm/fixtures/colors.list
 tests/edm/fixtures/exit_button.edl
@@ -153,9 +164,12 @@ 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/pip_menu.edl
 tests/edm/fixtures/png.edl
 tests/edm/fixtures/radio.edl
 tests/edm/fixtures/shell_cmd.edl
+tests/edm/fixtures/symbol_states.edl
+tests/edm/fixtures/symbol_two_state.edl
 tests/edm/fixtures/textdsp.edl
 tests/edm/fixtures/unknown.edl
 tests/edm/fixtures/visibility.edl
@@ -172,6 +186,8 @@ 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_template_repeater.py
+tests/ui/test_unmapped_classes.py
 tests/ui/fixtures/basic_widgets.ui
 tests/ui/fixtures/byte_and_related.ui
 tests/ui/fixtures/newly_supported.ui

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

@@ -1,173 +1,189 @@
 {
   "files": [
+    "mkdocs.yml",
     ".pre-commit-config.yaml",
-    "README.md",
+    "pyproject.toml",
     "environment.yml",
     "LICENSE",
-    "pyproject.toml",
-    "mkdocs.yml",
+    "README.md",
     ".gitignore",
-    "docs/arguments.md",
-    "docs/user_guide.md",
-    "docs/index.md",
-    "docs/images/pydmconverter.png",
-    "docs/reference/widgets_helpers.md",
-    "docs/reference/widgets.md",
-    "docs/reference/custom_types.md",
-    "docs/reference/pydm-converter-tool.md",
-    "docs/reference/index.md",
-    "docs/reference/edm/parser_helpers.md",
-    "docs/reference/edm/parser.md",
-    "docs/reference/edm/menumux.md",
-    "docs/reference/edm/converter.md",
-    "docs/reference/edm/converter_helpers.md",
-    "tests/test_react.py",
+    ".github/ISSUE_TEMPLATE/bug-report.yml",
+    ".github/ISSUE_TEMPLATE/feature-request.yml",
+    ".github/workflows/pypi_release.yml",
+    ".github/workflows/lint.yml",
+    ".github/workflows/gh-pages.yml",
+    ".github/workflows/tests.yml",
+    "examples/all_bsy0_main.edl",
+    "examples/prosilica.edl",
+    "examples/all_bsy0_main_with_groups.edl",
+    "examples/TEM_mapping.edl",
     "tests/test_headless_import.py",
-    "tests/__init__.py",
+    "tests/test_react.py",
     "tests/test_widgets_helpers.py",
     "tests/test_widgets.py",
-    "tests/test_sites.py",
+    "tests/__init__.py",
     "tests/test_options_model.py",
+    "tests/test_sites.py",
     "tests/test_main.py",
-    "tests/ir/test_ir_transforms.py",
-    "tests/ir/test_ir_fox.py",
-    "tests/ir/test_ir_ids.py",
-    "tests/ir/__init__.py",
-    "tests/ir/test_ir_model.py",
-    "tests/ir/test_ir_builder.py",
-    "tests/ir/conftest.py",
-    "tests/ir/test_ir_registry.py",
-    "tests/ir/test_ir_emit.py",
-    "tests/ir/test_ir_schema.py",
-    "tests/ui/__init__.py",
-    "tests/ui/test_ir_adapter.py",
-    "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/test_ui_rules.py",
+    "tests/edm/test_channel_attrs_and_alarm_rules.py",
+    "tests/edm/test_graphics_widgets.py",
+    "tests/edm/test_control_widgets.py",
+    "tests/edm/test_symbol_states.py",
     "tests/edm/test_parser_helpers.py",
     "tests/edm/test_integration_combined.py",
+    "tests/edm/test_visibility_rules.py",
+    "tests/edm/test_colors.py",
+    "tests/edm/test_fidelity_edm_batch.py",
+    "tests/edm/test_byte_and_related.py",
+    "tests/edm/test_pip_and_macro_declarations.py",
+    "tests/edm/test_calc_rules_and_locals.py",
     "tests/edm/test_parser.py",
+    "tests/edm/test_converter_helpers.py",
+    "tests/edm/test_batch2_widget_fixes.py",
     "tests/edm/test_converter.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/test_ir_adapter.py",
+    "tests/edm/fixtures/byte_and_related.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/pip_menu.edl",
+    "tests/edm/fixtures/png.edl",
+    "tests/edm/fixtures/visibility.edl",
+    "tests/edm/fixtures/calc_rules.edl",
     "tests/edm/fixtures/exit_button.edl",
-    "tests/edm/fixtures/basic_widgets.edl",
+    "tests/edm/fixtures/graphics_line.edl",
+    "tests/edm/fixtures/meter.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/radio.edl",
+    "tests/edm/fixtures/colors.edl",
+    "tests/edm/fixtures/calc.list",
+    "tests/edm/fixtures/symbol_two_state.edl",
+    "tests/edm/fixtures/symbol_states.edl",
     "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/textdsp.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/shell_cmd.edl",
     "tests/edm/fixtures/graphics_circle.edl",
-    "tests/edm/fixtures/meter.edl",
+    "tests/edm/fixtures/colors.list",
+    "tests/edm/fixtures/mmv_multiline.edl",
+    "tests/edm/fixtures/basic_widgets.edl",
+    "tests/edm/fixtures/integration_combined.screen.json",
     "tests/edm/fixtures/graphics_group.edl",
-    "app/resources/file_minus.png",
-    "app/resources/folder_search.png",
-    "app/resources/play_circle_outline.png",
-    "app/resources/settings.png",
-    "app/resources/file_plus.png",
-    "app/resources/file_x.png",
-    "app/resources/folder_plus.png",
-    "app/src/view/output_select_dialog.py",
-    "app/src/view/main_window.ui",
-    "app/src/view/__init__.py",
-    "app/src/view/main_window.py",
-    "app/src/view/file_select_widget.py",
-    "app/src/view/options_window.py",
-    "app/src/model/__init__.py",
-    "app/src/model/app_model.py",
-    "app/src/model/options_model.py",
-    "pydmconverter/react.py",
+    "tests/edm/fixtures/graphics_rect.edl",
+    "tests/ui/test_template_repeater.py",
+    "tests/ui/test_unmapped_classes.py",
+    "tests/ui/__init__.py",
+    "tests/ui/test_byte_and_related.py",
+    "tests/ui/test_ir_adapter.py",
+    "tests/ui/fixtures/basic_widgets.ui",
+    "tests/ui/fixtures/byte_and_related.ui",
+    "tests/ui/fixtures/newly_supported.ui",
+    "tests/ir/test_ir_schema.py",
+    "tests/ir/test_ir_registry.py",
+    "tests/ir/test_ir_fox.py",
+    "tests/ir/test_ir_ids.py",
+    "tests/ir/test_ir_builder.py",
+    "tests/ir/__init__.py",
+    "tests/ir/test_ir_transforms.py",
+    "tests/ir/test_ir_model.py",
+    "tests/ir/conftest.py",
+    "tests/ir/test_ir_emit.py",
     "pydmconverter/widgets.py",
+    "pydmconverter/react.py",
     "pydmconverter/__init__.py",
-    "pydmconverter/exceptions.py",
     "pydmconverter/launch_gui.sh",
+    "pydmconverter/exceptions.py",
+    "pydmconverter/__main__.py",
     "pydmconverter/widgets_helpers.py",
     "pydmconverter/custom_types.py",
-    "pydmconverter/__main__.py",
-    "pydmconverter/ir/model.py",
-    "pydmconverter/ir/__init__.py",
-    "pydmconverter/ir/source.py",
+    "pydmconverter/edm/menumux.py",
+    "pydmconverter/edm/parser.py",
+    "pydmconverter/edm/converter_helpers.py",
+    "pydmconverter/edm/ir_adapter.py",
+    "pydmconverter/edm/edm_qt.py",
+    "pydmconverter/edm/__init__.py",
+    "pydmconverter/edm/parser_helpers.py",
+    "pydmconverter/edm/converter.py",
+    "pydmconverter/ui/ir_adapter.py",
+    "pydmconverter/ui/__init__.py",
+    "pydmconverter/sites/__init__.py",
+    "pydmconverter/sites/slac.py",
     "pydmconverter/ir/schema.py",
-    "pydmconverter/ir/fox.py",
-    "pydmconverter/ir/emit.py",
+    "pydmconverter/ir/macros.py",
+    "pydmconverter/ir/builder.py",
     "pydmconverter/ir/transforms.py",
+    "pydmconverter/ir/fox.py",
     "pydmconverter/ir/ids.py",
-    "pydmconverter/ir/builder.py",
-    "pydmconverter/ir/macros.py",
+    "pydmconverter/ir/__init__.py",
     "pydmconverter/ir/registry.py",
+    "pydmconverter/ir/source.py",
+    "pydmconverter/ir/model.py",
     "pydmconverter/ir/base.py",
-    "pydmconverter/ir/data/screen-ir.schema.json",
+    "pydmconverter/ir/emit.py",
     "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/screen-ir.schema.json",
+    "pydmconverter/ir/data/widget-registry/line.json",
+    "pydmconverter/ir/data/widget-registry/arc.json",
     "pydmconverter/ir/data/widget-registry/pv-button.json",
-    "pydmconverter/ir/data/widget-registry/regular-button.json",
+    "pydmconverter/ir/data/widget-registry/pv-enum-combobox.json",
+    "pydmconverter/ir/data/widget-registry/waveform-plot.json",
     "pydmconverter/ir/data/widget-registry/pv-progress-bar.json",
     "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/shell-command-button.json",
+    "pydmconverter/ir/data/widget-registry/pv-meter.json",
+    "pydmconverter/ir/data/widget-registry/pv-led.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/pv-slider.json",
+    "pydmconverter/ir/data/widget-registry/pv-byte-led.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/group.json",
+    "pydmconverter/ir/data/widget-registry/image-view.json",
+    "pydmconverter/ir/data/widget-registry/pv-checkbox.json",
+    "pydmconverter/ir/data/widget-registry/rectangle.json",
     "pydmconverter/ir/data/widget-registry/related-display-button.json",
+    "pydmconverter/ir/data/widget-registry/qwidget-container.json",
+    "pydmconverter/ir/data/widget-registry/ellipse.json",
+    "pydmconverter/ir/data/widget-registry/pv-text-input.json",
+    "pydmconverter/ir/data/widget-registry/pv-spinbox.json",
+    "pydmconverter/ir/data/widget-registry/pv-label.json",
+    "pydmconverter/ir/data/widget-registry/frame.json",
     "pydmconverter/ir/data/widget-registry/pv-radio-group.json",
-    "pydmconverter/ir/data/widget-registry/pv-led.json",
-    "pydmconverter/ui/__init__.py",
-    "pydmconverter/ui/ir_adapter.py",
-    "pydmconverter/sites/__init__.py",
-    "pydmconverter/sites/slac.py",
-    "pydmconverter/edm/__init__.py",
-    "pydmconverter/edm/ir_adapter.py",
-    "pydmconverter/edm/converter_helpers.py",
-    "pydmconverter/edm/menumux.py",
-    "pydmconverter/edm/parser.py",
-    "pydmconverter/edm/converter.py",
-    "pydmconverter/edm/edm_qt.py",
-    "pydmconverter/edm/parser_helpers.py",
-    "examples/prosilica.edl",
-    "examples/TEM_mapping.edl",
-    "examples/all_bsy0_main.edl",
-    "examples/all_bsy0_main_with_groups.edl",
-    ".github/ISSUE_TEMPLATE/feature-request.yml",
-    ".github/ISSUE_TEMPLATE/bug-report.yml",
-    ".github/workflows/pypi_release.yml",
-    ".github/workflows/tests.yml",
-    ".github/workflows/lint.yml",
-    ".github/workflows/gh-pages.yml"
+    "pydmconverter/ir/data/widget-registry/polygon.json",
+    "pydmconverter/ir/data/widget-registry/scroll-area.json",
+    "pydmconverter/ir/data/widget-registry/regular-button.json",
+    "pydmconverter/ir/data/widget-registry/embedded-display.json",
+    "pydmconverter/ir/data/widget-registry/tabs.json",
+    "app/resources/file_plus.png",
+    "app/resources/play_circle_outline.png",
+    "app/resources/file_minus.png",
+    "app/resources/settings.png",
+    "app/resources/file_x.png",
+    "app/resources/folder_plus.png",
+    "app/resources/folder_search.png",
+    "app/src/model/app_model.py",
+    "app/src/model/options_model.py",
+    "app/src/model/__init__.py",
+    "app/src/view/main_window.ui",
+    "app/src/view/output_select_dialog.py",
+    "app/src/view/options_window.py",
+    "app/src/view/__init__.py",
+    "app/src/view/main_window.py",
+    "app/src/view/file_select_widget.py",
+    "docs/user_guide.md",
+    "docs/arguments.md",
+    "docs/index.md",
+    "docs/images/pydmconverter.png",
+    "docs/reference/widgets_helpers.md",
+    "docs/reference/custom_types.md",
+    "docs/reference/widgets.md",
+    "docs/reference/pydm-converter-tool.md",
+    "docs/reference/index.md",
+    "docs/reference/edm/parser.md",
+    "docs/reference/edm/converter_helpers.md",
+    "docs/reference/edm/parser_helpers.md",
+    "docs/reference/edm/menumux.md",
+    "docs/reference/edm/converter.md"
   ]
 }

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

@@ -0,0 +1,8 @@
+{
+  "tag": "1.1.0",
+  "distance": 0,
+  "node": "g019ee4e93a218c374536cefb02b823c824565ee4",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-07-22"
+}

{pydmconverter-1.0.5 → pydmconverter-1.1.0}/pydmconverter/__main__.py

@@ -41,7 +41,7 @@ def run(
     out_format="json",
 ):
     if target == "react":
-        run_react(input_file, output_file, override)
+        run_react(input_file, output_file, override, site=site, calc_list=calc_list)
         return
 
     input_path: Path = Path(input_file)
@@ -75,18 +75,20 @@ def run(
             print(f"Failed files: {', '.join(map(lambda path: str(path), files_failed))}")
 
 
-def run_react(input_file, output_file, override) -> None:
+def run_react(input_file, output_file, override, site=None, calc_list=None) -> None:
     """Convert .edl/.ui to Canopy Screen IR JSON (the --target react path)."""
     from pydmconverter import react
 
     input_path = Path(input_file)
     output_path = Path(output_file)
     if input_path.is_file():
-        out = react.convert_file(input_path, output_path, override=override)
+        out = react.convert_file(input_path, output_path, override=override, calc_list_path=calc_list, site=site)
         print(f"Converted {input_path} -> {out}")
     else:
         output_path.mkdir(parents=True, exist_ok=True)
-        found, failed = react.convert_folder(input_path, output_path, override=override)
+        found, failed = react.convert_folder(
+            input_path, output_path, override=override, calc_list_path=calc_list, site=site
+        )
         if found == 0:
             print(f"No {' or '.join(react.SUPPORTED_SUFFIXES)} files found in {input_path}")
         else:

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

@@ -29,11 +29,14 @@ EDM_TO_QT_CLASS: dict[str, str] = {
     "activemotifsliderclass": "PyDMSlider",
     "activesliderclass": "PyDMSlider",
     "activetriumfsliderclass": "PyDMSlider",
-    "activechoicebuttonclass": "PyDMEnumComboBox",
+    # EDM choice button IS a radio set: every state visible, current one lit
+    # (a dropdown hides the alternatives and, closed, showed only the ordinal).
+    "activechoicebuttonclass": "PyDMEnumButton",
     "activepipclass": "PyDMEmbeddedDisplay",
     # byte indicator / related display
     "byteclass": "PyDMByteIndicator",
     "relateddisplayclass": "PyDMRelatedDisplayButton",
+    "xygraphclass": "PyDMWaveformPlot",
     # graphics
     "activerectangleclass": "PyDMDrawingRectangle",
     "activecircleclass": "PyDMDrawingEllipse",
@@ -58,20 +61,24 @@ EDM_TO_QT_CLASS: dict[str, str] = {
     # 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", "ctrl1Pv")
+# EDM attributes that name a data-PV channel, in PRIMARY-channel priority order.
+# When an object carries several (EDM buttons pair controlPv with indicatorPv),
+# controlPv wins: it is the write/primary channel; readPv/indicatorPv are
+# readbacks; the rest only ever appear alone. The adapter picks primary +
+# readback explicitly (ir_adapter._apply_channel_attrs) — funneling them all to
+# the single "channel" prop kept only the last attr parsed and re-pointed
+# widgets at the wrong PV.
+EDM_PRIMARY_CHANNEL_ORDER = ("controlPv", "readPv", "indicatorPv", "pv", "filePv", "nullPv", "ctrl1Pv")
+# Readback preference when a second data channel is present.
+EDM_READBACK_CHANNEL_ORDER = ("indicatorPv", "readPv")
+# alarmPv is deliberately NOT a data channel: it names the alarm-severity source
+# for alarm-color rules (ir_adapter._alarm_rules) and must never steal the
+# widget's channel (nor make a static label "live" — see has_pv).
+EDM_CHANNEL_ATTRS = EDM_PRIMARY_CHANNEL_ORDER + ("alarmPv",)
 
 # EDM attribute name -> Qt prop name (the key Beaver's qtPropMap consumes).
+# Channel attrs are absent on purpose: the adapter routes them itself.
 EDM_TO_QT_PROP: dict[str, str] = {
-    # channels (all funnel to "channel"; Beaver maps channel -> pv via stripProtocol)
-    "controlPv": "channel",
-    "indicatorPv": "channel",
-    "readPv": "channel",
-    "alarmPv": "channel",
-    "pv": "channel",
-    "filePv": "channel",
-    "nullPv": "channel",
-    "ctrl1Pv": "channel",  # mmvClass
     # text / labels (Beaver maps "text" -> text/label per widget)
     "value": "text",
     "label": "text",
@@ -85,9 +92,19 @@ EDM_TO_QT_PROP: dict[str, str] = {
     "fgAlarm": "alarmSensitiveContent",
     "alarmSensitiveContent": "alarmSensitiveContent",
     "alarmSensitiveBorder": "alarmSensitiveBorder",
-    # button values
+    # button values / state labels / behavior
     "pressValue": "pressValue",
     "releaseValue": "releaseValue",
+    "onLabel": "onLabel",
+    "offLabel": "offLabel",
+    "buttonType": "buttonType",
+    # state colors (buttons and byte indicators share the attr names)
+    "onColor": "onColor",
+    "offColor": "offColor",
+    # typography: EDM font strings ("helvetica-bold-r-12.0") -> pixel size.
+    # Without this every label rendered at the theme default and overflowed
+    # its EDM-sized box (ellipsis, or silently clipped digits).
+    "font": "fontSize",
     # slider
     "scaleMin": "userMinimum",
     "scaleMax": "userMaximum",
@@ -126,8 +143,13 @@ EDM_TO_QT_PROP: dict[str, str] = {
 
 
 def has_pv(properties: dict[str, Any]) -> bool:
-    """True if the EDM object carries any PV channel attribute."""
-    return any(attr in properties for attr in EDM_CHANNEL_ATTRS)
+    """True if the EDM object carries a DATA channel attribute.
+
+    alarmPv does not count: it only feeds alarm-color rules, so e.g. a static
+    label with an alarmPv stays a static label (previously it converted to a
+    live pv-label bound to the alarm PV and displayed that PV's value).
+    """
+    return any(attr in properties for attr in EDM_PRIMARY_CHANNEL_ORDER)
 
 
 def resolve_qt_class(name_lower: str, properties: dict[str, Any]) -> str | None:
@@ -136,7 +158,13 @@ def resolve_qt_class(name_lower: str, properties: dict[str, Any]) -> str | None:
     A static ``activeXTextClass`` (no PV) is a label with fixed text, so it maps to
     ``QLabel`` (-> ``text-label``, which has a ``text`` prop). With a PV it is a live
     value display, so it maps to ``PyDMLabel`` (-> ``pv-label``).
+
+    A closed or filled ``activeLineClass`` is a polygon, not a polyline — the
+    polyline widget has no fill, so EDM's filled shapes (triangles, flow arrows)
+    rendered as empty outlines.
     """
     if name_lower == "activextextclass" and not has_pv(properties):
         return "QLabel"
+    if name_lower == "activelineclass" and (properties.get("fill") or properties.get("closePolygon")):
+        return "PyDMDrawingIrregularPolygon"
     return EDM_TO_QT_CLASS.get(name_lower)