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

Use XMLMaterialProfile version tag to determine its version

Browse source 
CURA-2724
This commit is contained in:
Lipu Fei 2017-07-06 14:47:56 +02:00
parent b95426bee3
commit 071005541c
3 changed files with 4 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

9
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View file

@ -12,9 +12,8 @@ from UM.Util import parseBool
from cura.CuraApplication import CuraApplication
import UM.Dictionary
from UM.Settings.InstanceContainer import InstanceContainer, InvalidInstanceError
from UM.Settings.InstanceContainer import InstanceContainer
from UM.Settings.ContainerRegistry import ContainerRegistry
from cura.Settings.CuraContainerRegistry import CuraContainerRegistry
## Handles serializing and deserializing material containers from an XML file
@ -37,11 +36,7 @@ class XmlMaterialProfile(InstanceContainer):
# \return The corresponding setting_version.
def xmlVersionToSettingVersion(self, xml_version: str) -> int:
if xml_version == "1.3":
return 2 # FIXME & HACK: This is temporary hack. The setting_version has been increased in CuraApplication,
# but we haven't decided on how to determine the versions of an XMLMaterialProfile yet.
# This MUST be fixed after the decision has been made.
if xml_version == "1.3":
return 1
return 2
return 0 #Older than 1.3.
def getInheritedFiles(self):

6
plugins/XmlMaterialProfile/XmlMaterialUpgrader.py
View file

@ -21,11 +21,7 @@ class XmlMaterialUpgrader(VersionUpgrade):
def _xmlVersionToSettingVersion(self, xml_version: str) -> int:
if xml_version == "1.3":
return 2 # FIXME & HACK: This is temporary hack. The setting_version has been increased in CuraApplication,
# but we haven't decided on how to determine the versions of an XMLMaterialProfile yet.
# This MUST be fixed after the decision has been made.
if xml_version == "1.3":
return 1
return 2
return 0 #Older than 1.3.
def upgradeMaterial(self, serialised, filename):

4
plugins/XmlMaterialProfile/__init__.py
View file

@ -19,9 +19,7 @@ def getMetaData():
"mimetype": "application/x-ultimaker-material-profile"
},
"version_upgrade": {
("materials", 1000000): ("materials", 1000001, upgrader.upgradeMaterial),
# FIXME: This needs to be changed once we have decided on how to determine the versions
("materials", 1000001): ("materials", 1000002, upgrader.upgradeMaterial),
("materials", 1000000): ("materials", 1000002, upgrader.upgradeMaterial),
},
"sources": {
"materials": {