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
Tim Kuipers
f4f6be103e
cleanup: prime => prime blob and lil doc (CURA-3634)
2017-05-13 17:37:49 +02:00
Tim Kuipers
7e715277f9
fix: don't make disallowed area if blob is disabled (CURA-3634)
2017-05-13 17:32:31 +02:00
Scheepers
f8691d6190
New Cartesio build platform
2017-05-13 13:10:24 +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
Jaime van Kessel
05f2cd1680
Merge branch 'master' of github.com:Ultimaker/Cura
2017-05-12 16:57:12 +02:00
Jaime van Kessel
81d3ce46f1
Added bunch of typing to extruder manager
2017-05-12 16:56:12 +02:00
Lipu Fei
598751817a
Fix resolve strategy "new" for user instance container
...
CURA-3756
2017-05-12 16:52:37 +02:00
Jaime van Kessel
a7b2386421
Merge branch 'master' of github.com:Ultimaker/Cura
2017-05-12 16:46:12 +02:00
Jaime van Kessel
ba4d62e8ca
Added missing typehinting
2017-05-12 16:45:58 +02:00
Mark
b100050ee2
Merge branch 'master' of github.com:Ultimaker/Cura
2017-05-12 16:44:17 +02:00
Mark
aee3b43227
Row element was not used
2017-05-12 16:43:50 +02:00
Jaime van Kessel
68c7cd1ae5
Merge branch 'master' of github.com:Ultimaker/Cura
2017-05-12 16:40:19 +02:00
Jaime van Kessel
bfc65cb4a9
Added typing to active stack
2017-05-12 16:40:02 +02:00
Jaime van Kessel
fb6d86dc88
Also override getTop(), as curaContainerStack enforces it being a instanceContainer
...
This helps with the type hinting.
2017-05-12 16:39:24 +02:00
Ghostkeeper
0cc4f90920
Merge branch 'master' of github.com:Ultimaker/Cura
2017-05-12 16:34:19 +02:00
Ghostkeeper
1bac7c2b2a
Don't register registry at ContainerStack class any more
...
The fixture does this for us automatically now. It's not entirely neat since this is not cleaned up afterwards, but it does make sense to put it there in the fixture, logically.
Contributes to issue CURA-3427.
2017-05-12 16:32:55 +02:00
Jaime van Kessel
7ee5a66c64
CuraContainerStack now overrides getBottom, so it always returns a definition
2017-05-12 16:32:00 +02:00
Ghostkeeper
def93f8dc9
Define fixture for DefinitionContainer instances
...
Removes a few lines from the tests, making them simpler. Not much though.
Contributes to issue CURA-3427.
2017-05-12 16:31:18 +02:00
Ghostkeeper
a2b0b1076a
Add test for when setting_version doesn't match its definition
...
Contributes to issue CURA-3427.
2017-05-12 16:28:31 +02:00
Jaime van Kessel
4474b16847
Merge branch 'master' of github.com:Ultimaker/Cura
2017-05-12 16:28:06 +02:00
Jaime van Kessel
77204fc4b0
Type hinting & unused code removal
2017-05-12 16:27:37 +02:00
Ghostkeeper
2888189f57
Add test for when an instance container has no setting_version
...
The setting_version is interpreted as 0 then.
Contributes to issue CURA-3427.
2017-05-12 16:25:14 +02:00
Ghostkeeper
52ffac677f
Add test for happy path of filtering by setting_version
...
If the setting_version is correct, the container should get registered.
Contributes to issue CURA-3427.
2017-05-12 16:21:33 +02:00
Mark
4cb19781d7
Merge branch 'master' of github.com:Ultimaker/Cura
2017-05-12 16:19:02 +02:00
Mark
08c0779dde
Remove unused file, context menu takes care of the multiply object dialog
2017-05-12 16:18:46 +02:00
Jaime van Kessel
2b64e92a99
Removed unused imports
2017-05-12 16:13:09 +02:00
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
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
Tim Kuipers
0d9514a5d0
Merge pull request #1821 from smartavionics/mb-smooth-spiralized-contours-not-per-model-or-extruder
...
Just like magic_spiralize, smooth_spiralized_contours should not be settable per model/extruder. (CURA-3771)
2017-05-12 14:53:18 +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
Jaime van Kessel
c1903dcccb
Merge branch 'master' of github.com:Ultimaker/Cura
2017-05-12 14:35:07 +02:00
Jaime van Kessel
167f616a7c
Decreased interval of extruder timer
2017-05-12 14:34:45 +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
Jaime van Kessel
ef2aa3b2b2
Empty InstanceContainers are now correctly handled by setActiveMaterial again
...
CURA-3789
2017-05-12 13:59:31 +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
