Browse Source

Increment instance container version number instead of just quality_changes

Otherwise when we load that quality_changes file we'll deny it because the instance container version number is wrong.

Contributes to issue CURA-5054.
Ghostkeeper 7 years ago
parent
commit
d8a066c1e7

+ 1 - 2
cura/CuraApplication.py

@@ -56,7 +56,6 @@ from UM.Settings.ContainerRegistry import ContainerRegistry
 from UM.Settings.SettingFunction import SettingFunction
 from cura.Settings.MachineNameValidator import MachineNameValidator
 
-from cura.Machines.QualityChangesGroup import QualityChangesGroup
 from cura.Machines.Models.BuildPlateModel import BuildPlateModel
 from cura.Machines.Models.NozzleModel import NozzleModel
 from cura.Machines.Models.QualityProfilesDropDownMenuModel import QualityProfilesDropDownMenuModel
@@ -209,7 +208,7 @@ class CuraApplication(QtApplication):
 
         UM.VersionUpgradeManager.VersionUpgradeManager.getInstance().setCurrentVersions(
             {
-                ("quality_changes", QualityChangesGroup.Version * 1000000 + self.SettingVersion):  (self.ResourceTypes.QualityInstanceContainer, "application/x-uranium-instancecontainer"),
+                ("quality_changes", InstanceContainer.Version * 1000000 + self.SettingVersion):    (self.ResourceTypes.QualityInstanceContainer, "application/x-uranium-instancecontainer"),
                 ("machine_stack", ContainerStack.Version * 1000000 + self.SettingVersion):         (self.ResourceTypes.MachineStack, "application/x-cura-globalstack"),
                 ("extruder_train", ContainerStack.Version * 1000000 + self.SettingVersion):        (self.ResourceTypes.ExtruderStack, "application/x-cura-extruderstack"),
                 ("preferences", Preferences.Version * 1000000 + self.SettingVersion):              (Resources.Preferences, "application/x-uranium-preferences"),

+ 0 - 3
cura/Machines/QualityChangesGroup.py

@@ -7,9 +7,6 @@ from .QualityGroup import QualityGroup
 
 
 class QualityChangesGroup(QualityGroup):
-    ##  The file format version of quality changes.
-    Version = 3
-
     def __init__(self, name: str, quality_type: str, parent = None):
         super().__init__(name, quality_type, parent)
         self._container_registry = Application.getInstance().getContainerRegistry()

+ 1 - 1
resources/quality/abax_pri3/apri3_pla_fast.inst.cfg

@@ -1,5 +1,5 @@
 [general]
-version = 2
+version = 3
 name = Fine
 definition = abax_pri3
 

+ 1 - 1
resources/quality/abax_pri3/apri3_pla_high.inst.cfg

@@ -1,5 +1,5 @@
 [general]
-version = 2
+version = 3
 name = Extra Fine
 definition = abax_pri3
 

+ 1 - 1
resources/quality/abax_pri3/apri3_pla_normal.inst.cfg

@@ -1,5 +1,5 @@
 [general]
-version = 2
+version = 3
 name = Fine
 definition = abax_pri3
 

+ 1 - 1
resources/quality/abax_pri5/apri5_pla_fast.inst.cfg

@@ -1,5 +1,5 @@
 [general]
-version = 2
+version = 3
 name = Fine
 definition = abax_pri5
 

+ 1 - 1
resources/quality/abax_pri5/apri5_pla_high.inst.cfg

@@ -1,5 +1,5 @@
 [general]
-version = 2
+version = 3
 name = Extra Fine
 definition = abax_pri5
 

+ 1 - 1
resources/quality/abax_pri5/apri5_pla_normal.inst.cfg

@@ -1,5 +1,5 @@
 [general]
-version = 2
+version = 3
 name = Fine
 definition = abax_pri5
 

+ 1 - 1
resources/quality/abax_titan/atitan_pla_fast.inst.cfg

@@ -1,5 +1,5 @@
 [general]
-version = 2
+version = 3
 name = Fine
 definition = abax_titan
 

+ 1 - 1
resources/quality/abax_titan/atitan_pla_high.inst.cfg

@@ -1,5 +1,5 @@
 [general]
-version = 2
+version = 3
 name = Extra Fine
 definition = abax_titan
 

Some files were not shown because too many files changed in this diff