2106 Commits

Author SHA1 Message Date
Lipu Fei
40d70b5f39 Fix version upgrade for project loading
CURA-3756
2017-05-16 14:38:27 +02:00
Jaime van Kessel
e40f60a52b Changed profile names
CURA-3777
2017-05-15 16:52:25 +02:00
Ghostkeeper
ccda155882
Add setting_version every time we create InstanceContainer
Except when we fill the instancecontainer via deserialising. Because then we want to retain the original version number.

Contributes to issue CURA-3427.
2017-05-15 10:39:53 +02:00
Ghostkeeper
c48017e174
Convert all metadata fields to string
The XML builder expects string, strictly. Only None is handled separately.

Contributes to issue CURA-3808.
2017-05-15 09:37:53 +02:00
Ghostkeeper
2365267f35
Be robust against older specification version numbers
1.2 and lower didn't specify a version number. Assume that it was 1.2. We feed this through our translation function for form, mostly, because we know that the setting_version should be 0 then.

Contributes to issue CURA-3427.
2017-05-12 17:20:49 +02:00
Ghostkeeper
365f7cad4c
Read setting_version from version attribute on root
As per the new specification for v1.3 of the spec.

Contributes to issue CURA-3427.
2017-05-12 17:20:49 +02:00
Lipu Fei
598751817a Fix resolve strategy "new" for user instance container
CURA-3756
2017-05-12 16:52:37 +02:00
Ghostkeeper
0cc4f90920
Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-12 16:34:19 +02:00
Lipu Fei
3996230ff9 Load GlobalStack before ExtruderStacks for project loading
CURA-3756
2017-05-12 15:52:16 +02:00
Ghostkeeper
adefbaf72e
Add more unhappy-path tests
One for the new setting_version. One for the misconception of version numbers being a major-minor version or something, because it's not stored that way.

Contributes to issue CURA-3427.
2017-05-12 15:01:27 +02:00
Ghostkeeper
04ef2bf1f0
Update setting_version tests
Included a bit of a more difficult case.

Contributes to issue CURA-3427.
2017-05-12 14:58:11 +02:00
Ghostkeeper
55b2392a1d
Load setting version from metadata
I'm not really awake today, am I? The functionality happened to still work because of how our real data is structured right now, but the tests still failed. Those are successful now.

Contributes to issue CURA-3427.
2017-05-12 14:55:19 +02:00
Ghostkeeper
9820dac4a6
Actually use setting_version to get the setting version number
This was sort of hidden because we've always incremented the normal version number up until now.

Contributes to issue CURA-3427.
2017-05-12 14:51:44 +02:00
Ghostkeeper
20e9d19587
Update tests to account for new way of getting version numbers
The normal version number is multiplied by a million. Currently these tests fail, so nice to have them.

Contributes to issue CURA-3427.
2017-05-12 14:50:43 +02:00
Lipu Fei
fe11819ce9 Handle "new" resolve strategy for definition&quality changes
CURA-3756
2017-05-12 14:34:41 +02:00
Lipu Fei
9ea0f48341 Check definition changes conflicts in preRead()
CURA-3756
2017-05-12 14:34:41 +02:00
Ghostkeeper
a472fd8163
Remove debug print
Oops again.

Contributes to issue CURA-3427.
2017-05-12 14:33:44 +02:00
Ghostkeeper
1e4c394b71
Remove getting superfluous material density
The density is already put in the 'properties' metadata entry. Don't need to put it in there doubly. Turns out that this density line was originally just superfluous.

Contributes to issue CURA-3427 or something.
2017-05-12 14:12:36 +02:00
Ghostkeeper
98662bc6f6
Also update import to renamed package
Oops.

Contributes to issue CURA-3427.
2017-05-12 14:07:21 +02:00
Ghostkeeper
c8295434f3
Load setting_version from XML material profile
The setting_version is translated from the version number. The setting_version number currently happens to be the same as the version number of XML but that won't always be the case so we introduce a translation-step as well.

Contributes to issue CURA-3427.
2017-05-12 14:04:56 +02:00
Ghostkeeper
38f081539a
Fix deserialising density
That density variable was never used. Hope this fixes some unaccounted-for bug.

Doesn't contribute to CURA-3427 but I'm listing it as if it does anyway.
2017-05-12 14:01:06 +02:00
Ghostkeeper
6e01c6ba60
Initialise config_name
Just a mistake that I saw because my IDE warned me about this. If a variant in Cura 2.3 has no general/name keyword, then it would break here. Now it doesn't break any more and gives a nonsensical name.

Contributes to issue CURA-3427.
2017-05-11 17:33:46 +02:00
Ghostkeeper
0a84a181c4
Track cfg version numbers with major-minor, sorta
We now have a (format) version and a setting version. Ideally we'd like major-minor version numbers in our profiles. However, introducing major-minor version numbers requires substantial changes to the version upgrade manager to compare version numbers, find a path towards the current version, or even keeping track of the current version. Therefore we just collapse the two version numbers into one: Multiply the major version number by a million and you'll never exceed it in the minor versioning. The only problem is that we now have to update the versioning for all of our three upgrade plug-ins, because they all need to know locally how to find the version number of their file types (because the upgrade manager has no knowledge of the file types) and they have no access to each other because a plug-in may be disabled.

Contributes to issue CURA-3427.
2017-05-11 17:31:37 +02:00
Ghostkeeper
639e86ca59
Set setting_version in 2.6's profiles
Contributes to issue CURA-3427.
2017-05-11 16:53:59 +02:00
Ghostkeeper
30321607d0
Remove Cubic Subdivision Radius from users' configuration
The setting no longer exists. This removes it from all instance containers and preference files.

Contributes to issue CURA-3427.
2017-05-11 15:30:24 +02:00
Lipu Fei
8a94f94258 WIP: use .userChanges property to replace user containers in project loading
CURA-3756
2017-05-11 14:54:00 +02:00
Lipu Fei
3baec9b742 WIP: set dirty after overriding a user container with deserialize()
CURA-3756
2017-05-11 14:53:04 +02:00
Ghostkeeper
22cfaddba5
Fix import
Oops.

The test passes again now.

Contributes to issue CURA-3427.
2017-05-11 14:35:54 +02:00
Ghostkeeper
833ad65507
Also rename test
Forgot that, sorry.

Contributes to issue CURA-3427.
2017-05-11 14:34:11 +02:00
Ghostkeeper
b57cb16f6d
Rename 24to25 to 25to26
The upgrade now upgrades profiles from the 2.5 format to 2.6, since we delayed the update for the 2.5 release.

Contributes to issue CURA-3427.
2017-05-11 14:32:45 +02:00
Ghostkeeper
99cb8bc169
Re-enable Version 2.4 to 2.5 upgrade
So that we can remove settings again, among which the Cubic Subdivision Radius setting.

Contributes to issue CURA-3427.
2017-05-11 14:29:25 +02:00
Lipu Fei
bb0e711577 WIP: fix material container renaming in project loading
CURA-3756
2017-05-11 14:20:11 +02:00
Lipu Fei
f436da8674 WIP: fix project loading and container renaming
CURA-3756
2017-05-11 14:20:11 +02:00
Jaime van Kessel
c5371842c2 Merge branch 'fix_per_model_settings_single_extrusion' of https://github.com/fieldOfView/Cura 2017-05-11 13:25:22 +02:00
Ghostkeeper
078fd16109
Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-11 10:29:42 +02:00
Ghostkeeper
32ea311762
Merge branch 'time_estimate_per_feature' of https://github.com/14bitVoid/Cura into 14bitVoid-time_estimate_per_feature 2017-05-11 09:53:50 +02:00
Lipu Fei
9060bbf3b2 Update extruderCount when extrudersModel got changed
CURA-3755

The Timer delay is not reliable for updating the extruder Tabs.
So we now rely on the modelChanged signal of the ExtrudersModel
to do the update.
2017-05-11 09:47:37 +02:00
Mark
04611b06af Fix two spelling errors
TRI-1450
2017-05-10 20:14:03 +02:00
fieldOfView
93c5b382ba Fix selecting settings for Per Model Settings with single extrusion printers 2017-05-10 17:37:35 +02:00
Ghostkeeper
e187b96455
Add period after sentence
Contributes to issue CURA-3742.
2017-05-10 17:15:47 +02:00
Jack Ha
79561f44b1 Fix project load, new non existing machine. CURA-3756 2017-05-10 16:16:57 +02:00
Jack Ha
d9f0e1fd4b WIP project loading - at least it mostly works again. CURA-3756 2017-05-10 15:37:22 +02:00
Lipu Fei
77864f4237 WIP: Fix definition_changes handling in 3mf reader
CURA-3756
2017-05-10 13:07:45 +02:00
Lipu Fei
577fc0f082 Fix WorkspaceDialog to include resolve for definition_changes
CURA-3756
2017-05-10 13:07:45 +02:00
Jack Ha
b688178a2e Fix one part of project load - update existing. CURA-3756 2017-05-10 10:56:19 +02:00
Jaime van Kessel
82d38490c4 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-10 09:50:02 +02:00
Jaime van Kessel
316f2bbdb5 Fixed switching g-code flavors with machineAction 2017-05-10 09:49:33 +02:00
Lipu Fei
c60fefc927 Add non-existing instance containers when opening a project file
CURA-3756
2017-05-09 14:58:18 +02:00
Lipu Fei
acde348c6d Use ConfigParser hack to replace connect_signals=False hack
CURA-3756
2017-05-09 13:07:42 +02:00
Jack Ha
0d76ce72b0 Add comments CURA-3756 2017-05-09 13:07:42 +02:00