Browse Source

Avoid bool-trap

CURA-7951
c.lamboo 1 year ago
parent
commit
586739c547
3 changed files with 6 additions and 5 deletions
  1. 4 3
      cura/Arranging/Arranger.py
  2. 1 1
      cura/Arranging/GridArrange.py
  3. 1 1
      cura/Arranging/Nest2DArrange.py

+ 4 - 3
cura/Arranging/Arranger.py

@@ -5,7 +5,7 @@ if TYPE_CHECKING:
 
 
 class Arranger:
-    def createGroupOperationForArrange(self, add_new_nodes_in_scene: bool = False) -> Tuple["GroupedOperation", int]:
+    def createGroupOperationForArrange(self, *, add_new_nodes_in_scene: bool = False) -> Tuple["GroupedOperation", int]:
         """
         Find placement for a set of scene nodes, but don't actually move them just yet.
         :param add_new_nodes_in_scene: Whether to create new scene nodes before applying the transformations and rotations
@@ -16,12 +16,13 @@ class Arranger:
         """
         raise NotImplementedError
 
-    def arrange(self, add_new_nodes_in_scene: bool = False) -> bool:
+    def arrange(self, *, add_new_nodes_in_scene: bool = False) -> bool:
         """
         Find placement for a set of scene nodes, and move them by using a single grouped operation.
         :param add_new_nodes_in_scene: Whether to create new scene nodes before applying the transformations and rotations
         :return: found_solution_for_all: Whether the algorithm found a place on the buildplate for all the objects
         """
-        grouped_operation, not_fit_count = self.createGroupOperationForArrange(add_new_nodes_in_scene)
+        grouped_operation, not_fit_count = self.createGroupOperationForArrange(
+            add_new_nodes_in_scene=add_new_nodes_in_scene)
         grouped_operation.push()
         return not_fit_count == 0

+ 1 - 1
cura/Arranging/GridArrange.py

@@ -71,7 +71,7 @@ class GridArrange(Arranger):
 
         self._allowed_grid_idx = self._build_plate_grid_ids.difference(self._fixed_nodes_grid_ids)
 
-    def createGroupOperationForArrange(self, add_new_nodes_in_scene: bool = False) -> Tuple[GroupedOperation, int]:
+    def createGroupOperationForArrange(self, *, add_new_nodes_in_scene: bool = False) -> Tuple[GroupedOperation, int]:
         # Find the sequence in which items are placed
         coord_build_plate_center_x = self._build_volume_bounding_box.width * 0.5 + self._build_volume_bounding_box.left
         coord_build_plate_center_y = self._build_volume_bounding_box.depth * 0.5 + self._build_volume_bounding_box.back

+ 1 - 1
cura/Arranging/Nest2DArrange.py

@@ -124,7 +124,7 @@ class Nest2DArrange(Arranger):
 
         return found_solution_for_all, node_items
 
-    def createGroupOperationForArrange(self, add_new_nodes_in_scene: bool = False) -> Tuple[GroupedOperation, int]:
+    def createGroupOperationForArrange(self, *, add_new_nodes_in_scene: bool = False) -> Tuple[GroupedOperation, int]:
         scene_root = Application.getInstance().getController().getScene().getRoot()
         found_solution_for_all, node_items = self.findNodePlacement()