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

Merge branch 'master' of github.com:Ultimaker/Cura

Browse Source
This commit is contained in:
Jaime van Kessel 2016-08-23 11:53:43 +02:00
commit 47d5039c04
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cura/BuildVolume.py
View File

@ -302,17 +302,17 @@ class BuildVolume(SceneNode):
machine_width = self._global_container_stack.getProperty("machine_width", "value") machine_width = self._global_container_stack.getProperty("machine_width", "value")
machine_depth = self._global_container_stack.getProperty("machine_depth", "value") machine_depth = self._global_container_stack.getProperty("machine_depth", "value")
# Add prima tower location as disallowed area. # Add prime tower location as disallowed area.
if self._global_container_stack.getProperty("prime_tower_enable", "value"): if self._global_container_stack.getProperty("prime_tower_enable", "value"):
half_prime_tower_size = self._global_container_stack.getProperty("prime_tower_size", "value") / 2 prime_tower_size = self._global_container_stack.getProperty("prime_tower_size", "value")
prime_tower_x = self._global_container_stack.getProperty("prime_tower_position_x", "value") - machine_width / 2 prime_tower_x = self._global_container_stack.getProperty("prime_tower_position_x", "value") - machine_width / 2
prime_tower_y = - self._global_container_stack.getProperty("prime_tower_position_y", "value") + machine_depth / 2 prime_tower_y = - self._global_container_stack.getProperty("prime_tower_position_y", "value") + machine_depth / 2
disallowed_areas.append([ disallowed_areas.append([
[prime_tower_x - half_prime_tower_size, prime_tower_y - half_prime_tower_size], [prime_tower_x - prime_tower_size, prime_tower_y - prime_tower_size],
[prime_tower_x + half_prime_tower_size, prime_tower_y - half_prime_tower_size], [prime_tower_x, prime_tower_y - prime_tower_size],
[prime_tower_x + half_prime_tower_size, prime_tower_y + half_prime_tower_size], [prime_tower_x, prime_tower_y],
[prime_tower_x - half_prime_tower_size, prime_tower_y + half_prime_tower_size], [prime_tower_x - prime_tower_size, prime_tower_y],
]) ])
# Add extruder prime locations as disallowed areas. # Add extruder prime locations as disallowed areas.