Commit graph

3125 commits

Author SHA1 Message Date
Tim Kuipers
1f903b9fcc JSON renames: support_roof_... ==> support_interface... (CURA-1013) 2016-07-28 14:06:00 +02:00
Tim Kuipers
2ab9531f83 Merge branch 'master' into feature_support_bottoms 2016-07-28 13:53:43 +02:00
fieldOfView
5d2033722a Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-28 13:45:27 +02:00
fieldOfView
1bbf987921 Fix SettingComboBox and SettingExtruder in some contexts
Use propertyProvider instead of provider; fixes comboboxes in PostProcessing plugin.
2016-07-28 13:45:11 +02:00
Ghostkeeper
40932a3ad2
Set default of draft shield height to 10mm
This is a fairly arbitrary default until we have tests from materials. The draft shield height is now only used by the engine if the draft shield is enabled and limited.

Contributes to issue CURA-1295.
2016-07-28 13:33:27 +02:00
Jaime van Kessel
a1bd8f59ed Slicing no longer occurs when stack is invalid
CURA-1998
2016-07-28 13:14:07 +02:00
Jaime van Kessel
614d4bb21a Merge branch 'feature_additional_components' of github.com:Ultimaker/Cura 2016-07-28 12:42:39 +02:00
Jack Ha
dc6d415cf5 Disabled duplicate material, because it has a lot of issues.
CURA-1969.
2016-07-28 09:13:35 +02:00
Arjen Hiemstra
823ab61cc5 Tweak convex hull node and transparent object shader
Now we render at least a vague hint at lighting instead of nothing at
all.
2016-07-27 18:03:20 +02:00
Ghostkeeper
6af0f28f32
Only show draft shield height if draft shield enabled
We must've missed that one previously.

Contributes to issue CURA-1295.
2016-07-27 17:50:34 +02:00
Tim Kuipers
d1f4fadbfc Merge branch 'master' into feature_support_bottoms 2016-07-27 17:40:36 +02:00
Tim Kuipers
cd26794155 JSON fix: retrieve globalish support settings from support extruder (CURA-2003) 2016-07-27 17:27:57 +02:00
Jaime van Kessel
b29ff7feeb Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-27 14:14:35 +02:00
Jaime van Kessel
afed6eed93 Print montior also handles wait_for_cleanup correctly now 2016-07-27 14:14:13 +02:00
Jack Ha
4175e51dbb Corrected gantry height for ultimaker2.json (extended and go inherit).
CURA-1979

Made same change in resources/definitions/ultimaker2.def.json as in
the original resources/machines/ultimaker2.json
2016-07-27 14:10:01 +02:00
Tim Kuipers
358a48dfbb JSON fix: support_bottom_height now warns if below support_bottom_stair_step_dist (CURA-1013) 2016-07-27 12:14:25 +02:00
Ghostkeeper
5da3cd34e9
Improve inheritance function for speed_travel_layer_0
This makes the speed_travel_layer_0 by default have the same ratio to the parent print speed as the travel speed has on other layers.
2016-07-27 10:56:13 +02:00
Tim Kuipers
17b455d2ed JSON rename: Support Roof ==> Support Interface (CURA-1013)
the support roof settings are now used for support bottoms as well
2016-07-27 10:34:41 +02:00
Tim Kuipers
f4698c7cd4 feat: support_bottom_height and support_interface_height (CURA-1013) 2016-07-27 10:18:19 +02:00
fieldOfView
336dd406b1 Add a reusable mechanism for plugins to add controls to designated areas in the GUI
contributes to CURA-271
2016-07-26 11:58:25 +02:00
fieldOfView
4014cb11f9 Reinstate UMO wizard
CURA-1732
2016-07-25 18:00:17 +02:00
fieldOfView
5f26372b96 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-25 17:39:57 +02:00
fieldOfView
1057634e47 Remove (non-functional) layer number from print monitor
CURA-1940
2016-07-25 17:39:43 +02:00
Jack Ha
d77f6e86e4 Added an extruded convex hull as a raft instead of a grey plane.
- New shader transparent_object.shader
- Raft thickness is calculated in BuildVolume and used in
  ConvexHullDecorator, notified by a Signal.
- Removed old grey plane from BuildVolume.
- Vertex data below build plane is no longer discarded (caused convex
  hulls that are too small).
- Uses new functions in MeshBuilder (update Uranium as well).

CURA-1707
2016-07-25 16:45:38 +02:00
fieldOfView
0e557feb4b Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-25 14:58:22 +02:00
fieldOfView
7ce5e71b4c Code cleanup 2016-07-25 14:58:12 +02:00
Tim Kuipers
6b3a25a491 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-25 14:50:11 +02:00
Tim Kuipers
59e8525855 JSON fix: flow temp graph reenabled (CURA-1174) 2016-07-25 14:50:05 +02:00
Jaime van Kessel
b28cf14288 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-25 13:51:27 +02:00
fieldOfView
87abed39f0 Fix two warnings on startup
CURA-1758
2016-07-25 11:41:54 +02:00
fieldOfView
ac0de58ecb Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-25 11:30:47 +02:00
fieldOfView
374ec8e577 Don't show user/quality emphasis on Per Object Settings 2016-07-25 11:30:30 +02:00
Jaime van Kessel
5d19113f8e Merge branch 'feature_stripe_shader' of github.com:Ultimaker/Cura 2016-07-25 10:51:45 +02:00
Jaime van Kessel
6883747671 Merge branch 'feature_remove_global_tab' of github.com:Ultimaker/Cura 2016-07-25 10:47:52 +02:00
Ghostkeeper
4e9bfc6573
Display some skirt/brim settings if skirt/brim enabled
Some needed to be updated because they concern both skirt and brim. Others missed the check entirely.

Contributes to issue CURA-1678.
2016-07-22 17:23:03 +02:00
Ghostkeeper
54685e8898
Rename setting skirt_minimal_length to skirt_brim_minimal_length
Also updated the description and made it a bit more accurate. Because this concerns not only the skirt, but also the brim.

Contributes to issue CURA-1678.
2016-07-22 17:12:34 +02:00
Ghostkeeper
d4f96ab62d
Rename setting skirt_line_width to skirt_brim_line_width
Also updated the description. Because this concerns not only the skirt, but also the brim.

Contributes to issue CURA-1678.
2016-07-22 17:00:30 +02:00
Ghostkeeper
5e2f1688b4
Rename setting jerk_skirt to jerk_skirt_brim
Because it concerns not only the skirt, but also the brim.

Contributes to issue CURA-1678.
2016-07-22 16:53:41 +02:00
Ghostkeeper
23f643aabc
Rename setting acceleration_skirt to acceleration_skirt_brim
Also updated the description. Because this concerns not only the skirt, but also the brim.

Contributes to issue CURA-1678.
2016-07-22 16:49:31 +02:00
Ghostkeeper
cb4c1fd08c
Rename skirt_speed to skirt_brim_speed
Also updated the description. Because this concerns not only the skirt, but also the brim.

Contributes to issue CURA-1678.
2016-07-22 16:45:11 +02:00
fieldOfView
6cc6e79e65 Stripe objects that are outside the build volume
This way they can not be confused with objects that are rendered with a (future) grey materialcolor.
2016-07-22 14:24:52 +02:00
Jaime van Kessel
fa61a9e3f0 Removed bunch of unneeded global inheritance stuff
CURA-1758
2016-07-22 14:04:35 +02:00
fieldOfView
9171908c8b Show weights as well as lengths
CURA-1038
2016-07-22 13:44:45 +02:00
Jaime van Kessel
cafb46cb1d First container is now updated withouth recursion possible
We now use a set of keys that we are handling in order to prevent the lock

CURA-1758
2016-07-22 10:43:26 +02:00
Jaime van Kessel
7e48b6ad4c Removed global_inherit_stack from support enable and support type
CURA-1758
2016-07-22 09:03:14 +02:00
Jaime van Kessel
87b9b17f98 Now the right extruder is actually used (instead of randomly mixing it up)
CURA-1758
2016-07-21 21:42:02 +02:00
Jaime van Kessel
4346d5a233 Settings now point to the right extruder stack
CURA-1758
2016-07-21 20:54:02 +02:00
fieldOfView
dd78561e25 Remove global tab
CURA-1758
2016-07-21 15:35:20 +02:00
fieldOfView
0857017ac6 Add a context-menu item to copy a value to all extruders.
CURA-1758
2016-07-21 15:12:30 +02:00
fieldOfView
a31ffc4ebf Select first extruder when switching to a printer (continued)
The days of the global tab are numbered

CURA-1758
2016-07-21 15:12:28 +02:00