Commit graph

9150 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
1b4564bdb1 Added missing typing import 2017-05-16 14:37:47 +02:00
Jaime van Kessel
678289c3f6 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-16 14:13:42 +02:00
Jaime van Kessel
e921808cd6 We now try to remove the right container when removing extruder 2017-05-16 14:13:20 +02:00
fieldOfView
910811810b Allow setting negative values on extruder offset x/y fields 2017-05-16 13:54:45 +02:00
Arjen Hiemstra
02f0418889 Prevent infinite recursion relating to limit_to_extruder
With limit_to_extruder, we always try to get the value of a setting from
an extruder. However, if the setting is not settable_per_extruder we
bypass the extruder and go directly to the global stack. This would
cause an infinite recursion.

Contributes to CURA-3738
2017-05-16 13:42:28 +02:00
Arjen Hiemstra
c4e6336828 Merge branch 'transparent_limit_to_extruder' of github.com:ultimaker/Cura into transparent_limit_to_extruder
* 'transparent_limit_to_extruder' of github.com:ultimaker/Cura:
  Removed unused imports
  Fixed type hinting for Extruder stack
  Fixed two remaining failing unit tests
  Fixes unit fallthrough unit test
2017-05-16 13:41:13 +02:00
Tim Kuipers
286c4665fc Resolve bed adhesion type to adhesion extruder (CURA-3738)"
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-16 13:28:33 +02:00
Tim Kuipers
b95712ef95 Revert "Resolve bed adhesion type via limit-to-extruder"
This reverts commit 396f4381dd.

The comit introduced an infinite recursion.

You cannot have both a limit_to_extruder and settable_per_extruder=false
2017-05-16 13:23:15 +02:00
Jaime van Kessel
704c6e5d8f Removed no longer used profiles
CURA-3816
2017-05-16 13:19:28 +02:00
Arjen Hiemstra
c5c67ee8be Merge branch 'master' of github.com:ultimaker/Cura into transparent_limit_to_extruder
* 'master' of github.com:ultimaker/Cura: (94 commits)
  Re-enable Japanese from language selection menu
  Add Japanese translations for setting descriptions
  Update PVA profiles
  Changed profile names
  Simplified some code
  Changed final spot where we still used findContainer when looking for container with specific type
  Directly use property instead of searching
  Added a type hinting to QualityManager
  JSON description fix: warn users when not to use spiralize (CURA-3636)
  Add setting_version every time we create InstanceContainer
  Increase warning value for gradual infill steps
  Convert all metadata fields to string
  cleanup: prime => prime blob and lil doc (CURA-3634)
  fix: don't make disallowed area if blob is disabled (CURA-3634)
  Be robust against older specification version numbers
  Read setting_version from version attribute on root
  Added bunch of typing to extruder manager
  Fix resolve strategy "new" for user instance container
  Added missing typehinting
  Row element was not used
  ...
2017-05-16 10:57:06 +02:00
jack
85a29e967f Merge pull request #1757 from fieldOfView/fix_material_uniqueness
Fix material uniqueness
2017-05-16 09:44:10 +02:00
Ghostkeeper
4b28e9bf43
Re-enable Japanese from language selection menu
Contributes to issue CURA-3817.
2017-05-16 09:38:39 +02:00
Ghostkeeper
dd1ce700f7
Add Japanese translations for setting descriptions
Not the labels yet (or anything else for that matter).

Contributes to issue CURA-3817.
2017-05-16 09:38:10 +02:00
Ghostkeeper
2fb73cccb2
Update PVA profiles
These updates bring different speeds for support-top vs. support-bottom, and changes the bottom pattern now that they are separately configurable. I also sorted the BB0.8 variant alphabetically (raft settings were out of place).
2017-05-15 17:11:39 +02:00
Jaime van Kessel
e40f60a52b Changed profile names
CURA-3777
2017-05-15 16:52:25 +02:00
Jaime van Kessel
910a55fd50 Simplified some code 2017-05-15 14:17:42 +02:00
Jaime van Kessel
d93c5e667b Changed final spot where we still used findContainer when looking for container with specific type 2017-05-15 14:02:07 +02:00
Jaime van Kessel
f7f958c540 Directly use property instead of searching 2017-05-15 13:58:02 +02:00
Jaime van Kessel
c4fc797c45 Added a type hinting to QualityManager 2017-05-15 13:53:13 +02:00
Tim Kuipers
635b97a961 JSON description fix: warn users when not to use spiralize (CURA-3636) 2017-05-15 12:01:39 +02:00
Jaime van Kessel
ba8842f489 Removed unused imports 2017-05-15 11:56:19 +02:00
Jaime van Kessel
2cc56c5edf Fixed type hinting for Extruder stack 2017-05-15 11:55:32 +02:00
Jaime van Kessel
06dc1d070e Fixed two remaining failing unit tests
CURA-3738
2017-05-15 11:46:22 +02:00
Jaime van Kessel
da63932a95 Fixes unit fallthrough unit test
CURA-3738
2017-05-15 11:36:02 +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
c61baf3355
Increase warning value for gradual infill steps
We set gradual infill steps to 5 if you choose Gradual Infill from recommended mode. This value was provided by the materials testers, so apparently it works fine and we shouldn't give a warning about that.

Contributes to issue CURA-3732.
2017-05-15 09:53:47 +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
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
MaukCC
68d5ec7f14 Merge pull request #4 from Ultimaker/master
update
2017-05-13 13:27:03 +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