GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-17 09:56:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,199 Commits 290 Branches 260 Tags
Commit Graph

5199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fieldOfView
25fb4d0b27 Show generic materials by display name instead of by material 2016-08-30 18:39:02 +02:00
fieldOfView
42010e34d2 Show material by its displayname instead of its color 2016-08-30 18:30:45 +02:00
jack
3ead74ea17 Merge pull request #957 from Ultimaker/feature_layerview_ghosts2 
Show "ghosts" for all objects on the buildplate in layerview
 2016-08-30 17:06:35 +02:00
fieldOfView
82f6f20bc1 Restore profiles overview for single extrusion printers 
CURA-2214
 2016-08-30 16:42:41 +02:00
fieldOfView
5cd3cfca45 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-30 16:26:33 +02:00
fieldOfView
f7f4aa7659 Activate another profile when the user cancel out of generating a new profile 
CURA-2220
 2016-08-30 16:26:21 +02:00
Jaime van Kessel
fbbbdb61e3 Merge branch 'feature_material_inheritance' of github.com:Ultimaker/Cura 2016-08-30 16:05:10 +02:00
Jaime van Kessel
1940d45971 Added way to acces inherited files 
CURA-2108
 2016-08-30 16:04:05 +02:00
fieldOfView
cb7a3de757 Code style 2016-08-30 16:02:08 +02:00
Jaime van Kessel
dcbf7b5a35 When unable to find quality for material, we also use inherited files (if any) to resolve it 
CURA-2108
 2016-08-30 16:01:21 +02:00
fieldOfView
ac7c1a92a5 Show "Create" only when there are user changes, "Duplicate" otherwise 
CURA-2220
 2016-08-30 15:58:16 +02:00
fieldOfView
b09e8bb1c9 Use active quality(-changes) name when creating a new profile 
CURA-2220
 2016-08-30 15:56:53 +02:00
Jaime van Kessel
0a811b2164 Added more logging to changing of containers 
CURA-2108
 2016-08-30 15:42:37 +02:00
fieldOfView
e79694178c Update for readability 
CURA-2214
 2016-08-30 15:11:50 +02:00
Jaime van Kessel
7a54f21633 Added inherited_files property 2016-08-30 14:51:27 +02:00
Jaime van Kessel
6a2e5ffe77 Added inheritance support to XML material profile deserialization 
CURA-2108
 2016-08-30 14:48:34 +02:00
fieldOfView
b004c53c6d Fix upadting list of materials when switching printers 
CURA-2209
 2016-08-30 14:42:43 +02:00
fieldOfView
a8d8a8a7ed CodeStyle 2016-08-30 14:09:16 +02:00
fieldOfView
4593e8615e Fix hiding extruder selection when switching to a signle extrusion printer 
CURA-2207
 2016-08-30 14:08:29 +02:00
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 18e1fc59daabfe1b27d1cb9529d129880a158ee2.
 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