3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 14:55:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent

Browse source
This commit is contained in:
Jaime van Kessel 2019-10-04 10:33:57 +02:00
commit e197fe99fa
No known key found for this signature in database
GPG key ID: 3710727397403C91
7 changed files with 141 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cura/Settings/CuraContainerRegistry.py
View file

@ -295,6 +295,7 @@ class CuraContainerRegistry(ContainerRegistry):
profile_or_list.append(profile)
# Import all profiles
profile_ids_added = [] # type: List[str]
for profile_index, profile in enumerate(profile_or_list):
if profile_index == 0:
# This is assumed to be the global profile
@ -315,11 +316,15 @@ class CuraContainerRegistry(ContainerRegistry):
result = self._configureProfile(profile, profile_id, new_name, expected_machine_definition)
if result is not None:
# Remove any profiles that did got added.
for profile_id in profile_ids_added:
self.removeContainer(profile_id)
return {"status": "error", "message": catalog.i18nc(
"@info:status Don't translate the XML tag <filename>!",
"Failed to import profile from <filename>{0}</filename>:",
file_name) + " " + result}
profile_ids_added.append(profile.getId())
return {"status": "ok", "message": catalog.i18nc("@info:status", "Successfully imported profile {0}", profile_or_list[0].getName())}
# This message is throw when the profile reader doesn't find any profile in the file

8
cura/Settings/MachineManager.py
View file

@ -658,7 +658,6 @@ class MachineManager(QObject):
return result
## Returns whether there is anything unsupported in the current set-up.
#
# The current set-up signifies the global stack and all extruder stacks,
@ -1676,13 +1675,6 @@ class MachineManager(QObject):
return global_container_stack.qualityChanges.getName()
return global_container_stack.quality.getName()
@pyqtProperty(str, notify = activeQualityChanged)
def activeQualityName(self) -> str:
global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack()
if global_stack is None:
return empty_quality_container.getName()
return global_stack.quality.getName()
@pyqtProperty(bool, notify = activeQualityGroupChanged)
def hasNotSupportedQuality(self) -> bool:
global_container_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack()