Commit graph

12848 commits

Author SHA1 Message Date
fieldOfView
1808c44d02 Change behavior of the "Close" button on a machineaction dialog
Pressing close now "rejects" the action, similar to pressing "cancel" in the add machine wizard (instead of accepting, like pressing "ok").

CURA-2019
2016-08-01 15:36:43 +02:00
fieldOfView
0c8d0a11a9 Fix a couple of qml casting errors 2016-08-01 15:22:21 +02:00
fieldOfView
a9ed562a58 Allow machine actions to reference the dialog they are shown in
This way they can respond to the onAccepted and onRejected actions of the dialog
Contributes to CURA-2019
2016-08-01 15:21:12 +02:00
Ghostkeeper
dc6482853a
Split acceleration_layer_0 and jerk_layer_0 into print/travel
Exactly the same as how it's done with speed_layer_0.

Contributes to issue CURA-1507.
2016-08-01 14:15:11 +02:00
Ghostkeeper
4adadd86eb
Fix defaults of some settings
It was saying 'default' instead of 'default_value'. Must've been translated wrong from 2.1.
2016-08-01 14:15:11 +02:00
fieldOfView
1e46ab9eea Remove stale AddMachineWizard file 2016-08-01 13:45:24 +02:00
fieldOfView
e01c8a4f10 Add Select All functionality 2016-07-29 19:25:40 +02:00
fieldOfView
ed1d12d21d Hide linked settings icon for single extrusion printers
CURA-2020
2016-07-29 17:43:38 +02:00
fieldOfView
228f5be35a Fix order of machine actions on manage printers page
MachineActionManager now uses lists instead of dicts because dicts don't maintain the order.
2016-07-29 17:14:18 +02:00
fieldOfView
0a75aa7496 Fix category of PrintrBot simple definition
CURA-1593
2016-07-29 16:40:58 +02:00
fieldOfView
34840d42bd Sort printers by category instead of by manufacturer
Always show Ultimaker on top. CURA-1593
2016-07-29 16:38:27 +02:00
Jaime van Kessel
b9a1d50e05 Added option to only display top layers in layerview 2016-07-29 13:17:41 +02:00
fieldOfView
57a37cfb8f Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-29 11:27:18 +02:00
fieldOfView
f584b49af2 Add "Close" button to (single) machine actions dialog
CURA-2019
2016-07-29 11:27:03 +02:00
Jaime van Kessel
1ed0503e02 Backspace now triggers same action as delete
CURA-1891
2016-07-29 10:37:03 +02:00
Tim Kuipers
4b192db1bf JSON: extruders cannot be more than 16 (CuraEngine hardcoded value) (CURA-2015) 2016-07-28 20:16:44 +02:00
Tim Kuipers
07cea792d9 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-28 19:52:54 +02:00
Tim Kuipers
27f160c220 JSON fix: made retraction_hop_only_when_collides and retraction_hop not children of retraction_hop_enabled
retraction_hop_enabled was used by the engine, so it should never become disabled
2016-07-28 19:52:43 +02:00
fieldOfView
9d7ce210b3 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-28 18:15:23 +02:00
fieldOfView
8fb6c9939a Add "offline" styling to sidebar/monitor
CURA-1851
2016-07-28 18:14:38 +02:00
Arjen Hiemstra
570a67556a Fix exporting and importing materials on OSX
OSX's file dialog is stupid and does not understand extensions with
a . in them. So instead just use everything after the last .

Fixes CURA-1987
2016-07-28 18:08:17 +02:00
Tim Kuipers
34ac8cf66f Merge branch 'feature_first_layer_travel_speed' 2016-07-28 17:05:07 +02:00
Tim Kuipers
20b96b4716 Merge branch 'master' into feature_first_layer_travel_speed 2016-07-28 16:48:42 +02:00
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