PyDMConverter 1.0.3__tar.gz → 1.0.4__tar.gz

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

@@ -119,3 +119,7 @@ ENV/
 .vscode/
 
 *.json
+
+# Canopy IR data files (generated schema + vendored widget registry) are tracked assets
+!pydmconverter/ir/data/*.json
+!pydmconverter/ir/data/widget-registry/*.json

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyDMConverter
-Version: 1.0.3
+Version: 1.0.4
 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>
@@ -692,13 +692,18 @@ Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pydm
-Requires-Dist: pyqt5
+Requires-Dist: pydantic>=2
+Requires-Dist: jsonschema>=4
+Provides-Extra: gui
+Requires-Dist: pydm; extra == "gui"
+Requires-Dist: pyqt5; extra == "gui"
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: pytest-qt; extra == "dev"
 Requires-Dist: pytest-mock; extra == "dev"
+Requires-Dist: pydm; extra == "dev"
+Requires-Dist: pyqt5; extra == "dev"
 Dynamic: license-file
 
 # PyDM Converter

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyDMConverter
-Version: 1.0.3
+Version: 1.0.4
 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>
@@ -692,13 +692,18 @@ Classifier: Topic :: Scientific/Engineering
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pydm
-Requires-Dist: pyqt5
+Requires-Dist: pydantic>=2
+Requires-Dist: jsonschema>=4
+Provides-Extra: gui
+Requires-Dist: pydm; extra == "gui"
+Requires-Dist: pyqt5; extra == "gui"
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: pytest-qt; extra == "dev"
 Requires-Dist: pytest-mock; extra == "dev"
+Requires-Dist: pydm; extra == "dev"
+Requires-Dist: pyqt5; extra == "dev"
 Dynamic: license-file
 
 # PyDM Converter

pydmconverter-1.0.4/PyDMConverter.egg-info/SOURCES.txt

@@ -0,0 +1,142 @@
+.gitignore
+.pre-commit-config.yaml
+LICENSE
+README.md
+environment.yml
+mkdocs.yml
+pyproject.toml
+.github/ISSUE_TEMPLATE/bug-report.yml
+.github/ISSUE_TEMPLATE/feature-request.yml
+.github/workflows/gh-pages.yml
+.github/workflows/lint.yml
+.github/workflows/pypi_release.yml
+.github/workflows/tests.yml
+PyDMConverter.egg-info/PKG-INFO
+PyDMConverter.egg-info/SOURCES.txt
+PyDMConverter.egg-info/dependency_links.txt
+PyDMConverter.egg-info/entry_points.txt
+PyDMConverter.egg-info/requires.txt
+PyDMConverter.egg-info/scm_file_list.json
+PyDMConverter.egg-info/scm_version.json
+PyDMConverter.egg-info/top_level.txt
+app/resources/file_minus.png
+app/resources/file_plus.png
+app/resources/file_x.png
+app/resources/folder_plus.png
+app/resources/folder_search.png
+app/resources/play_circle_outline.png
+app/resources/settings.png
+app/src/model/__init__.py
+app/src/model/app_model.py
+app/src/model/options_model.py
+app/src/view/__init__.py
+app/src/view/file_select_widget.py
+app/src/view/main_window.py
+app/src/view/main_window.ui
+app/src/view/options_window.py
+app/src/view/output_select_dialog.py
+docs/arguments.md
+docs/index.md
+docs/user_guide.md
+docs/images/pydmconverter.png
+docs/reference/custom_types.md
+docs/reference/index.md
+docs/reference/pydm-converter-tool.md
+docs/reference/widgets.md
+docs/reference/widgets_helpers.md
+docs/reference/edm/converter.md
+docs/reference/edm/converter_helpers.md
+docs/reference/edm/menumux.md
+docs/reference/edm/parser.md
+docs/reference/edm/parser_helpers.md
+examples/TEM_mapping.edl
+examples/all_bsy0_main.edl
+examples/all_bsy0_main_with_groups.edl
+examples/prosilica.edl
+pydmconverter/__init__.py
+pydmconverter/__main__.py
+pydmconverter/custom_types.py
+pydmconverter/exceptions.py
+pydmconverter/launch_gui.sh
+pydmconverter/react.py
+pydmconverter/widgets.py
+pydmconverter/widgets_helpers.py
+pydmconverter/edm/__init__.py
+pydmconverter/edm/converter.py
+pydmconverter/edm/converter_helpers.py
+pydmconverter/edm/edm_qt.py
+pydmconverter/edm/ir_adapter.py
+pydmconverter/edm/menumux.py
+pydmconverter/edm/parser.py
+pydmconverter/edm/parser_helpers.py
+pydmconverter/ir/__init__.py
+pydmconverter/ir/base.py
+pydmconverter/ir/builder.py
+pydmconverter/ir/emit.py
+pydmconverter/ir/fox.py
+pydmconverter/ir/ids.py
+pydmconverter/ir/macros.py
+pydmconverter/ir/model.py
+pydmconverter/ir/registry.py
+pydmconverter/ir/schema.py
+pydmconverter/ir/source.py
+pydmconverter/ir/transforms.py
+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/embedded-display.json
+pydmconverter/ir/data/widget-registry/frame.json
+pydmconverter/ir/data/widget-registry/group-box.json
+pydmconverter/ir/data/widget-registry/image-view.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-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/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/tabs.json
+pydmconverter/ir/data/widget-registry/text-label.json
+pydmconverter/sites/__init__.py
+pydmconverter/sites/slac.py
+pydmconverter/ui/__init__.py
+pydmconverter/ui/ir_adapter.py
+tests/__init__.py
+tests/test_headless_import.py
+tests/test_main.py
+tests/test_options_model.py
+tests/test_react.py
+tests/test_sites.py
+tests/test_widgets.py
+tests/test_widgets_helpers.py
+tests/edm/test_converter.py
+tests/edm/test_converter_helpers.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/ir/__init__.py
+tests/ir/conftest.py
+tests/ir/test_ir_builder.py
+tests/ir/test_ir_emit.py
+tests/ir/test_ir_fox.py
+tests/ir/test_ir_ids.py
+tests/ir/test_ir_model.py
+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_ir_adapter.py
+tests/ui/test_p1_widgets.py
+tests/ui/fixtures/p0_min.ui
+tests/ui/fixtures/p1_widgets.ui

{pydmconverter-1.0.3 → pydmconverter-1.0.4}/PyDMConverter.egg-info/requires.txt

@@ -1,8 +1,14 @@
-pydm
-pyqt5
+pydantic>=2
+jsonschema>=4
 
 [dev]
 pytest
 pytest-cov
 pytest-qt
 pytest-mock
+pydm
+pyqt5
+
+[gui]
+pydm
+pyqt5

pydmconverter-1.0.4/PyDMConverter.egg-info/scm_file_list.json

@@ -0,0 +1,138 @@
+{
+  "files": [
+    ".pre-commit-config.yaml",
+    "README.md",
+    "environment.yml",
+    "LICENSE",
+    "pyproject.toml",
+    "mkdocs.yml",
+    ".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",
+    "tests/test_headless_import.py",
+    "tests/__init__.py",
+    "tests/test_widgets_helpers.py",
+    "tests/test_widgets.py",
+    "tests/test_sites.py",
+    "tests/test_options_model.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_p1_widgets.py",
+    "tests/ui/fixtures/p1_widgets.ui",
+    "tests/ui/fixtures/p0_min.ui",
+    "tests/edm/test_converter_helpers.py",
+    "tests/edm/test_ir_adapter.py",
+    "tests/edm/test_parser_helpers.py",
+    "tests/edm/test_parser.py",
+    "tests/edm/test_converter.py",
+    "tests/edm/test_p1_widgets.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",
+    "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",
+    "pydmconverter/widgets.py",
+    "pydmconverter/__init__.py",
+    "pydmconverter/exceptions.py",
+    "pydmconverter/launch_gui.sh",
+    "pydmconverter/widgets_helpers.py",
+    "pydmconverter/custom_types.py",
+    "pydmconverter/__main__.py",
+    "pydmconverter/ir/model.py",
+    "pydmconverter/ir/__init__.py",
+    "pydmconverter/ir/source.py",
+    "pydmconverter/ir/schema.py",
+    "pydmconverter/ir/fox.py",
+    "pydmconverter/ir/emit.py",
+    "pydmconverter/ir/transforms.py",
+    "pydmconverter/ir/ids.py",
+    "pydmconverter/ir/builder.py",
+    "pydmconverter/ir/macros.py",
+    "pydmconverter/ir/registry.py",
+    "pydmconverter/ir/base.py",
+    "pydmconverter/ir/data/screen-ir.schema.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",
+    "pydmconverter/ir/data/widget-registry/regular-button.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/pv-checkbox.json",
+    "pydmconverter/ir/data/widget-registry/group-box.json",
+    "pydmconverter/ir/data/widget-registry/image-view.json",
+    "pydmconverter/ir/data/widget-registry/pv-enum-combobox.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/embedded-display.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/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-1.0.4/PyDMConverter.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "1.0.4",
+  "distance": 0,
+  "node": "gd722ac6fca7f9362464771f968e5b6c8d56d1d4e",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-06-25"
+}

{pydmconverter-1.0.3 → pydmconverter-1.0.4}/app/src/model/options_model.py

@@ -13,6 +13,7 @@ class OptionsModel:
     def __init__(self):
         # General options
         self.output_folder = None
+        self.override_existing = False
 
         # EDM options
         self.edm_override_def_colors = False
@@ -39,6 +40,9 @@ class OptionsModel:
                 output_folder = data.get("output_folder", None)
                 if output_folder is not None and os.path.exists(output_folder):
                     self.output_folder = output_folder
+                override_existing = data.get("override_existing", None)
+                if override_existing is not None:
+                    self.override_existing = override_existing
 
                 # EDM options
                 edm_override_def_colors = data.get("edm_override_def_colors", None)
@@ -61,6 +65,8 @@ class OptionsModel:
         # General options
         if self.output_folder is not None:
             data["output_folder"] = self.output_folder
+        if self.override_existing is not False:
+            data["override_existing"] = self.override_existing
 
         # EDM options
         if self.edm_override_def_colors is not False:

{pydmconverter-1.0.3 → pydmconverter-1.0.4}/app/src/view/main_window.py

@@ -10,6 +10,7 @@ from time import sleep
 from typing import List
 from pydm import Display
 from qtpy.QtCore import Slot, QCoreApplication
+from qtpy.QtGui import QBrush, QColor
 from qtpy.QtWidgets import (
     QFileDialog,
     QTableWidget,
@@ -27,6 +28,9 @@ import logging
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
+CONVERTED_ROW_COLOR = QColor(200, 230, 201)
+FAILED_ROW_COLOR = QColor(255, 205, 210)
+
 
 class MainWindow(Display):
     def __init__(self, parent=None, args=None, macros=None, ui_filename=None):
@@ -174,6 +178,17 @@ class MainWindow(Display):
             if conversion_status == "Converted":
                 table_widget.removeRow(i)
 
+    def set_row_status(self, row: int, status: str, color: QColor, tooltip: str = "") -> None:
+        """Sets the status cell of a row and colors the whole row"""
+        table_widget: QTableWidget = self.ui.table_widget
+        status_item = QTableWidgetItem(status)
+        status_item.setToolTip(tooltip)
+        table_widget.setItem(row, 2, status_item)
+        for col in range(table_widget.columnCount()):
+            item = table_widget.item(row, col)
+            if item is not None:
+                item.setBackground(QBrush(color))
+
     @Slot()
     def on_convert_button_clicked(self) -> None:
         table_widget: QTableWidget = self.ui.table_widget
@@ -182,12 +197,14 @@ class MainWindow(Display):
             output_file = table_widget.item(row, 1).text()
             file_type = os.path.splitext(input_file)[1].lower()
             try:
-                pydmconverter.__main__.run(input_file, output_file, file_type, override=True)
+                pydmconverter.__main__.run(
+                    input_file, output_file, file_type, override=self.options_model.override_existing
+                )
                 logger.debug(f"converted {input_file} to {output_file}")
-                table_widget.setItem(row, 2, QTableWidgetItem("Converted"))
+                self.set_row_status(row, "Converted", CONVERTED_ROW_COLOR)
             except Exception as msg:
                 logger.debug(msg)
-                table_widget.setItem(row, 2, QTableWidgetItem("Failed"))
+                self.set_row_status(row, "Failed", FAILED_ROW_COLOR, tooltip=str(msg))
             QCoreApplication.processEvents()
 
             """parser = self.app_model.parsers[file_type](input_file)

{pydmconverter-1.0.3 → pydmconverter-1.0.4}/app/src/view/options_window.py

@@ -47,12 +47,20 @@ class OptionsWindow(QWidget):
         self.output_folder_select = FileSelectWidget(path=self.options_model.output_folder, select_dir=False)
         output_folder_group_layout.addWidget(self.output_folder_select)
 
+        conversion_group = QGroupBox("Conversion")
+        conversion_group_layout = QVBoxLayout()
+        conversion_group.setLayout(conversion_group_layout)
+        self.override_existing_checkbox = QCheckBox("Overwrite existing output files")
+        self.override_existing_checkbox.setChecked(self.options_model.override_existing)
+        conversion_group_layout.addWidget(self.override_existing_checkbox)
+
         self.general_group_view = QWidget()
         general_group_layout = QVBoxLayout()
         self.general_group_view.setLayout(general_group_layout)
         general_group_label = QLabel("General")
         general_group_layout.addWidget(general_group_label)
         general_group_layout.addWidget(output_folder_group)
+        general_group_layout.addWidget(conversion_group)
         general_group_layout.addStretch()
 
         edm_colors_group = QGroupBox("colors.list")
@@ -122,6 +130,7 @@ class OptionsWindow(QWidget):
         else:
             QMessageBox.critical(self, "Invalid Path", "The entered output folder path is not valid.")
             return False
+        self.options_model.override_existing = self.override_existing_checkbox.isChecked()
 
         # EDM options
         colors_path = self.edm_override_file_select.get_path()

{pydmconverter-1.0.3 → pydmconverter-1.0.4}/pydmconverter/__main__.py

@@ -29,7 +29,21 @@ def run_gui() -> None:
     subprocess.run(["bash", str(launch_script)], check=True)
 
 
-def run(input_file, output_file, input_file_type=".edl", override=False, scrollable=False, site=None):
+def run(
+    input_file,
+    output_file,
+    input_file_type=".edl",
+    override=False,
+    scrollable=False,
+    site=None,
+    calc_list=None,
+    target="pydm",
+    out_format="json",
+):
+    if target == "react":
+        run_react(input_file, output_file, override)
+        return
+
     input_path: Path = Path(input_file)
     output_path: Path = Path(output_file)
 
@@ -39,7 +53,7 @@ def run(input_file, output_file, input_file_type=".edl", override=False, scrolla
         if output_path.is_file() and not override:
             raise FileExistsError(f"Output file '{output_path}' already exists. Use --override or -o to overwrite it.")
         copy_img_files(input_path.parent, output_path.parent)
-        convert(str(input_path), str(output_path), scrollable, site=site)
+        convert(str(input_path), str(output_path), scrollable, site=site, calc_list_file=calc_list)
     else:
         if input_file_type[0] != ".":  # prepending . so it will not pick up other file types with same suffix
             input_file_type = "." + input_file_type
@@ -47,7 +61,7 @@ def run(input_file, output_file, input_file_type=".edl", override=False, scrolla
         files_found: int
         files_failed: list[str]
         files_found, files_failed = convert_files_in_folder(
-            input_path, output_path, input_file_type, override, scrollable, site=site
+            input_path, output_path, input_file_type, override, scrollable, site=site, calc_list=calc_list
         )
 
         if files_found == 0:
@@ -61,6 +75,26 @@ def run(input_file, output_file, input_file_type=".edl", override=False, scrolla
             print(f"Failed files: {', '.join(map(lambda path: str(path), files_failed))}")
 
 
+def run_react(input_file, output_file, override) -> 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)
+        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)
+        if found == 0:
+            print(f"No {' or '.join(react.SUPPORTED_SUFFIXES)} files found in {input_path}")
+        else:
+            print(f"{found - len(failed)} files converted from {input_path}")
+        if failed:
+            print(f"{len(failed)} files failed to convert. Use --override or -o to overwrite existing files.")
+
+
 def run_cli(args: argparse.Namespace) -> None:
     """
     run PyDMConverter through command line
@@ -77,7 +111,18 @@ def run_cli(args: argparse.Namespace) -> None:
     override: bool = args.override
     scrollable: bool = args.scrollable
     site: str = args.site
-    run(input_file, output_file, input_file_type, override, scrollable, site=site)
+    calc_list: str = args.calc_list
+    run(
+        input_file,
+        output_file,
+        input_file_type,
+        override,
+        scrollable,
+        site=site,
+        calc_list=calc_list,
+        target=args.target,
+        out_format=args.format,
+    )
 
 
 """
@@ -126,7 +171,13 @@ def copy_img_files(input_path: Path, output_path: Path) -> None:
 
 
 def convert_files_in_folder(
-    input_path: Path, output_path: Path, input_file_type: str, override: bool, scrollable: bool, site=None
+    input_path: Path,
+    output_path: Path,
+    input_file_type: str,
+    override: bool,
+    scrollable: bool,
+    site=None,
+    calc_list=None,
 ) -> tuple[int, list[str]]:
     """Recursively runs convert on files in directory and subdirectories
 
@@ -162,7 +213,7 @@ def convert_files_in_folder(
             logging.warning(f"Skipped: {output_file_path} already exists. Use --override or -o to overwrite it.")
         else:
             try:
-                convert(file, output_file_path, scrollable, site=site)
+                convert(file, output_file_path, scrollable, site=site, calc_list_file=calc_list)
             except Exception as e:
                 files_failed.append(str(file))
                 logging.warning(f"Failed to convert {file}: {e}")
@@ -171,7 +222,7 @@ def convert_files_in_folder(
     subdirectories = [item for item in input_path.iterdir() if item.is_dir()]
     for subdir in subdirectories:
         sub_found, sub_failed = convert_files_in_folder(
-            subdir, output_path / subdir.name, input_file_type, override, scrollable, site=site
+            subdir, output_path / subdir.name, input_file_type, override, scrollable, site=site, calc_list=calc_list
         )
         files_found += sub_found
         files_failed += sub_failed
@@ -233,6 +284,24 @@ def main() -> None:
         default=None,
         help="Apply site-specific conversion rules (e.g., slac)",
     )
+    parser.add_argument(
+        "--calc-list",
+        type=str,
+        default=None,
+        help="Path to an EDM calc.list file used to resolve named CALC PVs",
+    )
+    parser.add_argument(
+        "--target",
+        choices=["pydm", "react"],
+        default="pydm",
+        help="Output target: 'pydm' writes .ui (default), 'react' writes Canopy Screen IR .screen.json",
+    )
+    parser.add_argument(
+        "--format",
+        choices=["json"],
+        default="json",
+        help="Output format for --target react (json; TSX is generated by the Screen Builder)",
+    )
     args: argparse.Namespace = parser.parse_args()
 
     if args.input_file:

{pydmconverter-1.0.3 → pydmconverter-1.0.4}/pydmconverter/custom_types.py

@@ -1,4 +1,5 @@
 from dataclasses import dataclass
+from typing import Optional, Union
 
 
 @dataclass(frozen=True)
@@ -24,8 +25,8 @@ class RuleArguments:
     channel: str
     show_on_true: bool
     initial_value: bool
-    visMin: int
-    visMax: int
+    visMin: Optional[Union[int, float, str]]
+    visMax: Optional[Union[int, float, str]]
 
     def __iter__(self):
         yield self.rule_type

{pydmconverter-1.0.3 → pydmconverter-1.0.4}/pydmconverter/edm/converter.py

@@ -47,12 +47,13 @@ CUSTOM_WIDGET_DEFINITIONS = {
     "PyDMShellCommand": {"extends": "QPushButton", "header": "pydm.widgets.shell_command", "container": ""},
     "PyDMSlider": {"extends": "QWidget", "header": "pydm.widgets.slider", "container": ""},
     "PyDMWaveformTable": {"extends": "QTableWidget", "header": "pydm.widgets.waveformtable", "container": ""},
+    "PyDMAnalogIndicator": {"extends": "QWidget", "header": "pydm.widgets.analog_indicator", "container": ""},
 }
 
 
-def convert(input_path, output_path, scrollable=False, site=None):
+def convert(input_path, output_path, scrollable=False, site=None, calc_list_file=None):
     try:
-        edm_parser = EDMFileParser(input_path, output_path)
+        edm_parser = EDMFileParser(input_path, output_path, calc_list_file=calc_list_file)
         logger.info(f"Successfully parsed EDM file: {input_path}")
     except FileNotFoundError:
         logger.error("File Not Found")