From 57eb47e26700d28781750a46750df71758a690fc Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 23 Jul 2019 11:23:42 +0200 Subject: [PATCH] Named the imade profiles back again and added upgrade step for it The proposed new name is better and since we have an upgrader now, it's best to change it. --- .../VersionUpgrade42to43/VersionUpgrade42to43.py | 13 ++++++++++++- ...nst.cfg => jbo_generic_petg_0.4_coarse.inst.cfg} | 0 ....inst.cfg => jbo_generic_petg_0.4_fine.inst.cfg} | 0 ...nst.cfg => jbo_generic_petg_0.4_medium.inst.cfg} | 0 ...inst.cfg => jbo_generic_pla_0.4_coarse.inst.cfg} | 0 ...e.inst.cfg => jbo_generic_pla_0.4_fine.inst.cfg} | 0 ...inst.cfg => jbo_generic_pla_0.4_medium.inst.cfg} | 0 ...t.cfg => jbo_generic_pla_0.4_ultrafine.inst.cfg} | 0 8 files changed, 12 insertions(+), 1 deletion(-) rename resources/quality/imade3d_jellybox/PETG/{generic_petg_0.4_coarse.inst.cfg => jbo_generic_petg_0.4_coarse.inst.cfg} (100%) rename resources/quality/imade3d_jellybox/PETG/{generic_petg_0.4_fine.inst.cfg => jbo_generic_petg_0.4_fine.inst.cfg} (100%) rename resources/quality/imade3d_jellybox/PETG/{generic_petg_0.4_medium.inst.cfg => jbo_generic_petg_0.4_medium.inst.cfg} (100%) rename resources/quality/imade3d_jellybox/PLA/{generic_pla_0.4_coarse.inst.cfg => jbo_generic_pla_0.4_coarse.inst.cfg} (100%) rename resources/quality/imade3d_jellybox/PLA/{generic_pla_0.4_fine.inst.cfg => jbo_generic_pla_0.4_fine.inst.cfg} (100%) rename resources/quality/imade3d_jellybox/PLA/{generic_pla_0.4_medium.inst.cfg => jbo_generic_pla_0.4_medium.inst.cfg} (100%) rename resources/quality/imade3d_jellybox/PLA/{generic_pla_0.4_ultrafine.inst.cfg => jbo_generic_pla_0.4_ultrafine.inst.cfg} (100%) diff --git a/plugins/VersionUpgrade/VersionUpgrade42to43/VersionUpgrade42to43.py b/plugins/VersionUpgrade/VersionUpgrade42to43/VersionUpgrade42to43.py index 035d53ee02..134e7ab37d 100644 --- a/plugins/VersionUpgrade/VersionUpgrade42to43/VersionUpgrade42to43.py +++ b/plugins/VersionUpgrade/VersionUpgrade42to43/VersionUpgrade42to43.py @@ -4,7 +4,15 @@ from typing import Tuple, List from UM.VersionUpgrade import VersionUpgrade -_renamed_profiles = { } +_renamed_profiles = {"generic_pla_0.4_coarse": "jbo_generic_pla_0.4_coarse", + "generic_pla_0.4_fine": "jbo_generic_pla_fine", + "generic_pla_0.4_medium": "jbo_generic_pla_medium", + "generic_pla_0.4_ultrafine": "jbo_generic_pla_ultrafine", + + "generic_petg_0.4_coarse": "jbo_generic_petg_0.4_coarse", + "generic_petg_0.4_fine": "jbo_generic_petg_fine", + "generic_petg_0.4_medium": "jbo_generic_petg_medium", + } ## Upgrades configurations from the state they were in at version 4.2 to the @@ -59,6 +67,9 @@ class VersionUpgrade42to43(VersionUpgrade): if quality_id.endswith("_2-fans"): parser["containers"]["2"] = quality_id.replace("_2-fans", "") + if parser["containers"]["2"] in _renamed_profiles: + parser["containers"]["2"] = _renamed_profiles[parser["containers"]["2"]] + material_id = parser["containers"]["3"] if material_id.endswith("_2-fans"): parser["containers"]["3"] = material_id.replace("_2-fans", "") diff --git a/resources/quality/imade3d_jellybox/PETG/generic_petg_0.4_coarse.inst.cfg b/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_coarse.inst.cfg similarity index 100% rename from resources/quality/imade3d_jellybox/PETG/generic_petg_0.4_coarse.inst.cfg rename to resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_coarse.inst.cfg diff --git a/resources/quality/imade3d_jellybox/PETG/generic_petg_0.4_fine.inst.cfg b/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_fine.inst.cfg similarity index 100% rename from resources/quality/imade3d_jellybox/PETG/generic_petg_0.4_fine.inst.cfg rename to resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_fine.inst.cfg diff --git a/resources/quality/imade3d_jellybox/PETG/generic_petg_0.4_medium.inst.cfg b/resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_medium.inst.cfg similarity index 100% rename from resources/quality/imade3d_jellybox/PETG/generic_petg_0.4_medium.inst.cfg rename to resources/quality/imade3d_jellybox/PETG/jbo_generic_petg_0.4_medium.inst.cfg diff --git a/resources/quality/imade3d_jellybox/PLA/generic_pla_0.4_coarse.inst.cfg b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_coarse.inst.cfg similarity index 100% rename from resources/quality/imade3d_jellybox/PLA/generic_pla_0.4_coarse.inst.cfg rename to resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_coarse.inst.cfg diff --git a/resources/quality/imade3d_jellybox/PLA/generic_pla_0.4_fine.inst.cfg b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_fine.inst.cfg similarity index 100% rename from resources/quality/imade3d_jellybox/PLA/generic_pla_0.4_fine.inst.cfg rename to resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_fine.inst.cfg diff --git a/resources/quality/imade3d_jellybox/PLA/generic_pla_0.4_medium.inst.cfg b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_medium.inst.cfg similarity index 100% rename from resources/quality/imade3d_jellybox/PLA/generic_pla_0.4_medium.inst.cfg rename to resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_medium.inst.cfg diff --git a/resources/quality/imade3d_jellybox/PLA/generic_pla_0.4_ultrafine.inst.cfg b/resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_ultrafine.inst.cfg similarity index 100% rename from resources/quality/imade3d_jellybox/PLA/generic_pla_0.4_ultrafine.inst.cfg rename to resources/quality/imade3d_jellybox/PLA/jbo_generic_pla_0.4_ultrafine.inst.cfg