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

CURA-4606 CURA-5012 fix incompatible diameter update message in materialview

Browse source
This commit is contained in:
Jack Ha 2018-02-27 11:43:54 +01:00
parent 22cf5abec2
commit d79206301d
1 changed files with 42 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,6 +41,10 @@ TabView
return linkedMaterials.join(", "); return linkedMaterials.join(", ");
} }
function getApproximateDiameter(diameter) {
return Math.round(diameter);
}
Tab Tab
{ {
title: catalog.i18nc("@title", "Information") title: catalog.i18nc("@title", "Information")
@ -67,6 +71,34 @@ TabView
width: base.width width: base.width
property real rowHeight: textField.height + UM.Theme.getSize("default_lining").height property real rowHeight: textField.height + UM.Theme.getSize("default_lining").height
MessageDialog
{
id: confirmDiameterChangeDialog
icon: StandardIcon.Question;
title: catalog.i18nc("@title:window", "Confirm Diameter Change")
text: catalog.i18nc("@label (%1 is object name)", "The new material diameter is set to %1 mm, which is not compatible to the current machine. Do you wish to continue?".arg(new_diameter_value))
standardButtons: StandardButton.Yes | StandardButton.No
modality: Qt.ApplicationModal
property var new_diameter_value: null;
property var old_diameter_value: null;
property var old_approximate_diameter_value: null;
onYes:
{
Cura.ContainerManager.setContainerProperty(base.containerId, "material_diameter", "value", new_diameter_value);
base.setMetaDataEntry("approximate_diameter", old_approximate_diameter_value, getApproximateDiameter(new_diameter_value).toString());
base.setMetaDataEntry("properties/diameter", properties.diameter, new_diameter_value);
}
onNo:
{
properties.diameter = old_diameter_value;
diameterSpinBox.value = properties.diameter;
}
}
Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Display Name") } Label { width: scrollView.columnWidth; height: parent.rowHeight; verticalAlignment: Qt.AlignVCenter; text: catalog.i18nc("@label", "Display Name") }
ReadOnlyTextField ReadOnlyTextField
{ {
@ -174,14 +206,19 @@ TabView
// which derive from the same base_file // which derive from the same base_file
var old_diameter = Cura.ContainerManager.getContainerProperty(base.containerId, "material_diameter", "value").toString(); var old_diameter = Cura.ContainerManager.getContainerProperty(base.containerId, "material_diameter", "value").toString();
var old_approximate_diameter = Cura.ContainerManager.getContainerMetaDataEntry(base.containerId, "approximate_diameter"); var old_approximate_diameter = Cura.ContainerManager.getContainerMetaDataEntry(base.containerId, "approximate_diameter");
base.setMetaDataEntry("approximate_diameter", old_approximate_diameter, Math.round(value).toString()); var new_approximate_diameter = getApproximateDiameter(value);
base.setMetaDataEntry("properties/diameter", properties.diameter, value);
var new_approximate_diameter = Cura.ContainerManager.getContainerMetaDataEntry(base.containerId, "approximate_diameter");
if (Cura.MachineManager.filterMaterialsByMachine && new_approximate_diameter != Cura.MachineManager.activeMachine.approximateMaterialDiameter) if (Cura.MachineManager.filterMaterialsByMachine && new_approximate_diameter != Cura.MachineManager.activeMachine.approximateMaterialDiameter)
{ {
Cura.MaterialManager.showMaterialWarningMessage(base.containerId, old_diameter); confirmDiameterChangeDialog.old_diameter_value = old_diameter;
} confirmDiameterChangeDialog.new_diameter_value = value;
confirmDiameterChangeDialog.old_approximate_diameter_value = old_approximate_diameter;
confirmDiameterChangeDialog.open()
} else {
Cura.ContainerManager.setContainerProperty(base.containerId, "material_diameter", "value", value); Cura.ContainerManager.setContainerProperty(base.containerId, "material_diameter", "value", value);
base.setMetaDataEntry("approximate_diameter", old_approximate_diameter, getApproximateDiameter(value).toString());
base.setMetaDataEntry("properties/diameter", properties.diameter, value);
}
} }
onValueChanged: updateCostPerMeter() onValueChanged: updateCostPerMeter()
} }