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

Merge pull request #1336 from fieldOfView/fix_center_zero_tower_pos

Browse Source 
Fix prime disallowed areas when center is zero
This commit is contained in:
awhiemstra 2017-01-12 10:28:53 +01:00 committed by GitHub
commit a2e00bd560
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cura/BuildVolume.py
View File

@ -538,8 +538,11 @@ class BuildVolume(SceneNode):
prime_tower_size = self._global_container_stack.getProperty("prime_tower_size", "value")
machine_width = self._global_container_stack.getProperty("machine_width", "value")
machine_depth = self._global_container_stack.getProperty("machine_depth", "value")
prime_tower_x = self._global_container_stack.getProperty("prime_tower_position_x", "value") - machine_width / 2 #Offset by half machine_width and _depth to put the origin in the front-left.
prime_tower_y = - self._global_container_stack.getProperty("prime_tower_position_y", "value") + machine_depth / 2
prime_tower_x = self._global_container_stack.getProperty("prime_tower_position_x", "value")
prime_tower_y = - self._global_container_stack.getProperty("prime_tower_position_y", "value")
if not self._global_container_stack.getProperty("machine_center_is_zero", "value"):
prime_tower_x = prime_tower_x - machine_width / 2 #Offset by half machine_width and _depth to put the origin in the front-left.
prime_tower_y = prime_tower_y + machine_depth / 2
prime_tower_area = Polygon([
[prime_tower_x - prime_tower_size, prime_tower_y - prime_tower_size],
@ -570,8 +573,17 @@ class BuildVolume(SceneNode):
machine_width = self._global_container_stack.getProperty("machine_width", "value")
machine_depth = self._global_container_stack.getProperty("machine_depth", "value")
for extruder in used_extruders:
prime_x = extruder.getProperty("extruder_prime_pos_x", "value") - machine_width / 2 #Offset by half machine_width and _depth to put the origin in the front-left.
prime_y = machine_depth / 2 - extruder.getProperty("extruder_prime_pos_y", "value")
prime_x = extruder.getProperty("extruder_prime_pos_x", "value")
prime_y = - extruder.getProperty("extruder_prime_pos_y", "value")
#Ignore extruder prime position if it is not set
if prime_x == 0 and prime_y == 0:
result[extruder.getId()] = []
continue
if not self._global_container_stack.getProperty("machine_center_is_zero", "value"):
prime_x = prime_x - machine_width / 2 #Offset by half machine_width and _depth to put the origin in the front-left.
prime_y = prime_x + machine_depth / 2
prime_polygon = Polygon.approximatedCircle(PRIME_CLEARANCE)
prime_polygon = prime_polygon.translate(prime_x, prime_y)

14
resources/definitions/fdmprinter.def.json
View File

@ -3128,8 +3128,8 @@
"type": "float",
"unit": "mm",
"default_value": 0,
"minimum_value_warning": "0",
"maximum_value_warning": "machine_width",
"minimum_value_warning": "machine_width / -2 if machine_center_is_zero else 0",
"maximum_value_warning": "machine_width / 2 if machine_center_is_zero else machine_width",
"settable_per_mesh": false,
"settable_per_extruder": true,
"enabled": false
@ -3141,8 +3141,8 @@
"type": "float",
"unit": "mm",
"default_value": 0,
"minimum_value_warning": "0",
"maximum_value_warning": "machine_depth",
"minimum_value_warning": "machine_depth / -2 if machine_center_is_zero else 0",
"maximum_value_warning": "machine_depth / 2 if machine_center_is_zero else machine_depth",
"settable_per_mesh": false,
"settable_per_extruder": true,
"enabled": false
@ -3791,8 +3791,8 @@
"default_value": 200,
"minimum_value_warning": "-1000",
"maximum_value_warning": "1000",
"maximum_value": "machine_width",
"minimum_value": "resolveOrValue('prime_tower_size')",
"maximum_value": "machine_width / 2 if machine_center_is_zero else machine_width",
"minimum_value": "resolveOrValue('prime_tower_size') - machine_width / 2 if machine_center_is_zero else resolveOrValue('prime_tower_size')",
"settable_per_mesh": false,
"settable_per_extruder": false
},
@ -3808,6 +3808,8 @@
"maximum_value_warning": "1000",
"maximum_value": "machine_depth - resolveOrValue('prime_tower_size')",
"minimum_value": "0",
"maximum_value": "machine_depth / 2 - resolveOrValue('prime_tower_size') if machine_center_is_zero else machine_depth - resolveOrValue('prime_tower_size')",
"minimum_value": "machine_depth / -2 if machine_center_is_zero else 0",
"settable_per_mesh": false,
"settable_per_extruder": false
},