From f5a77071391f37d65f07d22e7bbd967cb706094e Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 25 May 2018 11:24:31 +0200 Subject: [PATCH] Show ConfigurationErrorMessage when loading faulty XML files This is consistent with the rest of Cura's behaviour. --- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 70d07c1fc5..f0d6915f04 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Ultimaker B.V. +# Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import copy @@ -12,10 +12,10 @@ import xml.etree.ElementTree as ET from UM.Resources import Resources from UM.Logger import Logger from cura.CuraApplication import CuraApplication - import UM.Dictionary from UM.Settings.InstanceContainer import InstanceContainer from UM.Settings.ContainerRegistry import ContainerRegistry +from UM.ConfigurationErrorMessage import ConfigurationErrorMessage from .XmlMaterialValidator import XmlMaterialValidator @@ -540,7 +540,9 @@ class XmlMaterialProfile(InstanceContainer): validation_message = XmlMaterialValidator.validateMaterialMetaData(meta_data) if validation_message is not None: - raise Exception("Not valid material profile: %s" % (validation_message)) + ConfigurationErrorMessage.getInstance().addFaultyContainers(self.getId()) + Logger.log("e", "Not a valid material profile: {message}".format(message = validation_message)) + return property_values = {} properties = data.iterfind("./um:properties/*", self.__namespaces)