3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-16 19:28:07 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

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

Browse source
This commit is contained in:
fieldOfView 2016-10-04 14:06:06 +02:00
commit d4556ba4c5
3 changed files with 26 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/BuildVolume.py
View file

@ -378,10 +378,6 @@ class BuildVolume(SceneNode):
for extruder in extruders: for extruder in extruders:
prime_x = extruder.getProperty("extruder_prime_pos_x", "value") - machine_width / 2 prime_x = extruder.getProperty("extruder_prime_pos_x", "value") - machine_width / 2
prime_y = machine_depth / 2 - extruder.getProperty("extruder_prime_pos_y", "value") 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_polygon = Polygon([
[prime_x - PRIME_CLEARANCE, prime_y - PRIME_CLEARANCE], [prime_x - PRIME_CLEARANCE, prime_y - PRIME_CLEARANCE],

6
resources/definitions/fdmextruder.def.json
View file

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

46
resources/qml/Settings/SettingComboBox.qml
View file

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