mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-08-15 12:05:54 +08:00
Fix checking whether the old material diameter was the same
Getting the old material diameter wasn't working properly. Contributes to issue CURA-2822.
This commit is contained in:
parent
1d048f39db
commit
0e23930bfe
@ -117,10 +117,10 @@ class GlobalStack(CuraContainerStack):
|
|||||||
# \return The approximate filament diameter for the printer, as a string.
|
# \return The approximate filament diameter for the printer, as a string.
|
||||||
@pyqtProperty(str)
|
@pyqtProperty(str)
|
||||||
def approximateMaterialDiameter(self) -> str:
|
def approximateMaterialDiameter(self) -> str:
|
||||||
material_diameter = self.definition.getMetaDataEntry("material_diameter")
|
material_diameter = self.definition.getProperty("material_diameter", "value")
|
||||||
if material_diameter is None:
|
if material_diameter is None:
|
||||||
return "-1"
|
return "-1"
|
||||||
return str(round(float(self.definition.getMetaDataEntry("material_diameter")))) #Round, then convert back to string.
|
return str(round(float(material_diameter))) #Round, then convert back to string.
|
||||||
|
|
||||||
# protected:
|
# protected:
|
||||||
|
|
||||||
|
@ -171,7 +171,7 @@ TabView
|
|||||||
var old_diameter = Cura.ContainerManager.getContainerProperty(base.containerId, "material_diameter", "value").toString();
|
var old_diameter = Cura.ContainerManager.getContainerProperty(base.containerId, "material_diameter", "value").toString();
|
||||||
base.setMetaDataEntry("approximate_diameter", properties.approximate_diameter, Math.round(value).toString());
|
base.setMetaDataEntry("approximate_diameter", properties.approximate_diameter, Math.round(value).toString());
|
||||||
base.setMetaDataEntry("properties/diameter", properties.diameter, value);
|
base.setMetaDataEntry("properties/diameter", properties.diameter, value);
|
||||||
if (Cura.MachineManager.filterMaterialsByMachine && properties.approximate_diameter != Math.round(Cura.MachineManager.activeMachine.approximateMaterialDiameter).toString())
|
if (Cura.MachineManager.filterMaterialsByMachine && properties.approximate_diameter != Cura.MachineManager.activeMachine.approximateMaterialDiameter)
|
||||||
{
|
{
|
||||||
Cura.MaterialManager.showMaterialWarningMessage(base.containerId, old_diameter);
|
Cura.MaterialManager.showMaterialWarningMessage(base.containerId, old_diameter);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user