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.
This commit is contained in:
Ghostkeeper 2018-03-09 16:14:24 +01:00
parent 3a832d66a9
commit d8a066c1e7
No known key found for this signature in database
GPG Key ID: 5252B696FB5E7C7A
395 changed files with 394 additions and 398 deletions

View File

@ -56,7 +56,6 @@ from UM.Settings.ContainerRegistry import ContainerRegistry
from UM.Settings.SettingFunction import SettingFunction from UM.Settings.SettingFunction import SettingFunction
from cura.Settings.MachineNameValidator import MachineNameValidator from cura.Settings.MachineNameValidator import MachineNameValidator
from cura.Machines.QualityChangesGroup import QualityChangesGroup
from cura.Machines.Models.BuildPlateModel import BuildPlateModel from cura.Machines.Models.BuildPlateModel import BuildPlateModel
from cura.Machines.Models.NozzleModel import NozzleModel from cura.Machines.Models.NozzleModel import NozzleModel
from cura.Machines.Models.QualityProfilesDropDownMenuModel import QualityProfilesDropDownMenuModel from cura.Machines.Models.QualityProfilesDropDownMenuModel import QualityProfilesDropDownMenuModel
@ -209,7 +208,7 @@ class CuraApplication(QtApplication):
UM.VersionUpgradeManager.VersionUpgradeManager.getInstance().setCurrentVersions( 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"), ("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"), ("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"), ("preferences", Preferences.Version * 1000000 + self.SettingVersion): (Resources.Preferences, "application/x-uranium-preferences"),

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Draft name = Draft
definition = anycubic_i3_mega definition = anycubic_i3_mega

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = High name = High
definition = anycubic_i3_mega definition = anycubic_i3_mega

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Normal name = Normal
definition = anycubic_i3_mega definition = anycubic_i3_mega

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Coarse name = Coarse
definition = builder_premium_small definition = builder_premium_small

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = High Quality name = High Quality
definition = builder_premium_small definition = builder_premium_small

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Normal name = Normal
definition = builder_premium_small definition = builder_premium_small

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Coarse name = Coarse
definition = builder_premium_small definition = builder_premium_small

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = High Quality name = High Quality
definition = builder_premium_small definition = builder_premium_small

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Normal name = Normal
definition = builder_premium_small definition = builder_premium_small

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Coarse name = Coarse
definition = builder_premium_small definition = builder_premium_small

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = High Quality name = High Quality
definition = builder_premium_small definition = builder_premium_small

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Normal name = Normal
definition = builder_premium_small definition = builder_premium_small

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Coarse name = Coarse
definition = builder_premium_small definition = builder_premium_small

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = High Quality name = High Quality
definition = builder_premium_small definition = builder_premium_small

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Normal name = Normal
definition = builder_premium_small definition = builder_premium_small

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Coarse name = Coarse
definition = builder_premium_small definition = builder_premium_small

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = High Quality name = High Quality
definition = builder_premium_small definition = builder_premium_small

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Normal name = Normal
definition = builder_premium_small definition = builder_premium_small

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Coarse name = Coarse
definition = builder_premium_small definition = builder_premium_small

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = High Quality name = High Quality
definition = builder_premium_small definition = builder_premium_small

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Normal name = Normal
definition = builder_premium_small definition = builder_premium_small

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = High name = High
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Normal name = Normal
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = High name = High
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Normal name = Normal
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Coarse name = Coarse
definition = cartesio definition = cartesio

View File

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

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = High name = High
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Normal name = Normal
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = High name = High
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Normal name = Normal
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Coarse name = Coarse
definition = cartesio definition = cartesio

View File

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

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = High name = High
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Normal name = Normal
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = High name = High
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Normal name = Normal
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = High name = High
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Normal name = Normal
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Coarse name = Coarse
definition = cartesio definition = cartesio

View File

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

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = High name = High
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Normal name = Normal
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = High name = High
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Normal name = Normal
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = High name = High
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Normal name = Normal
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Coarse name = Coarse
definition = cartesio definition = cartesio

View File

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

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = High name = High
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Normal name = Normal
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = High name = High
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Normal name = Normal
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = High name = High
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Normal name = Normal
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Coarse name = Coarse
definition = cartesio definition = cartesio

View File

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

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = High name = High
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Normal name = Normal
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = High name = High
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Normal name = Normal
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = High name = High
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Normal name = Normal
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Coarse name = Coarse
definition = cartesio definition = cartesio

View File

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

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = High name = High
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Normal name = Normal
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = High name = High
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Normal name = Normal
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = High name = High
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Normal name = Normal
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Coarse name = Coarse
definition = cartesio definition = cartesio

View File

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

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = High name = High
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Normal name = Normal
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = High name = High
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Normal name = Normal
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = High name = High
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Normal name = Normal
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Coarse name = Coarse
definition = cartesio definition = cartesio

View File

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

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = High name = High
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Normal name = Normal
definition = cartesio definition = cartesio

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Coarse Quality name = Coarse Quality
definition = fdmprinter definition = fdmprinter

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
definition = deltacomb definition = deltacomb
name = Fast Quality (beta) name = Fast Quality (beta)

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
definition = deltacomb definition = deltacomb
name = High Quality (beta) name = High Quality (beta)

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
definition = deltacomb definition = deltacomb
name = Normal Quality (beta) name = Normal Quality (beta)

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = Fast Quality (beta) name = Fast Quality (beta)
definition = deltacomb definition = deltacomb

View File

@ -1,5 +1,5 @@
[general] [general]
version = 2 version = 3
name = High Quality (beta) name = High Quality (beta)
definition = deltacomb definition = deltacomb

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