1776 Commits

Author SHA1 Message Date
Arjen Hiemstra
19c25895bf Convert Toolbar.qml and styles.qml to Theme getThing style 2016-02-23 12:24:26 +01:00
Arjen Hiemstra
d93055da1a Fix syntax 2016-02-23 12:22:30 +01:00
Arjen Hiemstra
720324f0c6 Replace Theme property accessors with getThing calls 2016-02-23 12:22:30 +01:00
Ghostkeeper
c50c223124 Rename variable for code style
The code style specifies using lowercase with underscores.

Contributes to issue CURA-864.
2016-02-23 09:38:51 +01:00
Ghostkeeper
0989f8ced7 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-23 09:31:15 +01:00
Arjen Hiemstra
64977426df Set the right angle for rendering overhang on the outside-volume shader
This prevents us from rendering overhangs with an angle of 90 degrees
2016-02-22 17:01:38 +01:00
Tim Kuipers
a168eab140 JSON: fix: cone angle sign inverted compared to description (CURA-869) 2016-02-22 16:51:56 +01:00
Ghostkeeper
cbcbf3c971 Improve default support settings
These were found by Paul to be better. I agree on the Touching Buildplate option being the one that the user most likely would use most often, and I am inclined to take his word on the support angle.
2016-02-22 15:45:21 +01:00
Jaime van Kessel
1e7de43934 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-22 14:59:43 +01:00
Jaime van Kessel
f66a264901 Added more yield thread to prevent GIL lockdown 2016-02-22 14:59:33 +01:00
Ghostkeeper
2aac62f55b Remove variant setting overrides from machine settings
These will be implemented by the new profiles.

Contributes to issue CURA-892.
2016-02-22 14:20:35 +01:00
Ghostkeeper
12bace54b1 Update per-object settings list when a setting changes
The event triggers a refresh of the global_only property. I think it shouldn't affect the computation time too much but it feels sluggish when you change a setting. Does it feel sluggish for you too, reviewer? It has been feeling sluggish for a while so I don't know if that's due to this change.

Contributes to issue CURA-458.
2016-02-22 12:55:10 +01:00
fieldOfView
2d22b79d7a Add missing radius to MessageStack progressbar
Also removes two chunks of commented-out code
2016-02-19 23:15:05 +01:00
Tim Kuipers
2ab23513b2 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-19 16:08:50 +01:00
Tim Kuipers
7425c32aa4 JSON: moved Standby Temp to dual_extrusion_settings (CURA-868) 2016-02-19 16:08:40 +01:00
Tim Kuipers
f0e60d65ff JSON: disable Extrusion Cool Down Speed Modifier when no auto temp or single extrusion (CURA-868) 2016-02-19 15:56:14 +01:00
Jaime van Kessel
67db4a4778 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-19 15:52:52 +01:00
Jaime van Kessel
31ed8400ef Added a bit of error handling 2016-02-19 15:52:36 +01:00
Ghostkeeper
63a8b96049 Make layer processing abort when starting slice
This involved adding an abort flag to the layer processing job, and making the job check back on that flag periodically. If processing a single layer takes forever then it will never stop the job at all, so it assumes that the concurrent programming in Python is Fair.

Contributes to issue CURA-864.
2016-02-19 12:25:47 +01:00
Jaime van Kessel
c0d167e751 Changing values in simple mode no longer influences local model
CURA-865
2016-02-19 10:42:38 +01:00
Ghostkeeper
bcbb28dd9f Fix application menu save-to-file option
Turns out that named parameters never worked. I've changed it into key-word arguments, but then not really key-word arguments but a QVariantMap.

Contributes to issues CURA-611 and CURA-898.
2016-02-18 13:30:24 +01:00
fieldOfView
b8113a9740 Reset menu selection without modifying the model
Contributes to CURA-853
2016-02-17 22:04:05 +01:00
Jaime van Kessel
e093c956f2 Removed stray debug print 2016-02-17 17:02:41 +01:00
Arjen Hiemstra
40ea87fa05 Properly save setting visibility when auto saving
Contributes to CURA-511
2016-02-17 14:38:38 +01:00
Tim Kuipers
765185364f JSON: quickfix: made Auto Temp always not displayed (CURA-868) 2016-02-17 10:36:30 +01:00
fieldOfView
09c04d7c68 Add sidebar header icon for "machine" category 2016-02-16 22:43:36 +01:00
fieldOfView
27062d8e99 Always make sure imported profiles are available for the currently active machine
The profile name of an imported legacy profile gets set in ProfilesModel.importProfile()

Contributes to CURA-874
2016-02-16 21:50:57 +01:00
Ghostkeeper
ccd937a56f Make boolean trap more readable
This doesn't entirely remove it but it looks a bit better. In other calls, the variable name that's filled in the parameter sort of makes it clear what the boolean indicates.

Contributes to issue CURA-611.
2016-02-15 16:56:42 +01:00
Ghostkeeper
4ccf4fe718 Change global-only behaviour of some adhesion settings
They don't always work when set per-object. So don't allow it.

Contributes to issue CURA-458.
2016-02-15 15:30:52 +01:00
Jaime van Kessel
4a862d0e0c Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-15 14:49:43 +01:00
Jaime van Kessel
5381c9c74b More codestyle changes 2016-02-15 14:28:27 +01:00
fieldOfView
f61d7fe9b2 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-15 14:27:26 +01:00
fieldOfView
5613a5de20 Reset menu selection when canceling profile switch
Contributes to CURA-853
2016-02-15 14:19:32 +01:00
Jaime van Kessel
9bf783df4d Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-15 14:18:12 +01:00
Jaime van Kessel
54e5020975 Codestyle fixes 2016-02-15 14:18:01 +01:00
Ghostkeeper
69331696f0 Revert UM2+ machine names
This was causing problems in the listing of the printers due to the variants. I still don't really know why it was causing these problems but I've reverted the changes and it seems to have been fixed now.

Contributes to issue CURA-440.
2016-02-15 11:03:44 +01:00
Ghostkeeper
9379b0a97b Update translation from machine name to hex file
There was an incongruence in the translation from the machine name to hex file. Sometimes the machine name was wrong. Sometimes the hex file was wrong.

Contributes to issue CURA-440.
2016-02-12 17:09:42 +01:00
Tim Kuipers
6d27c26260 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-12 16:19:09 +01:00
Tim Kuipers
07d0e433a8 JSON: made some essential settings visible by default: conical support, brim settings, raft settings (CURA-877) 2016-02-12 16:19:00 +01:00
Jaime van Kessel
a03f256366 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-12 16:18:09 +01:00
Jaime van Kessel
89424d5635 SceneBounding box now correctly uses deepcopy 2016-02-12 16:17:58 +01:00
Tim Kuipers
ed5e59df57 JSON: made some settings not visible by default (CURA-877) 2016-02-12 16:04:17 +01:00
Tim Kuipers
58238a5933 JSON: made line_width max value warning depend on nozzle size (CURA-876) 2016-02-12 15:56:03 +01:00
Tim Kuipers
5614302f74 JSON: made layer height max value warning depend on nozzle size (CURA-876) 2016-02-12 15:54:06 +01:00
Tim Kuipers
9545f7da36 JSON: fix: retraction settings not visible for UM2 anymore (CURA-875) 2016-02-12 15:44:04 +01:00
Tim Kuipers
1271a7407e JSON: support tower settings disabled if use_tower=Flase (CURA-870) 2016-02-12 15:26:56 +01:00
Tim Kuipers
18ef6f9a69 JSON: default tower diam and support minimal diam changed to 3mm (CURA-870) 2016-02-12 13:58:23 +01:00
Tim Kuipers
14b6ae2a4c JSON: made support_minimal_diameter child of support_tower_diameter (CURA-870) 2016-02-12 13:52:41 +01:00
Tim Kuipers
ca8de7ecf8 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-12 13:39:35 +01:00
Tim Kuipers
42e6d88e7f JSON: default cone angle inversed to get less support by default (CURA-869) 2016-02-12 13:39:19 +01:00