3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-11 16:00:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source
This commit is contained in:
Ghostkeeper 2017-04-18 10:30:15 +02:00
commit 7dbb08735a
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
1 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
resources/qml/Preferences/MaterialView.qml
View file

@ -273,17 +273,28 @@ TabView
{ {
id: spinBox id: spinBox
anchors.left: label.right anchors.left: label.right
value: parseFloat(provider.properties.value); value: {
width: base.secondColumnWidth; if (!isNaN(parseFloat(materialPropertyProvider.properties.value)))
{
return parseFloat(materialPropertyProvider.properties.value);
}
if (!isNaN(parseFloat(machinePropertyProvider.properties.value)))
{
return parseFloat(machinePropertyProvider.properties.value);
}
return 0;
}
width: base.secondColumnWidth
readOnly: !base.editingEnabled readOnly: !base.editingEnabled
suffix: model.unit suffix: " " + model.unit
maximumValue: 99999 maximumValue: 99999
decimals: model.unit == "mm" ? 2 : 0 decimals: model.unit == "mm" ? 2 : 0
onEditingFinished: provider.setPropertyValue("value", value) onEditingFinished: materialPropertyProvider.setPropertyValue("value", value)
} }
UM.ContainerPropertyProvider { id: provider; containerId: base.containerId; watchedProperties: [ "value" ]; key: model.key } UM.ContainerPropertyProvider { id: materialPropertyProvider; containerId: base.containerId; watchedProperties: [ "value" ]; key: model.key }
UM.ContainerPropertyProvider { id: machinePropertyProvider; containerId: Cura.MachineManager.activeDefinitionId; watchedProperties: [ "value" ]; key: model.key }
} }
} }
} }