3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 23:05:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '3.2'

Browse source
This commit is contained in:
Jack Ha 2018-01-23 14:25:11 +01:00
commit b0d0b75662
7 changed files with 66 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

84
cura/BuildVolume.py
View file

@ -1,8 +1,9 @@
# Copyright (c) 2018 Ultimaker B.V.
# Copyright (c) 2017 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.
from cura.Scene.CuraSceneNode import CuraSceneNode
from cura.Settings.ExtruderManager import ExtruderManager
from UM.Settings.ContainerRegistry import ContainerRegistry
from UM.i18n import i18nCatalog
from UM.Scene.Platform import Platform
from UM.Scene.Iterator.BreadthFirstIterator import BreadthFirstIterator
@ -194,51 +195,52 @@ class BuildVolume(SceneNode):
return True
## For every sliceable node, update node._outside_buildarea.
def updateAllBoundaryChecks(self):
self.updateNodeBoundaryCheck(Application.getInstance().getController().getScene().getRoot())
## For a single node, update _outside_buildarea.
## For every sliceable node, update node._outside_buildarea
#
# If the node is a group node, the child nodes will also get updated.
# \param node The node to update the boundary checks of.
def updateNodeBoundaryCheck(self, node: SceneNode):
if not node.callDecoration("isSliceable") and not node.callDecoration("isGroup"):
for child in node.getChildren(): #Still update the children! For instance, the root is not sliceable.
self.updateNodeBoundaryCheck(child)
return #Don't compute for non-sliceable nodes.
def updateNodeBoundaryCheck(self):
root = Application.getInstance().getController().getScene().getRoot()
nodes = list(BreadthFirstIterator(root))
group_nodes = []
#Mark the node as outside the build volume if the bounding box test fails.
build_volume = self.getBoundingBox()
if build_volume is None:
#No bounding box. This is triggered when running Cura from command line with a model for the first time.
#In that situation there is a model, but no machine (and therefore no build volume).
build_volume_bounding_box = self.getBoundingBox()
if build_volume_bounding_box:
# It's over 9000!
build_volume_bounding_box = build_volume_bounding_box.set(bottom=-9001)
else:
# No bounding box. This is triggered when running Cura from command line with a model for the first time
# In that situation there is a model, but no machine (and therefore no build volume.
return
build_volume = build_volume.set(bottom = -999999) #Allow models to clip the build plate. This should allow printing but remove the bottom side of the model underneath the build plate.
bounding_box = node.getBoundingBox()
if build_volume.intersectsBox(bounding_box) != AxisAlignedBox.IntersectionResult.FullIntersection:
node._outside_buildarea = True
else:
#Check for collisions between disallowed areas and the object.
convex_hull = node.callDecoration("getConvexHull")
if not convex_hull or not convex_hull.isValid():
return
for area in self.getDisallowedAreas():
overlap = convex_hull.intersectsPolygon(area)
if overlap is not None:
node._outside_buildarea = True
break
else:
for node in nodes:
# Need to check group nodes later
if node.callDecoration("isGroup"):
group_nodes.append(node) # Keep list of affected group_nodes
if node.callDecoration("isSliceable") or node.callDecoration("isGroup"):
node._outside_buildarea = False
bbox = node.getBoundingBox()
#Group nodes should override the _outside_buildarea property of their children.
if node.callDecoration("isGroup"):
for child in node.getAllChildren():
child._outside_buildarea = node._outside_buildarea
else:
for child in node.getChildren():
self.updateNodeBoundaryCheck(child)
# Mark the node as outside the build volume if the bounding box test fails.
if build_volume_bounding_box.intersectsBox(bbox) != AxisAlignedBox.IntersectionResult.FullIntersection:
node._outside_buildarea = True
continue
convex_hull = node.callDecoration("getConvexHull")
if convex_hull:
if not convex_hull.isValid():
return
# Check for collisions between disallowed areas and the object
for area in self.getDisallowedAreas():
overlap = convex_hull.intersectsPolygon(area)
if overlap is None:
continue
node._outside_buildarea = True
continue
# Group nodes should override the _outside_buildarea property of their children.
for group_node in group_nodes:
for child_node in group_node.getAllChildren():
child_node._outside_buildarea = group_node._outside_buildarea
## Update the outsideBuildArea of a single node, given bounds or current build volume
def checkBoundsAndUpdate(self, node: CuraSceneNode, bounds: Optional[AxisAlignedBox] = None):
@ -461,7 +463,7 @@ class BuildVolume(SceneNode):
Application.getInstance().getController().getScene()._maximum_bounds = scale_to_max_bounds
self.updateAllBoundaryChecks()
self.updateNodeBoundaryCheck()
def getBoundingBox(self) -> AxisAlignedBox:
return self._volume_aabb

13
cura/PlatformPhysics.py
View file

@ -1,4 +1,4 @@
# Copyright (c) 2018 Ultimaker B.V.
# Copyright (c) 2015 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.
from PyQt5.QtCore import QTimer
@ -56,17 +56,14 @@ class PlatformPhysics:
# By shuffling the order of the nodes, this might happen a few times, but at some point it will resolve.
nodes = list(BreadthFirstIterator(root))
# Only check nodes inside build area.
nodes = [node for node in nodes if (hasattr(node, "_outside_buildarea") and not node._outside_buildarea)]
random.shuffle(nodes)
for node in nodes:
if node is root or not isinstance(node, SceneNode) or node.getBoundingBox() is None:
continue
#Only check nodes inside the build area.
if not hasattr(node, "_outside_buildarea"):
self._build_volume.updateNodeBoundaryCheck(node)
if getattr(node, "_outside_buildarea", True):
continue
bbox = node.getBoundingBox()
# Move it downwards if bottom is above platform
@ -158,7 +155,7 @@ class PlatformPhysics:
# After moving, we have to evaluate the boundary checks for nodes
build_volume = Application.getInstance().getBuildVolume()
build_volume.updateAllBoundaryChecks()
build_volume.updateNodeBoundaryCheck()
def _onToolOperationStarted(self, tool):
self._enabled = False

4
cura/Scene/CuraSceneNode.py
View file

@ -1,7 +1,5 @@
# Copyright (c) 2018 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.
from UM.Application import Application
from UM.Logger import Logger
from UM.Scene.SceneNode import SceneNode
from copy import deepcopy

9
cura/Settings/GlobalStack.py
View file

@ -31,6 +31,7 @@ class GlobalStack(CuraContainerStack):
# and if so, to bypass the resolve to prevent an infinite recursion that would occur
# if the resolve function tried to access the same property it is a resolve for.
self._resolving_settings = set()
self._resolving_settings2 = [] # For debugging CURA-4848, if it happens
## Get the list of extruders of this stack.
#
@ -91,9 +92,17 @@ class GlobalStack(CuraContainerStack):
# Handle the "resolve" property.
if self._shouldResolve(key, property_name, context):
self._resolving_settings2.append(key)
self._resolving_settings.add(key)
resolve = super().getProperty(key, "resolve", context)
if key not in self._resolving_settings:
Logger.log("e", "Key [%s] should really have been in set(%s) and [%s]. Now I'm gonna crash", key, str(self._resolving_settings), str(self._resolving_settings2))
Logger.log("d", "------ context ------")
for stack in context.stack_of_containers:
Logger.log("d", "Context: %s", stack.getId())
Logger.log("d", "------ context end ------")
self._resolving_settings.remove(key)
self._resolving_settings2.pop()
if resolve is not None:
return resolve