Commit graph

7424 commits

Author SHA1 Message Date
fieldOfView
7aa44bdd9e Remove commented out code 2016-08-30 13:38:08 +02:00
fieldOfView
b0d0d81dc3 Revert "Render ghost behind all objects in layerview"
I did not mean to merge this yet.

This reverts commit 18e1fc59da.
2016-08-30 13:32:33 +02:00
fieldOfView
46ee6c0713 Show "ghosts" for all objects on the buildplate in layerview
Simpler implementation that works.
CURA-1601
2016-08-30 13:27:19 +02:00
fieldOfView
18e1fc59da Render ghost behind all objects in layerview
CURA-1601
2016-08-30 13:21:58 +02:00
Jaime van Kessel
91c11ee0fc Merge branch 'feature_listmodel_setitems' of github.com:Ultimaker/Cura 2016-08-30 11:08:57 +02:00
Jaime van Kessel
4c61c66a4b Changing profiles now also forces defocus of setting fields
CURA-2180
2016-08-30 11:02:33 +02:00
Jaime van Kessel
f85f7cb62c Filter certain settings based on stack type in profile tab
CURA-2214
2016-08-30 10:47:32 +02:00
Jaime van Kessel
821c915ce6 Imported profiles are now directly set as dirty so they are saved to storage upon exit
CURA-2099
2016-08-30 09:49:07 +02:00
Jaime van Kessel
d711a510dd Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-29 16:50:42 +02:00
Jaime van Kessel
432377a075 Per object setting now defaults to first extruder instead of active
CURA-2189
2016-08-29 16:47:32 +02:00
Jack Ha
191a318df6 ContainerRegistry only getInstance once. 2016-08-29 16:44:37 +02:00
Jaime van Kessel
cf2cfa3c45 Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-29 16:36:48 +02:00
Jaime van Kessel
1ef24c9e9d CHanged function called by bedlevel action qml
CURA-2199
2016-08-29 16:35:39 +02:00
fieldOfView
00250acb10 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-29 16:35:32 +02:00
fieldOfView
6c16d82736 Add material type as a column in the Material manager
...and a color swatch for good measure.
2016-08-29 16:35:10 +02:00
Jaime van Kessel
70af60c5fb Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-29 16:18:46 +02:00
Jaime van Kessel
9a753680e7 Setting pane now uses correct profiles to display setting values
CURA-2185
2016-08-29 16:18:15 +02:00
fieldOfView
8db0646266 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-29 15:35:31 +02:00
fieldOfView
71a77c1fb7 Decrease number of instances of InstanceContainerModel
Updates to InstanceContainerModel are becoming expensive because there are so many instances of that model. The MaterialMenu used three, and the MaterialMenu is instantiated three times for a dual extrusion printer.

CURA-2193
2016-08-29 15:35:14 +02:00
Jack Ha
5da6d70163 Fixed duplicate material. CURA-1969 2016-08-29 15:28:09 +02:00
Jack Ha
b2068ce99b Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-29 14:40:45 +02:00
Jack Ha
e0e1147708 Somewhat working materialspage duplicate. Contributes to CURA-1969 2016-08-29 14:40:37 +02:00
Jaime van Kessel
3d41e25a4e Fixed setting visibility if a parent setting is not settable per extruder but it's relations are
This fix also removes the hack to ensure that use_support was set correctly.
Fixes CURA-2202
2016-08-29 13:43:42 +02:00
fieldOfView
b343649131 Use ListModel.setItems() instead of appending one item at a time
setItems sets the items to a (presorted) list of items instead of adding items one by one and then sorting the list. This way if an update to the model causes a signal storm at least it happens only once for an update.

Specifically this reduces switching to a dual extrusion printer by half.

Contributes to CURA-2193
2016-08-29 13:43:02 +02:00
Jaime van Kessel
120e3f156a Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-29 13:31:38 +02:00
Jaime van Kessel
d4c55d635e Adhesion settings now inherit from the correct stack
CURA-2202
2016-08-29 13:30:46 +02:00
fieldOfView
0e602b8d0b Fix profile selection of UM2+ machines
CURA-2204
2016-08-29 11:49:39 +02:00
fieldOfView
b8ce37fd15 Fix search criteria when setting a quality
CURA-2204
2016-08-29 11:11:18 +02:00
Jack Ha
2daf0b1683 Cleanup after mistakenly committing crap. 2016-08-29 09:42:35 +02:00
Jack Ha
6a2c97e4ac Merge 2016-08-29 09:31:28 +02:00
fieldOfView
7a1f7b3654 Make automatic drop to buildplate optional. 2016-08-28 16:30:22 +02:00
fieldOfView
30a679ddf9 Reduce loadingtime of XmlMaterialProfiles by 25%
XmlMaterialProfile did a lot of findInstanceContainers() by GUID and base_file. If base_file is always set, matching GUID is superfluous.

This shaved off 20% loading time of the application (43 vs 34 seconds) on a cached load.
2016-08-26 17:18:35 +02:00
fieldOfView
43438dd84f Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-26 17:02:35 +02:00
fieldOfView
0e2d35a88d Use parseBool instead of inline variation
CURA-2138
2016-08-26 17:02:21 +02:00
Jaime van Kessel
af4ea9183c Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-26 16:23:47 +02:00
Jaime van Kessel
7a7b634108 Eject message is now hidden when eject is done
CURA-2200
2016-08-26 16:23:23 +02:00
fieldOfView
3b1c11bfcf Put materials into branded material submenus
CURA-2194
2016-08-26 15:43:50 +02:00
Jaime van Kessel
fcfbf78f9e Implemented importing multiple profiles from .curaprofile file
CURA-2099
2016-08-26 14:37:21 +02:00
fieldOfView
baad88fb6c Remove incorrectly copy/pasted code
CURA-2199
2016-08-26 13:22:21 +02:00
fieldOfView
e19a7914b1 Prevent error when the active printerOutputDevice has no cameraImage 2016-08-26 13:21:32 +02:00
Jaime van Kessel
ced6cd7320 Exporting a profile now exports all profiles in a zipped container
CURA-2099
2016-08-26 12:55:31 +02:00
fieldOfView
0799a9e278 Move branded materials into a submenu
CURA-2194
2016-08-26 11:59:19 +02:00
Ghostkeeper
13e9a4f1a5
Merge branch 'innovo3d-master' 2016-08-26 10:17:47 +02:00
Ghostkeeper
e9dc05c8dc Merge branch 'master' of https://github.com/innovo3d/Cura into innovo3d-master 2016-08-26 10:15:57 +02:00
Jaime van Kessel
e7f2acfeab Build volume message now shows for default of 30 sec 2016-08-26 09:51:41 +02:00
Jaime van Kessel
8046e72a10 Added missing file 2016-08-26 09:35:21 +02:00
Jaime van Kessel
e6aec0c64b Use curas own visibility page instead of default by Uranium 2016-08-25 21:21:44 +02:00
Jaime van Kessel
f963ab0fde Merge branch 'master' of github.com:Ultimaker/Cura 2016-08-25 20:46:52 +02:00
Jaime van Kessel
c7126775d5 Fix spelling mistake 2016-08-25 20:46:36 +02:00
fieldOfView
9f2c5a4c92 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-25 17:07:45 +02:00