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

Warn when importing quality profiles that don't match the current configuration

Browse Source 
When importing a profile that doesn't much the current nozzle combination (e.g. importing a 'high'
quality when we have AA0.8 and AA0.4 nozzles), the profile was being accepted and a success message
was shown to the user, but the quality did not show up in the profile list.

This commit fixes that by accepting the quality profile and informing the user that the profile is
not visible due to the current configuration.

CURA-7691
This commit is contained in:
Kostas Karmas 2020-09-10 16:58:30 +02:00
parent 0725bdcd64
commit 665496ceff
1 changed files with 41 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
cura/Settings/CuraContainerRegistry.py
View File

@ -5,7 +5,7 @@ import os
import re import re
import configparser import configparser
from typing import Any, cast, Dict, Optional, List, Union from typing import Any, cast, Dict, Optional, List, Union, Tuple
from PyQt5.QtWidgets import QMessageBox from PyQt5.QtWidgets import QMessageBox
from UM.Decorators import override from UM.Decorators import override
@ -305,6 +305,7 @@ class CuraContainerRegistry(ContainerRegistry):
# Import all profiles # Import all profiles
profile_ids_added = [] # type: List[str] profile_ids_added = [] # type: List[str]
additional_message = None
for profile_index, profile in enumerate(profile_or_list): for profile_index, profile in enumerate(profile_or_list):
if profile_index == 0: if profile_index == 0:
# This is assumed to be the global profile # This is assumed to be the global profile
@ -323,18 +324,23 @@ class CuraContainerRegistry(ContainerRegistry):
else: # More extruders in the imported file than in the machine. else: # More extruders in the imported file than in the machine.
continue # Delete the additional profiles. continue # Delete the additional profiles.
result = self._configureProfile(profile, profile_id, new_name, expected_machine_definition) configuration_successful, message = self._configureProfile(profile, profile_id, new_name, expected_machine_definition)
if result is not None: if configuration_successful and message:
# Remove any profiles that did got added. additional_message = message
else:
# Remove any profiles that were added.
for profile_id in profile_ids_added: for profile_id in profile_ids_added:
self.removeContainer(profile_id) self.removeContainer(profile_id)
return {"status": "error", "message": catalog.i18nc( return {"status": "error", "message": catalog.i18nc(
"@info:status Don't translate the XML tag <filename>!", "@info:status Don't translate the XML tag <filename>!",
"Failed to import profile from <filename>{0}</filename>:", "Failed to import profile from <filename>{0}</filename>:",
file_name) + " " + result} file_name) + " " + message}
profile_ids_added.append(profile.getId()) profile_ids_added.append(profile.getId())
return {"status": "ok", "message": catalog.i18nc("@info:status", "Successfully imported profile {0}", profile_or_list[0].getName())} success_message = catalog.i18nc("@info:status", "Successfully imported profile {0}.", profile_or_list[0].getName())
if additional_message:
success_message += "\n" + additional_message
return {"status": "ok", "message": success_message}
# This message is throw when the profile reader doesn't find any profile in the file # This message is throw when the profile reader doesn't find any profile in the file
return {"status": "error", "message": catalog.i18nc("@info:status", "File {0} does not contain any valid profile.", file_name)} return {"status": "error", "message": catalog.i18nc("@info:status", "File {0} does not contain any valid profile.", file_name)}
@ -395,14 +401,18 @@ class CuraContainerRegistry(ContainerRegistry):
return False return False
return True return True
def _configureProfile(self, profile: InstanceContainer, id_seed: str, new_name: str, machine_definition_id: str) -> Optional[str]: def _configureProfile(self, profile: InstanceContainer, id_seed: str, new_name: str, machine_definition_id: str) -> Tuple[bool, Optional[str]]:
"""Update an imported profile to match the current machine configuration. """Update an imported profile to match the current machine configuration.
:param profile: The profile to configure. :param profile: The profile to configure.
:param id_seed: The base ID for the profile. May be changed so it does not conflict with existing containers. :param id_seed: The base ID for the profile. May be changed so it does not conflict with existing containers.
:param new_name: The new name for the profile. :param new_name: The new name for the profile.
:return: None if configuring was successful or an error message if an error occurred. :returns: tuple (configuration_successful, message)
WHERE
bool configuration_successful: Whether the process of configuring the profile was successful
optional str message: A message indicating the outcome of configuring the profile. If the configuration
is successful, this message can be None or contain a warning
""" """
profile.setDirty(True) # Ensure the profiles are correctly saved profile.setDirty(True) # Ensure the profiles are correctly saved
@ -423,26 +433,38 @@ class CuraContainerRegistry(ContainerRegistry):
quality_type = profile.getMetaDataEntry("quality_type") quality_type = profile.getMetaDataEntry("quality_type")
if not quality_type: if not quality_type:
return catalog.i18nc("@info:status", "Profile is missing a quality type.") return False, catalog.i18nc("@info:status", "Profile is missing a quality type.")
global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack()
if global_stack is None: if not global_stack:
return None return False, catalog.i18nc("@info:status", "Global stack is missing.")
definition_id = ContainerTree.getInstance().machines[global_stack.definition.getId()].quality_definition definition_id = ContainerTree.getInstance().machines[global_stack.definition.getId()].quality_definition
profile.setDefinition(definition_id) profile.setDefinition(definition_id)
# "not_supported" profiles can be imported.
if quality_type == empty_quality_container.getMetaDataEntry("quality_type"):
return True, None
# Check to make sure the imported profile actually makes sense in context of the current configuration. # Check to make sure the imported profile actually makes sense in context of the current configuration.
# This prevents issues where importing a "draft" profile for a machine without "draft" qualities would report as # This prevents issues where importing a "draft" profile for a machine without "draft" qualities would report as
# successfully imported but then fail to show up. # successfully imported but then fail to show up.
quality_group_dict = ContainerTree.getInstance().getCurrentQualityGroups() available_quality_groups_dict = {name: quality_group for name, quality_group in ContainerTree.getInstance().getCurrentQualityGroups().items() if quality_group.is_available}
# "not_supported" profiles can be imported. all_quality_groups_dict = ContainerTree.getInstance().getCurrentQualityGroups()
if quality_type != empty_quality_container.getMetaDataEntry("quality_type") and quality_type not in quality_group_dict:
return catalog.i18nc("@info:status", "Could not find a quality type {0} for the current configuration.", quality_type) # If the quality type doesn't exist at all in the quality_groups of this machine, reject the profile
if quality_type not in all_quality_groups_dict:
return False, catalog.i18nc("@info:status", "Its quality type '{0}' is not compatible with the current active machine definition '{1}'.", quality_type, definition_id)
# If the quality_type exists in the quality_groups of this printer but it is not available with the current
# machine configuration (e.g. not available for the selected nozzles), accept it with a warning
if quality_type not in available_quality_groups_dict:
return True, catalog.i18nc("@info:status", "Warning: The profile is not visible because its quality type '{0}' is not available for the current configuration.", quality_type)
if not self.addContainer(profile): if not self.addContainer(profile):
return catalog.i18nc("@info:status", "Unable to add the profile.") return False, catalog.i18nc("@info:status", "Unable to add the profile.")
return None return True, None
@override(ContainerRegistry) @override(ContainerRegistry)
def saveDirtyContainers(self) -> None: def saveDirtyContainers(self) -> None: