3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 15:44:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fix remaining merge conflict

Browse source 
Must've done something wrong? No, it's they who are wrong!

Contributes to issue CURA-2407.
This commit is contained in:
Ghostkeeper 2016-09-28 11:53:03 +02:00
parent 4fc30615ab
commit 608c442bb9
No known key found for this signature in database
GPG key ID: 701948C5954A7385
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/BuildVolume.py
View file

@ -364,7 +364,7 @@ class BuildVolume(SceneNode):
poly = Polygon(numpy.array(area, numpy.float32)) poly = Polygon(numpy.array(area, numpy.float32))
# Minkowski with zero, to ensure that the polygon is correct & watertight. # Minkowski with zero, to ensure that the polygon is correct & watertight.
poly = poly.getMinkowskiHull(Polygon(approximatedCircleVertices(0))) poly = poly.getMinkowskiHull(Polygon.approximatedCircle(0))
disallowed_polygons.append(poly) disallowed_polygons.append(poly)
extruder_manager = ExtruderManager.getInstance() extruder_manager = ExtruderManager.getInstance()
@ -385,7 +385,7 @@ class BuildVolume(SceneNode):
[prime_x + PRIME_CLEARANCE, prime_y + PRIME_CLEARANCE], [prime_x + PRIME_CLEARANCE, prime_y + PRIME_CLEARANCE],
[prime_x - PRIME_CLEARANCE, prime_y + PRIME_CLEARANCE], [prime_x - PRIME_CLEARANCE, prime_y + PRIME_CLEARANCE],
]) ])
prime_polygon = prime_polygon.getMinkowskiHull(Polygon(approximatedCircleVertices(0))) prime_polygon = prime_polygon.getMinkowskiHull(Polygon.approximatedCircle(0))
prime_tower_collision = False prime_tower_collision = False
# Check if prime polygon is intersecting with any of the other disallowed areas. # Check if prime polygon is intersecting with any of the other disallowed areas.