Merge pull request #4084 from Ultimaker/add_cartesio_variants

CURA-5578 Change the Cartesio variants to use the new ones
This commit is contained in:
Lipu Fei 2018-07-16 15:55:11 +02:00 committed by GitHub
commit 5ba3beb104
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
63 changed files with 114 additions and 62 deletions

View File

@ -8,6 +8,54 @@ from UM.VersionUpgrade import VersionUpgrade
deleted_settings = {"prime_tower_wall_thickness", "dual_pre_wipe", "prime_tower_purge_volume"}
_RENAMED_MATERIAL_PROFILES = {
"dsm_arnitel2045_175_cartesio_0.25_mm": "dsm_arnitel2045_175_cartesio_0.25mm_thermoplastic_extruder",
"dsm_arnitel2045_175_cartesio_0.4_mm": "dsm_arnitel2045_175_cartesio_0.4mm_thermoplastic_extruder",
"dsm_arnitel2045_175_cartesio_0.8_mm": "dsm_arnitel2045_175_cartesio_0.8mm_thermoplastic_extruder",
"dsm_novamid1070_175_cartesio_0.25_mm": "dsm_novamid1070_175_cartesio_0.25mm_thermoplastic_extruder",
"dsm_novamid1070_175_cartesio_0.4_mm": "dsm_novamid1070_175_cartesio_0.4mm_thermoplastic_extruder",
"dsm_novamid1070_175_cartesio_0.8_mm": "dsm_novamid1070_175_cartesio_0.8mm_thermoplastic_extruder",
"generic_abs_175_cartesio_0.25_mm": "generic_abs_175_cartesio_0.25mm_thermoplastic_extruder",
"generic_abs_175_cartesio_0.4_mm": "generic_abs_175_cartesio_0.4mm_thermoplastic_extruder",
"generic_abs_175_cartesio_0.8_mm": "generic_abs_175_cartesio_0.8mm_thermoplastic_extruder",
"generic_hips_175_cartesio_0.25_mm": "generic_hips_175_cartesio_0.25mm_thermoplastic_extruder",
"generic_hips_175_cartesio_0.4_mm": "generic_hips_175_cartesio_0.4mm_thermoplastic_extruder",
"generic_hips_175_cartesio_0.8_mm": "generic_hips_175_cartesio_0.8mm_thermoplastic_extruder",
"generic_nylon_175_cartesio_0.25_mm": "generic_nylon_175_cartesio_0.25mm_thermoplastic_extruder",
"generic_nylon_175_cartesio_0.4_mm": "generic_nylon_175_cartesio_0.4mm_thermoplastic_extruder",
"generic_nylon_175_cartesio_0.8_mm": "generic_nylon_175_cartesio_0.8mm_thermoplastic_extruder",
"generic_pc_cartesio_0.25_mm": "generic_pc_cartesio_0.25mm_thermoplastic_extruder",
"generic_pc_cartesio_0.4_mm": "generic_pc_cartesio_0.4mm_thermoplastic_extruder",
"generic_pc_cartesio_0.8_mm": "generic_pc_cartesio_0.8mm_thermoplastic_extruder",
"generic_pc_175_cartesio_0.25_mm": "generic_pc_175_cartesio_0.25mm_thermoplastic_extruder",
"generic_pc_175_cartesio_0.4_mm": "generic_pc_175_cartesio_0.4mm_thermoplastic_extruder",
"generic_pc_175_cartesio_0.8_mm": "generic_pc_175_cartesio_0.8mm_thermoplastic_extruder",
"generic_petg_175_cartesio_0.25_mm": "generic_petg_175_cartesio_0.25mm_thermoplastic_extruder",
"generic_petg_175_cartesio_0.4_mm": "generic_petg_175_cartesio_0.4mm_thermoplastic_extruder",
"generic_petg_175_cartesio_0.8_mm": "generic_petg_175_cartesio_0.8mm_thermoplastic_extruder",
"generic_pla_175_cartesio_0.25_mm": "generic_pla_175_cartesio_0.25mm_thermoplastic_extruder",
"generic_pla_175_cartesio_0.4_mm": "generic_pla_175_cartesio_0.4mm_thermoplastic_extruder",
"generic_pla_175_cartesio_0.8_mm": "generic_pla_175_cartesio_0.8mm_thermoplastic_extruder",
"generic_pva_cartesio_0.25_mm": "generic_pva_cartesio_0.25mm_thermoplastic_extruder",
"generic_pva_cartesio_0.4_mm": "generic_pva_cartesio_0.4mm_thermoplastic_extruder",
"generic_pva_cartesio_0.8_mm": "generic_pva_cartesio_0.8mm_thermoplastic_extruder",
"generic_pva_175_cartesio_0.25_mm": "generic_pva_175_cartesio_0.25mm_thermoplastic_extruder",
"generic_pva_175_cartesio_0.4_mm": "generic_pva_175_cartesio_0.4mm_thermoplastic_extruder",
"generic_pva_175_cartesio_0.8_mm": "generic_pva_175_cartesio_0.8mm_thermoplastic_extruder",
"ultimaker_pc_black_cartesio_0.25_mm": "ultimaker_pc_black_cartesio_0.25mm_thermoplastic_extruder",
"ultimaker_pc_black_cartesio_0.4_mm": "ultimaker_pc_black_cartesio_0.4mm_thermoplastic_extruder",
"ultimaker_pc_black_cartesio_0.8_mm": "ultimaker_pc_black_cartesio_0.8mm_thermoplastic_extruder",
"ultimaker_pc_transparent_cartesio_0.25_mm": "ultimaker_pc_transparent_cartesio_0.25mm_thermoplastic_extruder",
"ultimaker_pc_transparent_cartesio_0.4_mm": "ultimaker_pc_transparent_cartesio_0.4mm_thermoplastic_extruder",
"ultimaker_pc_transparent_cartesio_0.8_mm": "ultimaker_pc_transparent_cartesio_0.8mm_thermoplastic_extruder",
"ultimaker_pc_white_cartesio_0.25_mm": "ultimaker_pc_white_cartesio_0.25mm_thermoplastic_extruder",
"ultimaker_pc_white_cartesio_0.4_mm": "ultimaker_pc_white_cartesio_0.4mm_thermoplastic_extruder",
"ultimaker_pc_white_cartesio_0.8_mm": "ultimaker_pc_white_cartesio_0.8mm_thermoplastic_extruder",
"ultimaker_pva_cartesio_0.25_mm": "ultimaker_pva_cartesio_0.25mm_thermoplastic_extruder",
"ultimaker_pva_cartesio_0.4_mm": "ultimaker_pva_cartesio_0.4mm_thermoplastic_extruder",
"ultimaker_pva_cartesio_0.8_mm": "ultimaker_pva_cartesio_0.8mm_thermoplastic_extruder"
}
## Upgrades configurations from the state they were in at version 3.4 to the
# state they should be in at version 4.0.
class VersionUpgrade34to40(VersionUpgrade):
@ -54,6 +102,10 @@ class VersionUpgrade34to40(VersionUpgrade):
parser["general"]["version"] = "4"
parser["metadata"]["setting_version"] = "5"
#Update the name of the quality profile.
if parser["containers"]["3"] in _RENAMED_MATERIAL_PROFILES:
parser["containers"]["3"] = _RENAMED_MATERIAL_PROFILES[parser["containers"]["3"]]
result = io.StringIO()
parser.write(result)
return [filename], [result.getvalue()]

View File

@ -15,7 +15,7 @@
"has_variants": true,
"variants_name": "Tool",
"preferred_variant_name": "0.8 mm",
"preferred_variant_name": "0.8mm thermoplastic extruder",
"preferred_material": "generic_pla",
"preferred_quality_type": "normal",

View File

@ -9,7 +9,7 @@ type = quality
quality_type = high
weight = 1
material = generic_abs
variant = 0.25 mm
variant = 0.25mm thermoplastic extruder
[values]
infill_line_width = 0.3

View File

@ -9,7 +9,7 @@ type = quality
quality_type = normal
weight = 2
material = generic_abs
variant = 0.25 mm
variant = 0.25mm thermoplastic extruder
[values]
infill_line_width = 0.3

View File

@ -9,7 +9,7 @@ type = quality
quality_type = high
weight = 1
material = generic_abs
variant = 0.4 mm
variant = 0.4mm thermoplastic extruder
[values]
infill_line_width = 0.5

View File

@ -9,7 +9,7 @@ type = quality
quality_type = normal
weight = 2
material = generic_abs
variant = 0.4 mm
variant = 0.4mm thermoplastic extruder
[values]
infill_line_width = 0.5

View File

@ -9,7 +9,7 @@ type = quality
quality_type = coarse
weight = 3
material = generic_abs
variant = 0.8 mm
variant = 0.8mm thermoplastic extruder
[values]
infill_line_width = 0.9

View File

@ -9,7 +9,7 @@ type = quality
quality_type = extra coarse
weight = 4
material = generic_abs
variant = 0.8 mm
variant = 0.8mm thermoplastic extruder
[values]
infill_line_width = 0.9

View File

@ -9,7 +9,7 @@ type = quality
quality_type = high
weight = 1
material = generic_abs
variant = 0.8 mm
variant = 0.8mm thermoplastic extruder
[values]
infill_line_width = 0.9

View File

@ -9,7 +9,7 @@ type = quality
quality_type = normal
weight = 2
material = generic_abs
variant = 0.8 mm
variant = 0.8mm thermoplastic extruder
[values]
infill_line_width = 0.9

View File

@ -9,7 +9,7 @@ type = quality
quality_type = high
weight = 1
material = dsm_arnitel2045_175
variant = 0.4 mm
variant = 0.4mm thermoplastic extruder
[values]
infill_line_width = 0.5

View File

@ -9,7 +9,7 @@ type = quality
quality_type = normal
weight = 2
material = dsm_arnitel2045_175
variant = 0.4 mm
variant = 0.4mm thermoplastic extruder
[values]
infill_line_width = 0.5

View File

@ -9,7 +9,7 @@ type = quality
quality_type = high
weight = 1
material = generic_hips
variant = 0.25 mm
variant = 0.25mm thermoplastic extruder
[values]
infill_line_width = 0.3

View File

@ -9,7 +9,7 @@ type = quality
quality_type = normal
weight = 2
material = generic_hips
variant = 0.25 mm
variant = 0.25mm thermoplastic extruder
[values]
infill_line_width = 0.3

View File

@ -9,7 +9,7 @@ type = quality
quality_type = high
weight = 1
material = generic_hips
variant = 0.4 mm
variant = 0.4mm thermoplastic extruder
[values]
infill_line_width = 0.5

View File

@ -9,7 +9,7 @@ type = quality
quality_type = normal
weight = 2
material = generic_hips
variant = 0.4 mm
variant = 0.4mm thermoplastic extruder
[values]
infill_line_width = 0.5

View File

@ -9,7 +9,7 @@ type = quality
quality_type = coarse
weight = 3
material = generic_hips
variant = 0.8 mm
variant = 0.8mm thermoplastic extruder
[values]
infill_line_width = 0.9

View File

@ -9,7 +9,7 @@ type = quality
quality_type = extra coarse
weight = 4
material = generic_hips
variant = 0.8 mm
variant = 0.8mm thermoplastic extruder
[values]
infill_line_width = 0.9

View File

@ -9,7 +9,7 @@ type = quality
quality_type = high
weight = 1
material = generic_hips
variant = 0.8 mm
variant = 0.8mm thermoplastic extruder
[values]
infill_line_width = 0.9

View File

@ -9,7 +9,7 @@ type = quality
quality_type = normal
weight = 2
material = generic_hips
variant = 0.8 mm
variant = 0.8mm thermoplastic extruder
[values]
infill_line_width = 0.9

View File

@ -9,7 +9,7 @@ type = quality
quality_type = high
weight = 1
material = generic_nylon
variant = 0.25 mm
variant = 0.25mm thermoplastic extruder
[values]
infill_line_width = 0.3

View File

@ -9,7 +9,7 @@ type = quality
quality_type = normal
weight = 2
material = generic_nylon
variant = 0.25 mm
variant = 0.25mm thermoplastic extruder
[values]
infill_line_width = 0.3

View File

@ -9,7 +9,7 @@ type = quality
quality_type = high
weight = 1
material = generic_nylon
variant = 0.4 mm
variant = 0.4mm thermoplastic extruder
[values]
infill_line_width = 0.5

View File

@ -9,7 +9,7 @@ type = quality
quality_type = normal
weight = 2
material = generic_nylon
variant = 0.4 mm
variant = 0.4mm thermoplastic extruder
[values]
infill_line_width = 0.5

View File

@ -9,7 +9,7 @@ type = quality
quality_type = coarse
weight = 3
material = generic_nylon
variant = 0.8 mm
variant = 0.8mm thermoplastic extruder
[values]
infill_line_width = 0.9

View File

@ -9,7 +9,7 @@ type = quality
quality_type = extra coarse
weight = 4
material = generic_nylon
variant = 0.8 mm
variant = 0.8mm thermoplastic extruder
[values]
infill_line_width = 0.9

View File

@ -9,7 +9,7 @@ type = quality
quality_type = high
weight = 1
material = generic_nylon
variant = 0.8 mm
variant = 0.8mm thermoplastic extruder
[values]
infill_line_width = 0.9

View File

@ -9,7 +9,7 @@ type = quality
quality_type = normal
weight = 2
material = generic_nylon
variant = 0.8 mm
variant = 0.8mm thermoplastic extruder
[values]
infill_line_width = 0.9

View File

@ -9,7 +9,7 @@ type = quality
quality_type = high
weight = 1
material = generic_pc
variant = 0.25 mm
variant = 0.25mm thermoplastic extruder
[values]
infill_line_width = 0.3

View File

@ -9,7 +9,7 @@ type = quality
quality_type = normal
weight = 2
material = generic_pc
variant = 0.25 mm
variant = 0.25mm thermoplastic extruder
[values]
infill_line_width = 0.3

View File

@ -9,7 +9,7 @@ type = quality
quality_type = high
weight = 1
material = generic_pc
variant = 0.4 mm
variant = 0.4mm thermoplastic extruder
[values]
infill_line_width = 0.5

View File

@ -9,7 +9,7 @@ type = quality
quality_type = normal
weight = 2
material = generic_pc
variant = 0.4 mm
variant = 0.4mm thermoplastic extruder
[values]
infill_line_width = 0.5

View File

@ -9,7 +9,7 @@ type = quality
quality_type = coarse
weight = 3
material = generic_pc
variant = 0.8 mm
variant = 0.8mm thermoplastic extruder
[values]
infill_line_width = 0.9

View File

@ -9,7 +9,7 @@ type = quality
quality_type = extra coarse
weight = 4
material = generic_pc
variant = 0.8 mm
variant = 0.8mm thermoplastic extruder
[values]
infill_line_width = 0.9

View File

@ -9,7 +9,7 @@ type = quality
quality_type = high
weight = 1
material = generic_pc
variant = 0.8 mm
variant = 0.8mm thermoplastic extruder
[values]
infill_line_width = 0.9

View File

@ -9,7 +9,7 @@ type = quality
quality_type = normal
weight = 2
material = generic_pc
variant = 0.8 mm
variant = 0.8mm thermoplastic extruder
[values]
infill_line_width = 0.9

View File

@ -9,7 +9,7 @@ type = quality
quality_type = high
weight = 1
material = generic_petg
variant = 0.25 mm
variant = 0.25mm thermoplastic extruder
[values]
infill_line_width = 0.3

View File

@ -9,7 +9,7 @@ type = quality
quality_type = normal
weight = 2
material = generic_petg
variant = 0.25 mm
variant = 0.25mm thermoplastic extruder
[values]
infill_line_width = 0.3

View File

@ -9,7 +9,7 @@ type = quality
quality_type = high
weight = 1
material = generic_petg
variant = 0.4 mm
variant = 0.4mm thermoplastic extruder
[values]
infill_line_width = 0.5

View File

@ -9,7 +9,7 @@ type = quality
quality_type = normal
weight = 2
material = generic_petg
variant = 0.4 mm
variant = 0.4mm thermoplastic extruder
[values]
infill_line_width = 0.5

View File

@ -9,7 +9,7 @@ type = quality
quality_type = coarse
weight = 3
material = generic_petg
variant = 0.8 mm
variant = 0.8mm thermoplastic extruder
[values]
infill_line_width = 0.9

View File

@ -9,7 +9,7 @@ type = quality
quality_type = extra coarse
weight = 4
material = generic_petg
variant = 0.8 mm
variant = 0.8mm thermoplastic extruder
[values]
infill_line_width = 0.9

View File

@ -9,7 +9,7 @@ type = quality
quality_type = high
weight = 1
material = generic_petg
variant = 0.8 mm
variant = 0.8mm thermoplastic extruder
[values]
infill_line_width = 0.9

View File

@ -9,7 +9,7 @@ type = quality
quality_type = normal
weight = 2
material = generic_petg
variant = 0.8 mm
variant = 0.8mm thermoplastic extruder
[values]
infill_line_width = 0.9

View File

@ -9,7 +9,7 @@ type = quality
quality_type = high
weight = 1
material = generic_pla
variant = 0.25 mm
variant = 0.25mm thermoplastic extruder
[values]
infill_line_width = 0.3

View File

@ -9,7 +9,7 @@ type = quality
quality_type = normal
weight = 0
material = generic_pla
variant = 0.25 mm
variant = 0.25mm thermoplastic extruder
[values]
infill_line_width = 0.3

View File

@ -9,7 +9,7 @@ type = quality
quality_type = high
weight = 1
material = generic_pla
variant = 0.4 mm
variant = 0.4mm thermoplastic extruder
[values]
infill_line_width = 0.5

View File

@ -9,7 +9,7 @@ type = quality
quality_type = normal
weight = 0
material = generic_pla
variant = 0.4 mm
variant = 0.4mm thermoplastic extruder
[values]
infill_line_width = 0.5

View File

@ -9,7 +9,7 @@ type = quality
quality_type = coarse
weight = -3
material = generic_pla
variant = 0.8 mm
variant = 0.8mm thermoplastic extruder
[values]
infill_line_width = 0.9

View File

@ -9,7 +9,7 @@ type = quality
quality_type = extra coarse
weight = -4
material = generic_pla
variant = 0.8 mm
variant = 0.8mm thermoplastic extruder
[values]
infill_line_width = 0.9

View File

@ -9,7 +9,7 @@ type = quality
quality_type = high
weight = 1
material = generic_pla
variant = 0.8 mm
variant = 0.8mm thermoplastic extruder
[values]
infill_line_width = 0.9

View File

@ -9,7 +9,7 @@ type = quality
quality_type = normal
weight = 0
material = generic_pla
variant = 0.8 mm
variant = 0.8mm thermoplastic extruder
[values]
infill_line_width = 0.9

View File

@ -9,7 +9,7 @@ type = quality
quality_type = high
weight = 1
material = generic_pva
variant = 0.25 mm
variant = 0.25mm thermoplastic extruder
[values]
infill_line_width = 0.3

View File

@ -9,7 +9,7 @@ type = quality
quality_type = normal
weight = 2
material = generic_pva
variant = 0.25 mm
variant = 0.25mm thermoplastic extruder
[values]
infill_line_width = 0.3

View File

@ -9,7 +9,7 @@ type = quality
quality_type = high
weight = 1
material = generic_pva
variant = 0.4 mm
variant = 0.4mm thermoplastic extruder
[values]
infill_line_width = 0.5

View File

@ -9,7 +9,7 @@ type = quality
quality_type = normal
weight = 2
material = generic_pva
variant = 0.4 mm
variant = 0.4mm thermoplastic extruder
[values]
infill_line_width = 0.5

View File

@ -9,7 +9,7 @@ type = quality
quality_type = coarse
weight = 3
material = generic_pva
variant = 0.8 mm
variant = 0.8mm thermoplastic extruder
[values]
infill_line_width = 0.9

View File

@ -9,7 +9,7 @@ type = quality
quality_type = extra coarse
weight = 4
material = generic_pva
variant = 0.8 mm
variant = 0.8mm thermoplastic extruder
[values]
infill_line_width = 0.9

View File

@ -9,7 +9,7 @@ type = quality
quality_type = high
weight = 1
material = generic_pva
variant = 0.8 mm
variant = 0.8mm thermoplastic extruder
[values]
infill_line_width = 0.9

View File

@ -9,7 +9,7 @@ type = quality
quality_type = normal
weight = 2
material = generic_pva
variant = 0.8 mm
variant = 0.8mm thermoplastic extruder
[values]
infill_line_width = 0.9

View File

@ -1,5 +1,5 @@
[general]
name = 0.25 mm
name = 0.25mm thermoplastic extruder
version = 4
definition = cartesio

View File

@ -1,5 +1,5 @@
[general]
name = 0.4 mm
name = 0.4mm thermoplastic extruder
version = 4
definition = cartesio

View File

@ -1,5 +1,5 @@
[general]
name = 0.8 mm
name = 0.8mm thermoplastic extruder
version = 4
definition = cartesio