From 8961413bb755fa3fde66c459ae10137d2b5d8ee7 Mon Sep 17 00:00:00 2001 From: Samuel Abels Date: Tue, 20 May 2025 01:17:30 +0200 Subject: [PATCH] CAM: Fix some type hints and unnecessary debug output --- src/Mod/CAM/Path/Tool/assets/ui/filedialog.py | 16 ++++++++-------- src/Mod/CAM/Path/Tool/library/ui/editor.py | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Mod/CAM/Path/Tool/assets/ui/filedialog.py b/src/Mod/CAM/Path/Tool/assets/ui/filedialog.py index 58eadc19c9..dafbd6777b 100644 --- a/src/Mod/CAM/Path/Tool/assets/ui/filedialog.py +++ b/src/Mod/CAM/Path/Tool/assets/ui/filedialog.py @@ -35,14 +35,14 @@ from .util import ( class AssetOpenDialog(QFileDialog): def __init__( self, - asset_type: Type[Asset], + asset_class: Type[Asset], serializers: Iterable[Type[AssetSerializer]], parent=None, ): super().__init__(parent) - self.asset_type = asset_type + self.asset_class = asset_class self.serializers = list(serializers) - self.setWindowTitle("Open an asset") + self.setWindowTitle("Open an {asset_class.asset_type} file") self.setFileMode(QFileDialog.ExistingFile) filters = make_import_filters(self.serializers) self.setNameFilters(filters) @@ -65,8 +65,8 @@ class AssetOpenDialog(QFileDialog): try: raw_data = file_path.read_bytes() asset = serializer_class.deep_deserialize(raw_data) - if not isinstance(asset, self.asset_type): - raise TypeError(f"Deserialized asset is not of type {self.asset_type.asset_type}") + if not isinstance(asset, self.asset_class): + raise TypeError(f"Deserialized asset is not of type {self.asset_class.__name__}") return asset except Exception as e: QMessageBox.critical(self, "Error", f"Failed to import asset: {e}") @@ -86,12 +86,12 @@ class AssetOpenDialog(QFileDialog): class AssetSaveDialog(QFileDialog): def __init__( self, - asset_type: Type[Asset], + asset_class: Type[Asset], serializers: Iterable[Type[AssetSerializer]], parent=None, ): super().__init__(parent) - self.asset_type = asset_type + self.asset_class = asset_class self.serializers = list(serializers) self.setFileMode(QFileDialog.AnyFile) self.setAcceptMode(QFileDialog.AcceptSave) @@ -126,7 +126,7 @@ class AssetSaveDialog(QFileDialog): return False def exec(self, asset: Asset) -> Optional[Tuple[pathlib.Path, Type[AssetSerializer]]]: - self.setWindowTitle(f"Save {asset.label}") + self.setWindowTitle(f"Save {asset.label or self.asset_class.asset_type}") if super().exec_(): selected_filter = self.selectedNameFilter() file_path = pathlib.Path(self.selectedFiles()[0]) diff --git a/src/Mod/CAM/Path/Tool/library/ui/editor.py b/src/Mod/CAM/Path/Tool/library/ui/editor.py index d8f9852b65..f847207298 100644 --- a/src/Mod/CAM/Path/Tool/library/ui/editor.py +++ b/src/Mod/CAM/Path/Tool/library/ui/editor.py @@ -441,7 +441,7 @@ class LibraryEditor(object): # Load the toolbit asset for editing try: - bit = cam_assets.get(toolbit_uri) + bit = cast(ToolBit, cam_assets.get(toolbit_uri)) editor_dialog = ToolBitEditor(bit, self.form) # Create dialog instance result = editor_dialog.show() # Show as modal dialog @@ -512,7 +512,7 @@ class LibraryEditor(object): try: cam_assets.add(self.current_library) - Path.Log.info( + Path.Log.debug( f"_saveCurrentLibrary: Library " f"{self.current_library.get_uri()} saved." ) except Exception as e: @@ -538,7 +538,7 @@ class LibraryEditor(object): ) return - dialog = AssetSaveDialog(self.current_library, library_serializers, self.form) + dialog = AssetSaveDialog(Library, library_serializers, self.form) dialog_result = dialog.exec(self.current_library) if not dialog_result: return # User canceled or error