3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 21:44:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge branch 'master' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Tim Kuipers 2016-10-06 15:08:27 +02:00
commit f62a120533
31 changed files with 34 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cura/Settings/ContainerManager.py
View file

@ -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 = {}

2
resources/quality/high.inst.cfg
View file

@ -6,7 +6,7 @@ definition = fdmprinter
[metadata]
type = quality
quality_type = high
weight = -3
weight = 1
[values]
layer_height = 0.06

2
resources/quality/normal.inst.cfg
View file

@ -6,6 +6,6 @@ definition = fdmprinter
[metadata]
type = quality
quality_type = normal
weight = -2
weight = 0
[values]

2
resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg
View file

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

2
resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg
View file

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