From a5e38bb4864ea23c213b4292bd75d21d8156a3a9 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Thu, 29 Mar 2018 16:54:30 +0200 Subject: [PATCH 1/2] CURA-5175 Add variants to the version upgrade. Upgrade the version number in the variants and add the hardware_type metadata. --- cura/CuraApplication.py | 1 + .../VersionUpgrade32to33/VersionUpgrade32to33.py | 16 ++++++++++++++++ .../VersionUpgrade32to33/__init__.py | 12 +++++++++++- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 292d0bce94..9c765970cc 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -209,6 +209,7 @@ class CuraApplication(QtApplication): ("preferences", Preferences.Version * 1000000 + self.SettingVersion): (Resources.Preferences, "application/x-uranium-preferences"), ("user", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.UserInstanceContainer, "application/x-uranium-instancecontainer"), ("definition_changes", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.DefinitionChangesContainer, "application/x-uranium-instancecontainer"), + ("variant", InstanceContainer.Version * 1000000 + self.SettingVersion): (self.ResourceTypes.VariantInstanceContainer, "application/x-uranium-instancecontainer"), } ) diff --git a/plugins/VersionUpgrade/VersionUpgrade32to33/VersionUpgrade32to33.py b/plugins/VersionUpgrade/VersionUpgrade32to33/VersionUpgrade32to33.py index 9840c91bd0..3de451632f 100644 --- a/plugins/VersionUpgrade/VersionUpgrade32to33/VersionUpgrade32to33.py +++ b/plugins/VersionUpgrade/VersionUpgrade32to33/VersionUpgrade32to33.py @@ -149,6 +149,22 @@ class VersionUpgrade32to33(VersionUpgrade): #Update version number. parser["general"]["version"] = "3" + result = io.StringIO() + parser.write(result) + return [filename], [result.getvalue()] + + ## Upgrades a variant container to the new format. + def upgradeVariants(self, serialized, filename): + parser = configparser.ConfigParser(interpolation = None) + parser.read_string(serialized) + + #Add the hardware type to the variants + if "metadata" in parser and "hardware_type" not in parser["metadata"]: + parser["metadata"]["hardware_type"] = "nozzle" + + #Update version number. + parser["general"]["version"] = "3" + result = io.StringIO() parser.write(result) return [filename], [result.getvalue()] \ No newline at end of file diff --git a/plugins/VersionUpgrade/VersionUpgrade32to33/__init__.py b/plugins/VersionUpgrade/VersionUpgrade32to33/__init__.py index 72ff6e1de9..36e0036bec 100644 --- a/plugins/VersionUpgrade/VersionUpgrade32to33/__init__.py +++ b/plugins/VersionUpgrade/VersionUpgrade32to33/__init__.py @@ -13,8 +13,10 @@ def getMetaData(): ("extruder_train", 3000004): ("extruder_train", 4000004, upgrade.upgradeStack), ("definition_changes", 2000004): ("definition_changes", 3000004, upgrade.upgradeInstanceContainer), + ("quality", 2000004): ("quality", 3000004, upgrade.upgradeInstanceContainer), ("quality_changes", 2000004): ("quality_changes", 3000004, upgrade.upgradeQualityChanges), - ("user", 2000004): ("user", 3000004, upgrade.upgradeInstanceContainer) + ("user", 2000004): ("user", 3000004, upgrade.upgradeInstanceContainer), + ("variant", 2000004): ("variant", 3000004, upgrade.upgradeVariants) }, "sources": { "machine_stack": { @@ -29,6 +31,10 @@ def getMetaData(): "get_version": upgrade.getCfgVersion, "location": {"./definition_changes"} }, + "quality": { + "get_version": upgrade.getCfgVersion, + "location": {"./quality"} + }, "quality_changes": { "get_version": upgrade.getCfgVersion, "location": {"./quality"} @@ -36,6 +42,10 @@ def getMetaData(): "user": { "get_version": upgrade.getCfgVersion, "location": {"./user"} + }, + "variant": { + "get_version": upgrade.getCfgVersion, + "location": {"./variants"} } } } From 2a3b25265bf4d63b9879f60f26cba63f151ce447 Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Thu, 29 Mar 2018 14:25:00 +0200 Subject: [PATCH 2/2] CURA-5174 update camera zoom range --- cura/CuraApplication.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 9c765970cc..296c9b75dd 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -743,7 +743,7 @@ class CuraApplication(QtApplication): # Initialize camera tool camera_tool = controller.getTool("CameraTool") camera_tool.setOrigin(Vector(0, 100, 0)) - camera_tool.setZoomRange(0.1, 200000) + camera_tool.setZoomRange(0.1, 2000) # Initialize camera animations self._camera_animation = CameraAnimation.CameraAnimation()