Browse Source

Merge branch 'main' into main

goofoo3d 1 year ago
parent
commit
5f81594946
2 changed files with 13 additions and 6 deletions
  1. 1 0
      cura/Arranging/Nest2DArrange.py
  2. 12 6
      cura/BuildVolume.py

+ 1 - 0
cura/Arranging/Nest2DArrange.py

@@ -99,6 +99,7 @@ def findNodePlacement(nodes_to_arrange: List["SceneNode"], build_volume: "BuildV
 
     config = NfpConfig()
     config.accuracy = 1.0
+    config.alignment = NfpConfig.Alignment.DONT_ALIGN
 
     num_bins = nest(node_items, build_plate_bounding_box, spacing, config)
 

+ 12 - 6
cura/BuildVolume.py

@@ -648,11 +648,13 @@ class BuildVolume(SceneNode):
             self._width = self._global_container_stack.getProperty("machine_width", "value")
             machine_height = self._global_container_stack.getProperty("machine_height", "value")
             if self._global_container_stack.getProperty("print_sequence", "value") == "one_at_a_time" and len(self._scene_objects) > 1:
-                self._height = min(self._global_container_stack.getProperty("gantry_height", "value") * self._scale_vector.z, machine_height)
-                if self._height < (machine_height * self._scale_vector.z):
+                new_height = min(self._global_container_stack.getProperty("gantry_height", "value") * self._scale_vector.z, machine_height)
+
+                if self._height > new_height:
                     self._build_volume_message.show()
-                else:
+                elif self._height < new_height:
                     self._build_volume_message.hide()
+                self._height = new_height
             else:
                 self._height = self._global_container_stack.getProperty("machine_height", "value")
                 self._build_volume_message.hide()
@@ -690,11 +692,15 @@ class BuildVolume(SceneNode):
             if setting_key == "print_sequence":
                 machine_height = self._global_container_stack.getProperty("machine_height", "value")
                 if self._application.getGlobalContainerStack().getProperty("print_sequence", "value") == "one_at_a_time" and len(self._scene_objects) > 1:
-                    self._height = min(self._global_container_stack.getProperty("gantry_height", "value") * self._scale_vector.z, machine_height)
-                    if self._height < (machine_height * self._scale_vector.z):
+                    new_height = min(
+                        self._global_container_stack.getProperty("gantry_height", "value") * self._scale_vector.z,
+                        machine_height)
+
+                    if self._height > new_height:
                         self._build_volume_message.show()
-                    else:
+                    elif self._height < new_height:
                         self._build_volume_message.hide()
+                    self._height = new_height
                 else:
                     self._height = self._global_container_stack.getProperty("machine_height", "value") * self._scale_vector.z
                     self._build_volume_message.hide()