From 97c107d011aac0d839fa6886a91d0e0e50e64341 Mon Sep 17 00:00:00 2001 From: "A.Sasin" Date: Mon, 9 Oct 2017 14:23:52 +0200 Subject: [PATCH 1/2] Change log update for version 3.0.0 Beta --- plugins/ChangeLogPlugin/ChangeLog.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/ChangeLogPlugin/ChangeLog.txt b/plugins/ChangeLogPlugin/ChangeLog.txt index 207493468e..57e6e05d9c 100755 --- a/plugins/ChangeLogPlugin/ChangeLog.txt +++ b/plugins/ChangeLogPlugin/ChangeLog.txt @@ -1,3 +1,6 @@ +[3.0.0] +*Will be updated soon! + [2.7.0] *Top surface skin Specify print settings of the top-most layers separately in order to improve print duration and achieve higher quality top surfaces. From 1c5d352b8819f6598d3bae2b2e4a68d3c01f0f43 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 9 Oct 2017 14:34:53 +0200 Subject: [PATCH 2/2] Fix the case when active_extruder is None --- cura/Settings/QualityAndUserProfilesModel.py | 3 +++ cura/Settings/UserProfilesModel.py | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cura/Settings/QualityAndUserProfilesModel.py b/cura/Settings/QualityAndUserProfilesModel.py index f2728aff14..602f8768da 100644 --- a/cura/Settings/QualityAndUserProfilesModel.py +++ b/cura/Settings/QualityAndUserProfilesModel.py @@ -41,6 +41,9 @@ class QualityAndUserProfilesModel(ProfilesModel): new_extruder_stacks = [] if active_extruder is not None: new_extruder_stacks = [active_extruder] + else: + # if there is no active extruder, use the first one in the active extruder stacks + active_extruder = extruder_stacks[0] extruder_stacks = new_extruder_stacks + extruder_stacks # Fetch the list of useable qualities across all extruders. diff --git a/cura/Settings/UserProfilesModel.py b/cura/Settings/UserProfilesModel.py index 587e27f359..aa815ef4aa 100644 --- a/cura/Settings/UserProfilesModel.py +++ b/cura/Settings/UserProfilesModel.py @@ -41,6 +41,9 @@ class UserProfilesModel(ProfilesModel): new_extruder_stacks = [] if active_extruder is not None: new_extruder_stacks = [active_extruder] + else: + # if there is no active extruder, use the first one in the active extruder stacks + active_extruder = extruder_stacks[0] extruder_stacks = new_extruder_stacks + extruder_stacks # Fetch the list of useable qualities across all extruders. @@ -55,8 +58,8 @@ class UserProfilesModel(ProfilesModel): # If the printer has multiple extruders then quality changes related to the current extruder are kept filtered_quality_changes = [qc for qc in quality_changes_list if qc.getMetaDataEntry("quality_type") in quality_type_set and qc.getMetaDataEntry("extruder") is not None and - qc.getMetaDataEntry("extruder") == active_extruder.definition.getMetaDataEntry("quality_definition") or - qc.getMetaDataEntry("extruder") == active_extruder.definition.getId()] + (qc.getMetaDataEntry("extruder") == active_extruder.definition.getMetaDataEntry("quality_definition") or + qc.getMetaDataEntry("extruder") == active_extruder.definition.getId())] else: # If not, the quality changes of the global stack are selected filtered_quality_changes = [qc for qc in quality_changes_list if qc.getMetaDataEntry("quality_type") in quality_type_set and