3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-10 16:27:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Upgrade other per-extruder instance containers too

Browse source 
Global instance containers will also go through this function but won't get picked out by the if statement here.
This commit is contained in:
Ghostkeeper 2020-04-09 01:23:11 +02:00
parent 2410d05100
commit 18ebdfafb7
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
plugins/VersionUpgrade/VersionUpgrade46to47/VersionUpgrade46to47.py
View file

@ -55,15 +55,15 @@ class VersionUpgrade46to47(VersionUpgrade):
parser.write(result) parser.write(result)
return [filename], [result.getvalue()] return [filename], [result.getvalue()]
def upgradeDefinitionChanges(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: def upgradeExtruderInstanceContainer(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]:
""" """
Upgrades definition changes files to the new version number. Upgrades per-extruder instance containers to the new version number.
This applies all of the changes that are applied in other instance This applies all of the changes that are applied in other instance
containers as well. containers as well.
In the case of Deltacomb printers, it splits the 2 extruder definition In the case of Deltacomb printers, it splits the 2 extruders into 4 and
changes into 4. changes the definition.
:param serialized: The original contents of the instance container. :param serialized: The original contents of the instance container.
:param filename: The original file name of the instance container. :param filename: The original file name of the instance container.
:return: A list of new file names, and a list of the new contents for :return: A list of new file names, and a list of the new contents for
@ -170,14 +170,16 @@ class VersionUpgrade46to47(VersionUpgrade):
extruder3 = copy.copy(parser) extruder3 = copy.copy(parser)
extruder3["metadata"]["position"] = "2" extruder3["metadata"]["position"] = "2"
extruder3["containers"]["0"] += "_e2_upgrade" extruder3["containers"]["0"] += "_e2_upgrade"
extruder3["containers"]["1"] += "_e2_upgrade"
extruder3["containers"]["6"] += "_e2_upgrade" extruder3["containers"]["6"] += "_e2_upgrade"
extruder3["containers"]["7"] = "deltacomb_base_extuder_2" extruder3["containers"]["7"] = "deltacomb_base_extuder_2"
result_parsers.append(extruder3) result_parsers.append(extruder3)
result_filenames.append(filename[:-len(".extruder.cfg")] + "_e2_upgrade.extruder.cfg") result_filenames.append(filename[:-len(".extruder.cfg")] + "_e2_upgrade.extruder.cfg")
extruder4 = copy.copy(parser) extruder4 = copy.copy(parser)
extruder4["metadata"]["position"] = "3" extruder4["metadata"]["position"] = "3"
extruder4["containers"]["0"] += ".inst.cfg_e3_upgrade" extruder4["containers"]["0"] += "_e3_upgrade"
extruder4["containers"]["6"] += ".inst.cfg_e3_upgrade" extruder4["containers"]["1"] += "_e3_upgrade"
extruder4["containers"]["6"] += "_e3_upgrade"
extruder4["containers"]["7"] = "deltacomb_base_extruder_3" extruder4["containers"]["7"] = "deltacomb_base_extruder_3"
result_parsers.append(extruder4) result_parsers.append(extruder4)
result_filenames.append(filename[:-len(".extruder.cfg")] + "_e3_upgrade.extruder.cfg") result_filenames.append(filename[:-len(".extruder.cfg")] + "_e3_upgrade.extruder.cfg")

8
plugins/VersionUpgrade/VersionUpgrade46to47/__init__.py
View file

@ -17,10 +17,10 @@ def getMetaData() -> Dict[str, Any]:
("preferences", 6000012): ("preferences", 6000013, upgrade.upgradePreferences), ("preferences", 6000012): ("preferences", 6000013, upgrade.upgradePreferences),
("machine_stack", 4000012): ("machine_stack", 4000013, upgrade.upgradeStack), ("machine_stack", 4000012): ("machine_stack", 4000013, upgrade.upgradeStack),
("extruder_train", 4000012): ("extruder_train", 4000013, upgrade.upgradeStack), ("extruder_train", 4000012): ("extruder_train", 4000013, upgrade.upgradeStack),
("definition_changes", 4000012): ("definition_changes", 4000013, upgrade.upgradeDefinitionChanges), ("definition_changes", 4000012): ("definition_changes", 4000013, upgrade.upgradeExtruderInstanceContainer),
("quality_changes", 4000012): ("quality_changes", 4000013, upgrade.upgradeInstanceContainer), ("quality_changes", 4000012): ("quality_changes", 4000013, upgrade.upgradeExtruderInstanceContainer),
("quality", 4000012): ("quality", 4000013, upgrade.upgradeInstanceContainer), ("quality", 4000012): ("quality", 4000013, upgrade.upgradeExtruderInstanceContainer),
("user", 4000012): ("user", 4000013, upgrade.upgradeInstanceContainer), ("user", 4000012): ("user", 4000013, upgrade.upgradeExtruderInstanceContainer),
}, },
"sources": { "sources": {
"preferences": { "preferences": {