GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 06:28:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Account for skirt size and disallowed areas to set the scale to max size

Browse Source 
Contributes to Asana issue 37107676459484
This commit is contained in:
Arjen Hiemstra 2015-06-25 13:53:33 +02:00
parent 254f86faf7
commit 8ca0e8eef2
1 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
cura/BuildVolume.py
View File

@ -42,6 +42,9 @@ class BuildVolume(SceneNode):
def setDepth(self, depth): def setDepth(self, depth):
self._depth = depth self._depth = depth
def getDisallowedAreas(self):
return self._disallowed_areas
def setDisallowedAreas(self, areas): def setDisallowedAreas(self, areas):
self._disallowed_areas = areas self._disallowed_areas = areas
@ -109,19 +112,43 @@ class BuildVolume(SceneNode):
v = self._grid_mesh.getVertex(n) v = self._grid_mesh.getVertex(n)
self._grid_mesh.setVertexUVCoordinates(n, v[0], v[2]) self._grid_mesh.setVertexUVCoordinates(n, v[0], v[2])
disallowed_area_size = 0
if self._disallowed_areas: if self._disallowed_areas:
mb = MeshBuilder() mb = MeshBuilder()
for area in self._disallowed_areas: for polygon in self._disallowed_areas:
points = polygon.getPoints()
mb.addQuad( mb.addQuad(
area[0], Vector(points[0, 0], 0.1, points[0, 1]),
area[1], Vector(points[1, 0], 0.1, points[1, 1]),
area[2], Vector(points[2, 0], 0.1, points[2, 1]),
area[3], Vector(points[3, 0], 0.1, points[3, 1]),
color = Color(174, 174, 174, 255) color = Color(174, 174, 174, 255)
) )
# Find the largest disallowed area to exclude it from the maximum scale bounds
size = abs(numpy.max(points[:, 1]) - numpy.min(points[:, 1]))
disallowed_area_size = max(size, disallowed_area_size)
self._disallowed_area_mesh = mb.getData() self._disallowed_area_mesh = mb.getData()
else: else:
self._disallowed_area_mesh = None self._disallowed_area_mesh = None
self._aabb = AxisAlignedBox(minimum = Vector(minW, minH - 1.0, minD), maximum = Vector(maxW, maxH, maxD)) self._aabb = AxisAlignedBox(minimum = Vector(minW, minH - 1.0, minD), maximum = Vector(maxW, maxH, maxD))
settings = Application.getInstance().getActiveMachine()
skirt_size = 0.0
if settings.getSettingValueByKey("adhesion_type") == "None":
skirt_size = settings.getSettingValueByKey("skirt_line_count") * settings.getSettingValueByKey("skirt_line_width") + settings.getSettingValueByKey("skirt_gap")
elif settings.getSettingValueByKey("adhesion_type") == "Brim":
skirt_size = settings.getSettingValueByKey("brim_line_count") * settings.getSettingValueByKey("skirt_line_width")
else:
skirt_size = settings.getSettingValueByKey("skirt_line_width")
skirt_size += settings.getSettingValueByKey("skirt_line_width")
scale_to_max_bounds = AxisAlignedBox(
minimum = Vector(minW + skirt_size, minH, minD + skirt_size + disallowed_area_size),
maximum = Vector(maxW - skirt_size, maxH, maxD - skirt_size - disallowed_area_size)
)
Application.getInstance().getController().getScene()._maximum_bounds = scale_to_max_bounds