8689 Commits

Author SHA1 Message Date
Ghostkeeper
ab7b9913c7
Add test for registering global stacks
This test tests adding container stacks and seeing if they convert well.

Contributes to issue CURA-3427.
2017-05-12 16:11:51 +02:00
Ghostkeeper
e50b0884f0
Add test for registring containers
This test tests adding container stacks and seeing if they convert well.

Contributes to issue CURA-3427.
2017-05-12 15:59:38 +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
Ghostkeeper
5bc613c3e0
Don't use string for default version
No need to go via string and cast that to int, just return int directly.

Contributes to issue CURA-3427.
2017-05-12 14:44:46 +02:00
Ghostkeeper
ebd730a68d
Also add setting_version to fdmextruder
Since it obviously doesn't inherit from fdmprinter.

Contributes to issue CURA-3427.
2017-05-12 14:43:05 +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
f0f8871496
Add setting_version to all profiles
This represents the data version number (as opposed to the format version).

Contributes to issue CURA-3427.
2017-05-12 13:40:54 +02:00
Ghostkeeper
0f5814e52f
Add setting_version and check against it
This breaks all profiles since they have the wrong setting version, of course. Have to change that in every instance container now...

Contributes to issue CURA-3427.
2017-05-12 12:58:15 +02:00
Ghostkeeper
6fd3bc4ba4
Merge branch 'smartavionics-mb-smooth-spiralized-contours-not-per-model-or-extruder' 2017-05-12 11:57:19 +02:00
Ghostkeeper
dab50f04b8
Merge branch 'mb-smooth-spiralized-contours-not-per-model-or-extruder' of https://github.com/smartavionics/Cura into smartavionics-mb-smooth-spiralized-contours-not-per-model-or-extruder 2017-05-12 11:56:52 +02:00
Mark Burton
bf80e6efd5 Just like magic_spiralize, smooth_spiralized_contours should not be settable per model/extruder. 2017-05-12 09:10:21 +01:00
Ghostkeeper
31684da9a6
Add Gradual Infill Steps to default advanced settings
It's visible by default now.

Contributes to issue CURA-3732.
2017-05-12 10:01:29 +02:00
Ghostkeeper
396f4381dd
Resolve bed adhesion type via limit-to-extruder
The cause for this change is that TPU says we want to print with brim but CPE wants to print with raft. In those cases the resolve function would choose the raft because that's safer. However if the default extruder happens to be the TPU one you then get a raft made of TPU which is flexible. That defeats the purpose of the raft, and causes the raft to warp, clog on the nozzle, destroy the world, etc. So there, I saved the world once more.
2017-05-12 10:00:24 +02:00
Ghostkeeper
9de041ade5
Remove theme font from system-themed dialogue
See commit 36dedabd11a36bd40669fbcf3b0e1f820c47acf1.
2017-05-12 09:45:53 +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
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
Ghostkeeper
e7fc36587d
Remove Cubic Subdivision Radius setting
Just removes the definition. No version upgrade yet. That is next up.

Contributes to issue CURA-3427.
2017-05-11 14:27:56 +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
8ff3079b3e
Let CPE always use prime tower
Also 0.8mm.
2017-05-11 12:00:54 +02:00
Ghostkeeper
e3236bec4d
Make wording more consistent
Contributes to issue CURA-3732.
2017-05-11 11:22:18 +02:00
Jaime van Kessel
8e7637ae62 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-11 11:08:47 +02:00
Jaime van Kessel
e2b39e7e33 Fixed spacing of infill options
CURA-3732
2017-05-11 11:08:23 +02:00
Ghostkeeper
078fd16109
Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-11 10:29:42 +02:00
Ghostkeeper
00aff6d2f2
Make feature labels more accurate for support
It's used a bit differently.

Contributes to issue CURA-3773.
2017-05-11 10:29:18 +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
Tim Kuipers
4abcc8b3f1 JSON fix: magic_spiralize had child setting (CURA-3771)
it shouldn't have a child setting because that child is not the underlying setting used by the engine.
Parent settings are frontend-only settings which are merely used to let the user edit multiple leaf settings at once.
2017-05-10 16:31:53 +02:00
Jaime van Kessel
2b1ca54227 Reset all first start actions for UM2go
CURA-3742
2017-05-10 16:28:34 +02:00
Jaime van Kessel
9e58829aba Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-10 16:25:45 +02:00
Jaime van Kessel
fd340a1270 Empty containers now also trigger extruder model update 2017-05-10 16:25:23 +02:00
Jack Ha
79561f44b1 Fix project load, new non existing machine. CURA-3756 2017-05-10 16:16:57 +02:00
Jaime van Kessel
27d6bebf32 Adding a new printer now activates it again
CURA-3783
2017-05-10 16:12:01 +02:00
Jack Ha
502b6b6f08 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-10 15:37:31 +02:00