GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-09-13 14:53:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename "collideWithArea" to "collideWithAreas"

Browse Source 
This better reflects what it does (eg; it is checking for multiple colissions, not just one)
This commit is contained in:
Jaime van Kessel 2019-07-19 16:23:57 +02:00
parent d59e74c867
commit 6bb9e6097a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cura/BuildVolume.py
View File

@ -258,7 +258,7 @@ class BuildVolume(SceneNode):
node.setOutsideBuildArea(True) node.setOutsideBuildArea(True)
continue continue
if node.collidesWithArea(self.getDisallowedAreas()): if node.collidesWithAreas(self.getDisallowedAreas()):
node.setOutsideBuildArea(True) node.setOutsideBuildArea(True)
continue continue
# If the entire node is below the build plate, still mark it as outside. # If the entire node is below the build plate, still mark it as outside.
@ -312,7 +312,7 @@ class BuildVolume(SceneNode):
node.setOutsideBuildArea(True) node.setOutsideBuildArea(True)
return return
if node.collidesWithArea(self.getDisallowedAreas()): if node.collidesWithAreas(self.getDisallowedAreas()):
node.setOutsideBuildArea(True) node.setOutsideBuildArea(True)
return return

2
cura/Scene/CuraSceneNode.py
View File

@ -87,7 +87,7 @@ class CuraSceneNode(SceneNode):
] ]
## Return if any area collides with the convex hull of this scene node ## Return if any area collides with the convex hull of this scene node
def collidesWithArea(self, areas: List[Polygon]) -> bool: def collidesWithAreas(self, areas: List[Polygon]) -> bool:
convex_hull = self.callDecoration("getConvexHull") convex_hull = self.callDecoration("getConvexHull")
if convex_hull: if convex_hull:
if not convex_hull.isValid(): if not convex_hull.isValid():