GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 03:35:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tim Kuipers 2016-09-29 12:09:39 +02:00
commit 8206ecbfa8
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cura/QualityManager.py
View File

@ -63,9 +63,9 @@ class QualityManager:
# Fill in any default values. # Fill in any default values.
if machine_definition is None: if machine_definition is None:
machine_definition = UM.Application.getInstance().getGlobalContainerStack().getBottom() machine_definition = UM.Application.getInstance().getGlobalContainerStack().getBottom()
quality_definition = machine_definition.getMetaDataEntry("quality_definition") quality_definition_id = machine_definition.getMetaDataEntry("quality_definition")
if quality_definition is not None: if quality_definition_id is not None:
machine_definition = UM.Settings.ContainerRegistry.getInstance().findDefinitionContainers(id=quality_definition)[0] machine_definition = UM.Settings.ContainerRegistry.getInstance().findDefinitionContainers(id=quality_definition_id)[0]
if material_containers is None: if material_containers is None:
active_stacks = cura.Settings.ExtruderManager.getInstance().getActiveGlobalAndExtruderStacks() active_stacks = cura.Settings.ExtruderManager.getInstance().getActiveGlobalAndExtruderStacks()
@ -81,6 +81,8 @@ class QualityManager:
criteria["definition"] = definition_id criteria["definition"] = definition_id
filter_by_material = whole_machine_definition.getMetaDataEntry("has_materials") filter_by_material = whole_machine_definition.getMetaDataEntry("has_materials")
else:
criteria["definition"] = "fdmprinter"
# Stick the material IDs in a set # Stick the material IDs in a set
if material_containers is None or len(material_containers) == 0: if material_containers is None or len(material_containers) == 0:

6
plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py
View File

@ -59,7 +59,9 @@ class Profile:
# Parse the settings. # Parse the settings.
self._settings = {} self._settings = {}
if parser.has_section("settings"): if parser.has_section("settings"):
print("---------------------- have section Settings")
for key, value in parser["settings"].items(): for key, value in parser["settings"].items():
print("----------------------", key, "=", value)
self._settings[key] = value self._settings[key] = value
# Parse the defaults and the disabled defaults. # Parse the defaults and the disabled defaults.
@ -105,13 +107,13 @@ class Profile:
config.set("metadata", "variant", self._machine_variant_name) config.set("metadata", "variant", self._machine_variant_name)
if self._settings: if self._settings:
VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translateSettings(self._settings) self._settings = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translateSettings(self._settings)
config.add_section("values") config.add_section("values")
for key, value in self._settings.items(): for key, value in self._settings.items():
config.set("values", key, str(value)) config.set("values", key, str(value))
if self._changed_settings_defaults: if self._changed_settings_defaults:
VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translateSettings(self._changed_settings_defaults) self._changed_settings_defaults = VersionUpgrade21to22.VersionUpgrade21to22.VersionUpgrade21to22.translateSettings(self._changed_settings_defaults)
config.add_section("defaults") config.add_section("defaults")
for key, value in self._changed_settings_defaults.items(): for key, value in self._changed_settings_defaults.items():
config.set("defaults", key, str(value)) config.set("defaults", key, str(value))