From 9ea59c1976c7d440cb7b9f4fd23be069c73b254f Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Tue, 20 Mar 2018 17:07:03 +0100 Subject: [PATCH] CURA-4557 rename ratio percentage to percentage --- plugins/ModelChecker/ModelChecker.py | 2 +- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 2 +- resources/definitions/fdmprinter.def.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/ModelChecker/ModelChecker.py b/plugins/ModelChecker/ModelChecker.py index 0ae9cc5d01..afe8a7e47d 100644 --- a/plugins/ModelChecker/ModelChecker.py +++ b/plugins/ModelChecker/ModelChecker.py @@ -36,7 +36,7 @@ class ModelChecker(Tool): # Get all shrinkage values of materials used for extruder_position, extruder in global_container_stack.extruders.items(): - shrinkage = extruder.material.getProperty("material_shrinkage_ratio_percentage", "value") + shrinkage = extruder.material.getProperty("material_shrinkage_percentage", "value") if shrinkage is None: shrinkage = 0 if shrinkage > SHRINKAGE_THRESHOLD: diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 229292fe01..341f2bd3bb 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -984,7 +984,7 @@ class XmlMaterialProfile(InstanceContainer): "retraction speed": "retraction_speed", "adhesion tendency": "material_adhesion_tendency", "surface energy": "material_surface_energy", - "shrinkage ratio percentage": "material_shrinkage_ratio_percentage", + "shrinkage percentage": "material_shrinkage_percentage", } __unmapped_settings = [ "hardware compatible", diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 24699fa95c..d7d9698439 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2097,7 +2097,7 @@ "settable_per_mesh": false, "settable_per_extruder": true }, - "material_shrinkage_ratio_percentage": + "material_shrinkage_percentage": { "label": "Shrinkage Ratio", "description": "Shrinkage ratio in percentage.",