3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into python_type_hinting

Browse source
This commit is contained in:
Simon Edwards 2017-01-17 08:42:55 +01:00
commit fb70eb6813
124 changed files with 65675 additions and 49200 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cura/Settings/SettingInheritanceManager.py
View file

@ -1,7 +1,8 @@
# Copyright (c) 2016 Ultimaker B.V.
# Cura is released under the terms of the AGPLv3 or higher.
from PyQt5.QtCore import QObject, pyqtSlot, pyqtProperty, pyqtSignal
from PyQt5.QtCore import QObject, pyqtProperty, pyqtSignal
from UM.FlameProfiler import pyqtSlot
from UM.Application import Application
from UM.Logger import Logger
@ -36,7 +37,8 @@ class SettingInheritanceManager(QObject):
def getChildrenKeysWithOverride(self, key):
definitions = self._global_container_stack.getBottom().findDefinitions(key=key)
if not definitions:
return
Logger.log("w", "Could not find definition for key [%s]", key)
return []
result = []
for key in definitions[0].getAllKeys():
if key in self._settings_with_inheritance_warning:
@ -55,7 +57,8 @@ class SettingInheritanceManager(QObject):
definitions = self._global_container_stack.getBottom().findDefinitions(key=key)
if not definitions:
return
Logger.log("w", "Could not find definition for key [%s] (2)", key)
return []
result = []
for key in definitions[0].getAllKeys():
if self._settingIsOverwritingInheritance(key, extruder):