diff options
author | Jaime van Kessel <nallath@gmail.com> | 2019-07-19 17:23:57 +0300 |
---|---|---|
committer | Jaime van Kessel <nallath@gmail.com> | 2019-07-19 17:23:57 +0300 |
commit | 6bb9e6097a0a1c5c89cc4475dfd2d36c7e35e6e9 (patch) | |
tree | dc95895e1592429c97fa6b5b7689da37f9bce705 /cura | |
parent | d59e74c8678c088b74b5b9250d715ee021cf8380 (diff) |
Rename "collideWithArea" to "collideWithAreas"
This better reflects what it does (eg; it is checking for multiple colissions, not just one)
Diffstat (limited to 'cura')
-rwxr-xr-x | cura/BuildVolume.py | 4 | ||||
-rw-r--r-- | cura/Scene/CuraSceneNode.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index bf38e6e562..e47659a7c1 100755 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -258,7 +258,7 @@ class BuildVolume(SceneNode): node.setOutsideBuildArea(True) continue - if node.collidesWithArea(self.getDisallowedAreas()): + if node.collidesWithAreas(self.getDisallowedAreas()): node.setOutsideBuildArea(True) continue # If the entire node is below the build plate, still mark it as outside. @@ -312,7 +312,7 @@ class BuildVolume(SceneNode): node.setOutsideBuildArea(True) return - if node.collidesWithArea(self.getDisallowedAreas()): + if node.collidesWithAreas(self.getDisallowedAreas()): node.setOutsideBuildArea(True) return diff --git a/cura/Scene/CuraSceneNode.py b/cura/Scene/CuraSceneNode.py index 38a988f982..01f3bd9055 100644 --- a/cura/Scene/CuraSceneNode.py +++ b/cura/Scene/CuraSceneNode.py @@ -87,7 +87,7 @@ class CuraSceneNode(SceneNode): ] ## 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") if convex_hull: if not convex_hull.isValid(): |