diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index a917718e61..7f2555af03 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -480,6 +480,7 @@ class ContainerManager(QObject): new_changes = self._createQualityChanges(quality_container, unique_name, UM.Application.getInstance().getGlobalContainerStack().getBottom(), extruder_id) + self._performMerge(new_changes, quality_changes_container, clear_settings = False) self._performMerge(new_changes, user_container) self._container_registry.addContainer(new_changes) @@ -694,7 +695,7 @@ class ContainerManager(QObject): def createContainerManager(engine, js_engine): return ContainerManager.getInstance() - def _performMerge(self, merge_into, merge): + def _performMerge(self, merge_into, merge, clear_settings = True): assert isinstance(merge, type(merge_into)) if merge == merge_into: @@ -703,7 +704,8 @@ class ContainerManager(QObject): for key in merge.getAllKeys(): merge_into.setProperty(key, "value", merge.getProperty(key, "value")) - merge.clear() + if clear_settings: + merge.clear() def _updateContainerNameFilters(self): self._container_name_filters = {} diff --git a/resources/quality/high.inst.cfg b/resources/quality/high.inst.cfg index ec3ab18fd6..9e3e9f1f67 100644 --- a/resources/quality/high.inst.cfg +++ b/resources/quality/high.inst.cfg @@ -6,7 +6,7 @@ definition = fdmprinter [metadata] type = quality quality_type = high -weight = -3 +weight = 1 [values] layer_height = 0.06 diff --git a/resources/quality/normal.inst.cfg b/resources/quality/normal.inst.cfg index cfd70de49c..e940bbda35 100644 --- a/resources/quality/normal.inst.cfg +++ b/resources/quality/normal.inst.cfg @@ -6,6 +6,6 @@ definition = fdmprinter [metadata] type = quality quality_type = normal -weight = -2 +weight = 0 [values] diff --git a/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg index 18d74386cf..868f1dc016 100644 --- a/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] type = quality material = generic_pla_ultimaker2_plus_0.25_mm -weight = -2 +weight = 1 quality_type = high [values] diff --git a/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg index ff542c7c19..c2b15d1074 100644 --- a/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] type = quality material = generic_pla_ultimaker2_plus_0.4_mm -weight = -3 +weight = 1 quality_type = high [values] diff --git a/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg index 79d868f25f..9a84f5c04a 100644 --- a/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] type = quality material = generic_pla_ultimaker2_plus_0.4_mm -weight = -2 +weight = 0 quality_type = normal [values] diff --git a/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg index 63beca8fbb..fd4c2c120a 100644 --- a/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] material = generic_pla_ultimaker2_plus_0.6_mm type = quality -weight = -2 +weight = 0 quality_type = normal [values] diff --git a/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg index f2b78846a8..cd4c591640 100644 --- a/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] material = generic_pla_ultimaker2_plus_0.8_mm type = quality -weight = -2 +weight = -1 quality_type = fast [values] diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg index 8457d5cd2b..94ddd58081 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] type = quality material = generic_abs_ultimaker2_plus_0.25_mm -weight = -2 +weight = 1 quality_type = high [values] diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg index f2235abd41..c6ea33da2d 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] type = quality material = generic_abs_ultimaker2_plus_0.4_mm -weight = -3 +weight = 1 quality_type = high [values] diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg index 1b8c1035db..ba7886276b 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] type = quality material = generic_abs_ultimaker2_plus_0.4_mm -weight = -2 +weight = 0 quality_type = normal [values] diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg index 4ef0f34484..3a0af33a6a 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] type = quality material = generic_abs_ultimaker2_plus_0.6_mm -weight = -2 +weight = 0 quality_type = normal [values] diff --git a/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg index ca2f736c01..e8885fc73a 100644 --- a/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] type = quality material = generic_abs_ultimaker2_plus_0.8_mm -weight = -2 +weight = -1 quality_type = fast [values] diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg index 0f2a612619..b86bb877f6 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] type = quality material = generic_cpe_ultimaker2_plus_0.25_mm -weight = -2 +weight = -1 quality_type = high [values] diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg index abc5e562f7..bb6a1ee079 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] type = quality material = generic_cpe_ultimaker2_plus_0.4_mm -weight = -3 +weight = 1 quality_type = high [values] diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg index 5531f245f0..54122164da 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] type = quality material = generic_cpe_ultimaker2_plus_0.4_mm -weight = -2 +weight = 0 quality_type = normal [values] diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg index 3765f98709..00a6160f46 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] type = quality material = generic_cpe_ultimaker2_plus_0.6_mm -weight = -2 +weight = 0 quality_type = normal [values] diff --git a/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg index 179b554973..83714ca40a 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] type = quality material = generic_cpe_ultimaker2_plus_0.8_mm -weight = -2 +weight = -1 quality_type = fast [values] diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg index 7e4ae3911d..ebb4c87f01 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] type = quality material = generic_cpe_plus_ultimaker2_plus_0.4_mm -weight = 0 +weight = -2 quality_type = draft [values] diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg index 069f7cb9f3..be6e962949 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] type = quality material = generic_cpe_plus_ultimaker2_plus_0.6_mm -weight = 0 +weight = -2 quality_type = draft [values] diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg index ccfe46dc2a..2cd6ef9dac 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] type = quality material = generic_cpe_plus_ultimaker2_plus_0.8_mm -weight = 0 +weight = -2 quality_type = draft [values] diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg index 2cf00fdbf4..c1f39614a6 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] type = quality material = generic_nylon_ultimaker2_plus_0.25_mm -weight = 0 +weight = 1 quality_type = high [values] diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg index b09113943b..88d8855a6a 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] type = quality material = generic_nylon_ultimaker2_plus_0.4_mm -weight = 0 +weight = -1 quality_type = fast [values] diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg index cdecab8f91..72dbc51e0f 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] type = quality material = generic_nylon_ultimaker2_plus_0.6_mm -weight = 0 +weight = -1 quality_type = fast [values] diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg index 89852991bf..f7975730c2 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] type = quality material = generic_nylon_ultimaker2_plus_0.8_mm -weight = 0 +weight = -2 quality_type = draft [values] diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg index 5358afd2be..91e75c2450 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] type = quality material = generic_pc_ultimaker2_plus_0.25_mm -weight = 0 +weight = 1 quality_type = high [values] diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg index c4af6dd366..e05cbb0dd0 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] type = quality material = generic_pc_ultimaker2_plus_0.4_mm -weight = 0 +weight = -1 quality_type = fast [values] diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg index ef6d1a20b3..bfd239e3cc 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] type = quality material = generic_pc_ultimaker2_plus_0.6_mm -weight = 0 +weight = -1 quality_type = fast [values] diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg index 1207b562ee..52e61a8145 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] type = quality material = generic_pc_ultimaker2_plus_0.8_mm -weight = 0 +weight = -2 quality_type = draft [values] diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg index 5ca9c7f055..1da2a667e6 100644 --- a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] type = quality material = generic_tpu_ultimaker2_plus_0.25_mm -weight = 0 +weight = 1 quality_type = high [values] diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg index 9ef7263e63..a2f3a57541 100644 --- a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg @@ -6,7 +6,7 @@ definition = ultimaker2_plus [metadata] type = quality material = generic_tpu_ultimaker2_plus_0.6_mm -weight = 0 +weight = -1 quality_type = fast [values]