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

cura/BuildVolume.py

@@ -378,10 +378,6 @@ class BuildVolume(SceneNode):
             for extruder in extruders:
                 prime_x = extruder.getProperty("extruder_prime_pos_x", "value") - machine_width / 2
                 prime_y = machine_depth / 2 - extruder.getProperty("extruder_prime_pos_y", "value")
-                offset_x = extruder.getProperty("machine_nozzle_offset_x", "value")
-                offset_y = extruder.getProperty("machine_nozzle_offset_y", "value")
-                prime_x -= offset_x
-                prime_y -= offset_y
 
                 prime_polygon = Polygon([
                     [prime_x - PRIME_CLEARANCE, prime_y - PRIME_CLEARANCE],

resources/definitions/fdmextruder.def.json

@@ -177,7 +177,8 @@
                     "minimum_value_warning": "machine_nozzle_offset_x",
                     "maximum_value": "machine_width",
                     "settable_per_mesh": false,
-                    "settable_per_extruder": true
+                    "settable_per_extruder": true,
+                    "enabled": false
                 },
                 "extruder_prime_pos_y":
                 {
@@ -189,7 +190,8 @@
                     "minimum_value_warning": "machine_nozzle_offset_y",
                     "maximum_value_warning": "machine_depth",
                     "settable_per_mesh": false,
-                    "settable_per_extruder": true
+                    "settable_per_extruder": true,
+                    "enabled": false
                 }
             }
         }

resources/qml/Settings/SettingComboBox.qml

@@ -87,34 +87,32 @@ SettingItem
         }
 
         onActivated: { forceActiveFocus(); propertyProvider.setPropertyValue("value", definition.options[index].key) }
-        onModelChanged: updateCurrentIndex();
 
-        Connections
+        Binding
         {
-            target: propertyProvider
-            onPropertiesChanged: control.updateCurrentIndex()
-        }
-
-        function updateCurrentIndex() {
-            // FIXME this needs to go away once 'resolve' is combined with 'value' in our data model.
-            var value;
-            if ((propertyProvider.properties.resolve != "None") && (stackLevel != 0) && (stackLevel != 1)) {
-                // We have a resolve function. Indicates that the setting is not settable per extruder and that
-                // we have to choose between the resolved value (default) and the global value
-                // (if user has explicitly set this).
-                value = propertyProvider.properties.resolve;
-            } else {
-                value = propertyProvider.properties.value;
-            }
+            target: control
+            property: "currentIndex"
+            value:
+            {
+                // FIXME this needs to go away once 'resolve' is combined with 'value' in our data model.
+                var value;
+                if ((propertyProvider.properties.resolve != "None") && (base.stackLevel != 0) && (base.stackLevel != 1)) {
+                    // We have a resolve function. Indicates that the setting is not settable per extruder and that
+                    // we have to choose between the resolved value (default) and the global value
+                    // (if user has explicitly set this).
+                    value = propertyProvider.properties.resolve;
+                } else {
+                    value = propertyProvider.properties.value;
+                }
 
-            for(var i = 0; i < definition.options.length; ++i) {
-                if(definition.options[i].key == value) {
-                    currentIndex = i;
-                    return;
+                for(var i = 0; i < control.model.length; ++i) {
+                    if(control.model[i].key == value) {
+                        return i;
+                    }
                 }
-            }
 
-            currentIndex = -1;
+                return -1;
+            }
         }
     }
 }