GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 01:29:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ensure that the material selection gets reset when diameter is changed

Browse Source 
CURA-6590
This commit is contained in:
Jaime van Kessel 2019-07-02 17:59:27 +02:00
parent 758a8a0078
commit 2cd6b73d12
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/qml/Preferences/Materials/MaterialsDetailsPanel.qml
View File

@ -82,6 +82,7 @@ Item
}
editingEnabled: currentItem != null && !currentItem.is_read_only
onResetSelectedMaterial: base.resetExpandedActiveMaterial()
properties: materialProperties
containerId: currentItem != null ? currentItem.id : ""

7
resources/qml/Preferences/Materials/MaterialsPage.qml
View File

@ -41,8 +41,13 @@ Item
name: "cura"
}
function resetExpandedActiveMaterial()
{
materialListView.expandActiveMaterial(active_root_material_id)
}
// When loaded, try to select the active material in the tree
Component.onCompleted: materialListView.expandActiveMaterial(active_root_material_id)
Component.onCompleted: resetExpandedActiveMaterial()
// Every time the selected item has changed, notify to the details panel
onCurrentItemChanged:

3
resources/qml/Preferences/Materials/MaterialsView.qml
View File

@ -29,6 +29,8 @@ TabView
property double spoolLength: calculateSpoolLength()
property real costPerMeter: calculateCostPerMeter()
signal resetSelectedMaterial()
property bool reevaluateLinkedMaterials: false
property string linkedMaterialNames:
{
@ -111,6 +113,7 @@ TabView
{
base.setMetaDataEntry("approximate_diameter", old_approximate_diameter_value, getApproximateDiameter(new_diameter_value).toString());
base.setMetaDataEntry("properties/diameter", properties.diameter, new_diameter_value);
base.resetSelectedMaterial()
}
onNo: