CURA-5370 The minimum offset between objects in the Arranger is now determined by the brim/skirt/... setting

This commit is contained in:
Jack Ha 2018-05-23 12:54:18 +02:00
parent f5bed242ed
commit a3ac20172b
4 changed files with 53 additions and 17 deletions

View file

@ -1264,7 +1264,8 @@ class CuraApplication(QtApplication):
# \param nodes nodes that we have to place
# \param fixed_nodes nodes that are placed in the arranger before finding spots for nodes
def arrange(self, nodes, fixed_nodes):
job = ArrangeObjectsJob(nodes, fixed_nodes)
min_offset = self.getBuildVolume().getEdgeDisallowedSize() + 2 # Allow for some rounding errors
job = ArrangeObjectsJob(nodes, fixed_nodes, min_offset = max(min_offset, 8))
job.start()
## Reload all mesh data on the screen from file.
@ -1613,7 +1614,6 @@ class CuraApplication(QtApplication):
if(original_node.getScale() != Vector(1.0, 1.0, 1.0)):
node.scale(original_node.getScale())
node.setSelectable(True)
node.setName(os.path.basename(filename))
self.getBuildVolume().checkBoundsAndUpdate(node)