Browse Source

Added test to check if a key in the profile is defined in the definition

Jaime van Kessel 6 years ago
parent
commit
c0d75b38b7

+ 2 - 2
cura/CuraApplication.py

@@ -307,7 +307,7 @@ class CuraApplication(QtApplication):
         super().initialize()
 
         self.__sendCommandToSingleInstance()
-        self.__initializeSettingDefinitionsAndFunctions()
+        self._initializeSettingDefinitionsAndFunctions()
         self.__addAllResourcesAndContainerResources()
         self.__addAllEmptyContainers()
         self.__setLatestResouceVersionsForVersionUpgrade()
@@ -338,7 +338,7 @@ class CuraApplication(QtApplication):
 
     # Adds custom property types, settings types, and extra operators (functions) that need to be registered in
     # SettingDefinition and SettingFunction.
-    def __initializeSettingDefinitionsAndFunctions(self):
+    def _initializeSettingDefinitionsAndFunctions(self):
         self._cura_formula_functions = CuraFormulaFunctions(self)
 
         # Need to do this before ContainerRegistry tries to load the machines

+ 0 - 1
resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Draft_Print.inst.cfg

@@ -28,7 +28,6 @@ wall_thickness = 1
 
 infill_pattern = triangles
 speed_infill = =math.ceil(speed_print * 50 / 60)
-prime_tower_purge_volume = 1
 
 material_bed_temperature_layer_0 = 90
 default_material_bed_temperature = 80

+ 0 - 1
resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Fast_Print.inst.cfg

@@ -26,7 +26,6 @@ speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
 
 infill_pattern = triangles
 speed_infill = =math.ceil(speed_print * 50 / 60)
-prime_tower_purge_volume = 1
 
 material_bed_temperature_layer_0 = 90
 default_material_bed_temperature = 80

+ 0 - 1
resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_High_Quality.inst.cfg

@@ -27,7 +27,6 @@ speed_wall = =math.ceil(speed_print * 30 / 50)
 
 infill_pattern = triangles
 speed_infill = =math.ceil(speed_print * 40 / 50)
-prime_tower_purge_volume = 1
 
 material_bed_temperature_layer_0 = 90
 default_material_bed_temperature = 80

+ 0 - 1
resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_Normal_Quality.inst.cfg

@@ -25,7 +25,6 @@ speed_wall = =math.ceil(speed_print * 30 / 55)
 
 infill_pattern = triangles
 speed_infill = =math.ceil(speed_print * 45 / 55)
-prime_tower_purge_volume = 1
 
 material_bed_temperature_layer_0 = 90
 default_material_bed_temperature = 80

+ 0 - 1
resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Draft_Print.inst.cfg

@@ -24,7 +24,6 @@ speed_topbottom = =math.ceil(speed_print * 25 / 40)
 speed_wall = =math.ceil(speed_print * 30 / 40)
 
 jerk_travel = 50
-prime_tower_purge_volume = 1
 
 material_bed_temperature_layer_0 = 90
 default_material_bed_temperature = 80

+ 0 - 1
resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Superdraft_Print.inst.cfg

@@ -25,7 +25,6 @@ speed_wall = =math.ceil(speed_print * 40 / 45)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
 
 jerk_travel = 50
-prime_tower_purge_volume = 1
 
 material_bed_temperature_layer_0 = 90
 default_material_bed_temperature = 80

+ 0 - 1
resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Verydraft_Print.inst.cfg

@@ -24,7 +24,6 @@ speed_topbottom = =math.ceil(speed_print * 25 / 40)
 speed_wall = =math.ceil(speed_print * 30 / 40)
 
 jerk_travel = 50
-prime_tower_purge_volume = 1
 
 material_bed_temperature_layer_0 = 90
 default_material_bed_temperature = 80

+ 0 - 1
resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Draft_Print.inst.cfg

@@ -30,7 +30,6 @@ material_standby_temperature = 100
 multiple_mesh_overlap = 0.2
 prime_tower_enable = True
 prime_tower_flow = 100
-prime_tower_wall_thickness = =prime_tower_line_width * 2
 retract_at_layer_change = False
 retraction_count_max = 12
 retraction_extra_prime_amount = 0.5

+ 0 - 1
resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Superdraft_Print.inst.cfg

@@ -30,7 +30,6 @@ material_standby_temperature = 100
 multiple_mesh_overlap = 0.2
 prime_tower_enable = True
 prime_tower_flow = 100
-prime_tower_wall_thickness = =prime_tower_line_width * 2
 retract_at_layer_change = False
 retraction_count_max = 12
 retraction_extra_prime_amount = 0.5

Some files were not shown because too many files changed in this diff