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

Merge branch 'duplicate-material' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2016-08-31 14:57:11 +02:00
commit 389cea2fcc
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View file

@ -58,9 +58,9 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
def setReadOnly(self, read_only): def setReadOnly(self, read_only):
super().setReadOnly(read_only) super().setReadOnly(read_only)
basefile = self.getMetaDataEntry("base_file", self._id) #if basefile is none, this is a basefile. basefile = self.getMetaDataEntry("base_file", self._id) # if basefile is self.id, this is a basefile.
for container in UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(base_file = basefile): for container in UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(base_file = basefile):
container._read_only = read_only container._read_only = read_only # prevent loop instead of calling setReadOnly
## Overridden from InstanceContainer ## Overridden from InstanceContainer
def setMetaDataEntry(self, key, value): def setMetaDataEntry(self, key, value):
@ -69,7 +69,7 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
super().setMetaDataEntry(key, value) super().setMetaDataEntry(key, value)
basefile = self.getMetaDataEntry("base_file", self._id) #if basefile is none, this is a basefile. basefile = self.getMetaDataEntry("base_file", self._id) #if basefile is self.id, this is a basefile.
# Update all containers that share GUID and basefile # Update all containers that share GUID and basefile
for container in UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(base_file = basefile): for container in UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(base_file = basefile):
container.setMetaData(copy.deepcopy(self._metadata)) container.setMetaData(copy.deepcopy(self._metadata))
@ -95,15 +95,15 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer):
container.setName(new_name) container.setName(new_name)
## Overridden from InstanceContainer ## Overridden from InstanceContainer
def setProperty(self, key, property_name, property_value, container = None): # def setProperty(self, key, property_name, property_value, container = None):
if self.isReadOnly(): # if self.isReadOnly():
return # return
#
super().setProperty(key, property_name, property_value) # super().setProperty(key, property_name, property_value)
#
basefile = self.getMetaDataEntry("base_file", self._id) #if basefile is none, this is a basefile. # basefile = self.getMetaDataEntry("base_file", self._id) #if basefile is self.id, this is a basefile.
for container in UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(base_file = basefile): # for container in UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(base_file = basefile):
container._dirty = True # container._dirty = True
## Overridden from InstanceContainer ## Overridden from InstanceContainer
def serialize(self): def serialize(self):