From 67d280508bd8da299cda3a27b2796c7bfb77bf34 Mon Sep 17 00:00:00 2001 From: sliptonic Date: Tue, 6 Jan 2026 16:44:45 -0600 Subject: [PATCH] more machine cleanup --- src/Mod/CAM/CAMTests/TestMachine.py | 4 ---- src/Mod/CAM/Path/Machine/models/__init__.py | 2 -- src/Mod/CAM/Path/Machine/models/machine.py | 24 --------------------- 3 files changed, 30 deletions(-) diff --git a/src/Mod/CAM/CAMTests/TestMachine.py b/src/Mod/CAM/CAMTests/TestMachine.py index b6be85641c..2c63b55e92 100644 --- a/src/Mod/CAM/CAMTests/TestMachine.py +++ b/src/Mod/CAM/CAMTests/TestMachine.py @@ -20,7 +20,6 @@ from Path.Machine.models.machine import ( OutputOptions, GCodeBlocks, ProcessingOptions, - MotionMode, MachineFactory, ) @@ -75,9 +74,6 @@ class TestMachineDataclass(PathTestUtils.PathTestBase): self.assertIsInstance(machine.blocks, GCodeBlocks) self.assertIsInstance(machine.processing, ProcessingOptions) - # Motion mode - self.assertEqual(machine.motion_mode, MotionMode.ABSOLUTE) - def test_custom_initialization(self): """Test Machine initialization with custom values and verify machine_type is derived""" # Create a 5-axis machine (XYZAC) diff --git a/src/Mod/CAM/Path/Machine/models/__init__.py b/src/Mod/CAM/Path/Machine/models/__init__.py index 1287852469..979362e01c 100644 --- a/src/Mod/CAM/Path/Machine/models/__init__.py +++ b/src/Mod/CAM/Path/Machine/models/__init__.py @@ -28,7 +28,6 @@ from .machine import ( RotaryAxis, Spindle, MachineUnits, - MotionMode, OutputUnits, OutputOptions, GCodeBlocks, @@ -42,7 +41,6 @@ __all__ = [ "RotaryAxis", "Spindle", "MachineUnits", - "MotionMode", "OutputUnits", "OutputOptions", "GCodeBlocks", diff --git a/src/Mod/CAM/Path/Machine/models/machine.py b/src/Mod/CAM/Path/Machine/models/machine.py index d6983e15f4..616725cfb4 100644 --- a/src/Mod/CAM/Path/Machine/models/machine.py +++ b/src/Mod/CAM/Path/Machine/models/machine.py @@ -65,13 +65,6 @@ class MachineUnits(Enum): IMPERIAL = "G20" -class MotionMode(Enum): - """Motion mode for machine movements.""" - - ABSOLUTE = "G90" - RELATIVE = "G91" - - class OutputUnits(Enum): """Output unit system for G-code generation.""" @@ -121,9 +114,6 @@ class OutputOptions: filter_double_parameters: bool = False # Renamed from 'output_double_parameters' filter_double_commands: bool = False # Renamed from 'modal' (moved from ProcessingOptions) - # UI and display options - show_editor: bool = True # Show editor after G-code generation - # Numeric precision settings axis_precision: int = 3 # Decimal places for axis coordinates feed_precision: int = 3 # Decimal places for feed rates @@ -174,7 +164,6 @@ class ProcessingOptions: # Conversion and expansion of Path Objects. Does not affect final gcode generation - adaptive: bool = False # Enable adaptive toolpath optimization drill_cycles_to_translate: List[str] = field( default_factory=lambda: ["G73", "G81", "G82", "G83"] ) @@ -440,9 +429,6 @@ class Machine: postprocessor_file_name: str = "" postprocessor_args: str = "" - # Motion mode - motion_mode: MotionMode = MotionMode.ABSOLUTE - # Dynamic state (for runtime) parameter_functions: Dict[str, Callable] = field(default_factory=dict) @@ -797,7 +783,6 @@ class Machine: data["postprocessor"] = { "file_name": self.postprocessor_file_name, "args": self.postprocessor_args, - "motion_mode": self.motion_mode.value, } # Output options @@ -824,7 +809,6 @@ class Machine: "output_labels": self.output.output_labels, "output_operation_labels": self.output.output_operation_labels, "output_units": self.output.output_units.value, - "show_editor": self.output.show_editor, "axis_precision": self.output.axis_precision, "feed_precision": self.output.feed_precision, "spindle_precision": self.output.spindle_precision, @@ -866,7 +850,6 @@ class Machine: # Processing options data["processing"] = { - "adaptive": self.processing.adaptive, "drill_cycles_to_translate": self.processing.drill_cycles_to_translate, "show_machine_units": self.processing.show_machine_units, "spindle_wait": self.processing.spindle_wait, @@ -1021,7 +1004,6 @@ class Machine: if post_data: config.postprocessor_file_name = post_data.get("file_name", "") config.postprocessor_args = post_data.get("args", "") - config.motion_mode = MotionMode(post_data.get("motion_mode", "G90")) # Load output options output_data = data.get("output", {}) @@ -1072,9 +1054,6 @@ class Machine: # filter_double_commands comes from processing.modal in old format config.output.filter_double_commands = output_data.get("filter_double_commands", False) - # UI and display options - config.output.show_editor = output_data.get("show_editor", True) - # Numeric precision settings (with backward compatibility) config.output.axis_precision = output_data.get("axis_precision", 3) config.output.feed_precision = output_data.get("feed_precision", 3) @@ -1091,13 +1070,10 @@ class Machine: # These fields are now in ProcessingOptions (backward compatibility) if "tool_change" in output_data: config.processing.tool_change = output_data["tool_change"] - if "adaptive" in output_data: - config.processing.adaptive = output_data["adaptive"] # Load processing options processing_data = data.get("processing", {}) if processing_data: - config.processing.adaptive = processing_data.get("adaptive", False) config.processing.drill_cycles_to_translate = processing_data.get( "drill_cycles_to_translate", ["G73", "G81", "G82", "G83"] )