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

Fix checking whether the old material diameter was the same

Browse source 
Getting the old material diameter wasn't working properly.

Contributes to issue CURA-2822.
This commit is contained in:
Ghostkeeper 2017-06-22 14:43:45 +02:00
parent 1d048f39db
commit 0e23930bfe
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/Settings/GlobalStack.py
View file

@ -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:

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

@ -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);
} }