From b722a6260c352e2f72aa2bf2b6f11d9ed4e1c3ee Mon Sep 17 00:00:00 2001
From: Tim Kuipers <t.kuipers@ultimaker.com>
Date: Mon, 3 Oct 2016 14:34:49 +0200
Subject: [PATCH] JSON fix: new resolve functions (CURA-2410)

---
 resources/definitions/fdmprinter.def.json | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index 3aa45f7af7..eab501ffc6 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -550,6 +550,7 @@
                     "unit": "mm",
                     "type": "float",
                     "default_value": 0.3,
+                    "resolve": "sum(extruderValues('layer_height_0')) / len(extruderValues('layer_height_0'))",
                     "minimum_value": "0.001",
                     "minimum_value_warning": "0.04",
                     "maximum_value_warning": "0.8 * min(extruderValues('machine_nozzle_size'))",
@@ -1640,6 +1641,7 @@
                     "description": "The first few layers are printed slower than the rest of the model, to get better adhesion to the build plate and improve the overall success rate of prints. The speed is gradually increased over these layers.",
                     "type": "int",
                     "default_value": 2,
+                    "resolve": "sum(extruderValues('speed_slowdown_layers')) / len(extruderValues('speed_slowdown_layers'))",
                     "minimum_value": "0",
                     "maximum_value_warning": "1.0 / layer_height",
                     "settable_per_mesh": false,
@@ -1675,6 +1677,7 @@
                     "description": "Enables adjusting the print head acceleration. Increasing the accelerations can reduce printing time at the cost of print quality.",
                     "type": "bool",
                     "default_value": false,
+                    "resolve": "any(extruderValues('acceleration_enabled'))",
                     "settable_per_mesh": false,
                     "settable_per_extruder": false
                 },
@@ -1896,6 +1899,7 @@
                     "description": "Enables adjusting the jerk of print head when the velocity in the X or Y axis changes. Increasing the jerk can reduce printing time at the cost of print quality.",
                     "type": "bool",
                     "default_value": false,
+                    "resolve": "any(extruderValues('jerk_enabled'))",
                     "settable_per_mesh": false,
                     "settable_per_extruder": false
                 },
@@ -2133,6 +2137,7 @@
                         "noskin": "No Skin"
                     },
                     "default_value": "all",
+                    "resolve": "'noskin' if 'noskin' in extruderValues('retraction_combing') else ('all' if 'all' in extruderValues('retraction_combing') else 'off')",
                     "settable_per_mesh": true
                 },
                 "travel_avoid_other_parts":
@@ -2326,6 +2331,7 @@
                         "everywhere": "Everywhere"
                     },
                     "default_value": "everywhere",
+                    "resolve": "'everywhere' if 'everywhere' in extruderValues('support_type') else buildplate",
                     "enabled": "support_enable",
                     "settable_per_mesh": false,
                     "settable_per_extruder": false
@@ -3348,6 +3354,7 @@
                     "enabled": "resolveOrValue('prime_tower_enable')",
                     "default_value": 15,
                     "value": "15 if resolveOrValue('prime_tower_enable') else 0",
+                    "resolve": "max(extruderValues('prime_tower_size'))",
                     "minimum_value": "0",
                     "maximum_value": "min(0.5 * machine_width, 0.5 * machine_depth)",
                     "maximum_value_warning": "20",
@@ -3405,6 +3412,7 @@
                     "type": "bool",
                     "enabled": "resolveOrValue('prime_tower_enable')",
                     "default_value": true,
+                    "resolve": "any(extruderValues('prime_tower_wipe_enabled'))",
                     "settable_per_mesh": false,
                     "settable_per_extruder": false
                 },
@@ -3424,6 +3432,7 @@
                     "label": "Enable Ooze Shield",
                     "description": "Enable exterior ooze shield. This will create a shell around the model which is likely to wipe a second nozzle if it's at the same height as the first nozzle.",
                     "type": "bool",
+                    "resolve": "any(extruderValues('ooze_shield_enabled'))",
                     "default_value": false,
                     "settable_per_mesh": false,
                     "settable_per_extruder": false
@@ -3436,6 +3445,7 @@
                     "unit": "°",
                     "enabled": "ooze_shield_enabled",
                     "default_value": 60,
+                    "resolve": "min(extruderValues('ooze_shield_angle'))",
                     "minimum_value": "0",
                     "maximum_value": "90",
                     "settable_per_mesh": false,
@@ -3449,6 +3459,7 @@
                     "unit": "mm",
                     "enabled": "ooze_shield_enabled",
                     "default_value": 2,
+                    "resolve": "max(extruderValues('ooze_shield_dist'))",
                     "minimum_value": "0",
                     "maximum_value_warning": "30",
                     "settable_per_mesh": false,
@@ -3596,6 +3607,7 @@
                     "minimum_value": "0",
                     "maximum_value_warning": "100",
                     "default_value": 10,
+                    "resolve": "max(extruderValues('draft_shield_dist'))",
                     "enabled": "draft_shield_enabled",
                     "settable_per_mesh": false,
                     "settable_per_extruder": false
@@ -3611,6 +3623,7 @@
                         "limited": "Limited"
                     },
                     "default_value": "full",
+                    "resolve": "'full' if 'full' in extruderValues('draft_shield_height_limitation') else 'limited'",
                     "enabled": "draft_shield_enabled",
                     "settable_per_mesh": false,
                     "settable_per_extruder": false