Commit graph

8785 commits

Author SHA1 Message Date
Ghostkeeper
f65043ecc8
Add spaces around binary operators and after comma
Just a little code style thing.

Contributes to issue CURA-3828.
2017-05-17 16:17:48 +02:00
fieldOfView
7b393064aa Fix creating materials for 1.75mm machines that have machine/variant materials
Instead of cloning the 2.85 mm generic PLA material and setting its diameter, we now clone the generic PLA with the same diameter as the current machine. This will also clone all the machine-specific settings included in that base file.
2017-05-17 12:20:00 +02:00
fieldOfView
75519d754b Fix creating materials for 1.75mm machines 2017-05-17 11:49:13 +02:00
Tim Kuipers
32c2418957 cleanup: remove raft height stuff from ConvexHullDecorator (CURA-3819) 2017-05-16 17:45:19 +02:00
Tim Kuipers
69e4afffc8 fix: heightening of shadow for raft didn't take layer_0_z_overlap into account (CURA-3819) 2017-05-16 17:45:19 +02:00
Arjen Hiemstra
616ee34be5 Simplify SettingExtruder setting item
This way it properly updates when a parent setting changes.

Contributes to CURA-3804
2017-05-16 17:43:24 +02:00
Jaime van Kessel
7d5c2a9b6a Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-16 17:19:58 +02:00
Jaime van Kessel
f8b29c4d1f Delete the right not supported profiles 2017-05-16 17:19:41 +02:00
Jaime van Kessel
77843107f6 Revert "Removed no longer used profiles"
This reverts commit 704c6e5d8f.
2017-05-16 17:18:57 +02:00
Lipu Fei
121ebd79cf Fix circular import problem caused by moving SettingVersion into CuraApplication
CURA-3756
2017-05-16 14:55:34 +02:00
Ghostkeeper
50bda1c9dd
Remove overrides of support interface speed/accel/jerk
This is a settings updates from the Materials team.
2017-05-16 14:40:42 +02:00
Ghostkeeper
93c249280e
Copy UM3 variants to UM3E
They should be kept in sync for now.
2017-05-16 14:40:42 +02:00
Ghostkeeper
8e3dff76ab
Set support X/Y distance for all PVA profiles
This is an update from the materials team for our settings.
2017-05-16 14:40:42 +02:00
Ghostkeeper
9b3568acae
Sort other PVA profiles as well
Makes it easier to compare profiles and to find setting values by key.
2017-05-16 14:40:42 +02:00
Ghostkeeper
a02ff8df5f
Sort settings alphabetically
Makes it easier to compare profiles.
2017-05-16 14:40:42 +02:00
Ghostkeeper
1ad9ba6c95
Remove lower warnings from Jerk settings
It's sometimes required to be extra careful, and the difference between 0 and 5 isn't that big that it would cause a great increase in print time.
2017-05-16 14:40:42 +02:00
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
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
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
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
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