Commit graph

8856 commits

Author SHA1 Message Date
Jaime van Kessel
d49dd735bc Merge branch 'transparent_limit_to_extruder' of github.com:Ultimaker/Cura 2017-05-17 11:31:18 +02:00
Arjen Hiemstra
20e46f4d8b Make Extruder setting type update its color properly
The binding for the material color would not get updated properly when
the model changes. This fixes that.

Contributes to CURA-3804
2017-05-17 11:30:48 +02:00
Lipu Fei
a9ec3f2712 Add docs to project loading code
CURA-3756
2017-05-17 11:25:48 +02:00
Lipu Fei
8c2fe0951d Refactor project loading
CURA-3756
2017-05-17 11:03:52 +02:00
Jaime van Kessel
61faaf4776 Removed unneeded calls to extruder value
CURA-3738
2017-05-17 11:02:16 +02:00
Arjen Hiemstra
a7bf205dbc Turn GlobalStack's extruders property into a dict
We do not load the extruders in a fixed order, thus we cannot assume
that addExtruder is called in the right order. This means that index 0
of the extruders is not necessarily the extruder with position 0. So
instead, use the extruder position as a dict key.

Contributes to CURA-3738
2017-05-17 10:58:28 +02:00
Arjen Hiemstra
9686df285d Merge branch 'master' of github.com:Ultimaker/Cura into transparent_limit_to_extruder 2017-05-17 10:26:48 +02:00
Lipu Fei
ee831928ba Fix overriding extruder stacks for project loading
CURA-3756
2017-05-17 10:20:14 +02:00
Jaime van Kessel
a1457fa890 Merge branch 'feature_CURA-3822_save_version_to_project' of https://github.com/LipuFei/Cura 2017-05-17 09:26:57 +02:00
Lipu Fei
191dfdcb33 Save Cura version to project files
CURA-3822
2017-05-17 09:23:43 +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
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