JSON fix: use exponent function ** 2 rather than x * x (CURA-2325)

This commit is contained in:
Tim Kuipers 2016-11-02 10:29:16 +01:00 committed by Ghostkeeper
parent 1e343c26eb
commit e0b4246336
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75

View File

@ -3654,7 +3654,7 @@
"type": "float", "type": "float",
"default_value": 10, "default_value": 10,
"minimum_value": "0", "minimum_value": "0",
"maximum_value_warning": "resolveOrValue('prime_tower_size') * resolveOrValue('prime_tower_size') * resolveOrValue('layer_height')", "maximum_value_warning": "resolveOrValue('prime_tower_size') ** 2 * resolveOrValue('layer_height')",
"enabled": "resolveOrValue('prime_tower_enable')", "enabled": "resolveOrValue('prime_tower_enable')",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": true, "settable_per_extruder": true,
@ -3667,7 +3667,7 @@
"unit": "mm", "unit": "mm",
"type": "float", "type": "float",
"default_value": 2, "default_value": 2,
"value": "max(2 * min(extruderValues('prime_tower_line_width')), 0.5 * (resolveOrValue('prime_tower_size') - math.sqrt(resolveOrValue('prime_tower_size') * resolveOrValue('prime_tower_size') - max(extruderValues('prime_tower_min_volume')) / resolveOrValue('layer_height'))))", "value": "max(2 * min(extruderValues('prime_tower_line_width')), 0.5 * (resolveOrValue('prime_tower_size') - math.sqrt(resolveOrValue('prime_tower_size') ** 2 - max(extruderValues('prime_tower_min_volume')) / resolveOrValue('layer_height'))))",
"resolve": "max(extruderValues('prime_tower_wall_thickness'))", "resolve": "max(extruderValues('prime_tower_wall_thickness'))",
"minimum_value": "0.001", "minimum_value": "0.001",
"minimum_value_warning": "2 * min(extruderValues('prime_tower_line_width'))", "minimum_value_warning": "2 * min(extruderValues('prime_tower_line_width'))",