Simplify inheritance formula for prime tower wall thickness

Firstly, all the resolveOrValue calls are identity functions now so they can be phased out.

Secondly, all the max(extruderValues(...)) should be done by the resolve property rather than the value property. The resolve property already makes sure that the prime tower is evenly thick for every extruder, so it doesn't need to ensure this in the value function as well.

Contributes to issue CURA-3521.
This commit is contained in:
Ghostkeeper 2017-07-04 12:33:19 +02:00
parent 5895f27792
commit 88ee878423
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75

View File

@ -4371,7 +4371,7 @@
"unit": "mm",
"type": "float",
"default_value": 2,
"value": "round(max(2 * max(extruderValues('prime_tower_line_width')), 0.5 * (resolveOrValue('prime_tower_size') - math.sqrt(max(0, resolveOrValue('prime_tower_size') ** 2 - max(extruderValues('prime_tower_min_volume')) / resolveOrValue('layer_height'))))), 3)",
"value": "round(max(2 * prime_tower_line_width, 0.5 * (prime_tower_size - math.sqrt(max(0, prime_tower_size ** 2 - prime_tower_min_volume / layer_height)))), 3)",
"resolve": "max(extruderValues('prime_tower_wall_thickness'))",
"minimum_value": "0.001",
"minimum_value_warning": "2 * min(extruderValues('prime_tower_line_width')) - 0.0001",