2372 Commits

Author SHA1 Message Date
fieldOfView
e79694178c Update for readability
CURA-2214
2016-08-30 15:11:50 +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
9a753680e7 Setting pane now uses correct profiles to display setting values
CURA-2185
2016-08-29 16:18:15 +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
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
Jaime van Kessel
fcfbf78f9e Implemented importing multiple profiles from .curaprofile file
CURA-2099
2016-08-26 14:37:21 +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
Ghostkeeper
223489a637
Make mesh-specific global setting solution permanent
We've considered various other solutions but this is the only real solution available to us.

Contributes to issue CURA-2173.
2016-08-25 14:33:53 +02:00
fieldOfView
5119a7b6be Add a smidgen of documentation to the previous commit
CURA-2173
2016-08-25 14:08:37 +02:00
fieldOfView
3ca7e2bb8d Momentary fix for CURA-2173
We're not sure about the location and implementation but it fixes an important bug for now. At the very least this needs documentation.
2016-08-25 13:57:21 +02:00
fieldOfView
5a710175a1 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-08-25 10:46:34 +02:00
fieldOfView
043343d536 Select correctly "inherited" profile when switching to a material that has no qualities of its own
CURA-2095
2016-08-25 10:46:19 +02:00
Jack Ha
2ae998737f Added materialspage Display Name field and made it work. CURA-1969 2016-08-25 09:54:22 +02:00
Jaime van Kessel
17b34fb4e1 It's no longer possible to remove a material that is in use
CURA-2168
2016-08-24 14:48:20 +02:00
Jaime van Kessel
3012690abc Also added logging to indicate failure
CURA-2169
2016-08-24 13:38:59 +02:00
Jaime van Kessel
b1ae25fb92 Removing containers now returns false if it was unable to remove containers
CURA-2196
2016-08-24 13:34:40 +02:00
Jaime van Kessel
9c895d2f31 Added more logging to container duplication
CURA-2162
2016-08-24 13:03:51 +02:00
Jaime van Kessel
114899dc91 Merge branch 'cura-2007' of github.com:Ultimaker/Cura 2016-08-24 12:39:33 +02:00
Jaime van Kessel
cbb50eeec6 Added more logging to renaming
CURA-2165
2016-08-24 11:51:47 +02:00
Ghostkeeper
36a33bb135
Retain quality profile when switching from no quality-changes profile
The old quality-changes profile was 'empty_quality_changes', not None.

Contributes to issue CURA-2006.
2016-08-23 17:27:09 +02:00
Ghostkeeper
f9e0e457ea
Retain active quality-changes when changing material
This wasn't updated yet for the new quality-changes functionality.

Contributes to issue CURA-2006.
2016-08-23 17:27:09 +02:00
Ghostkeeper
9ba9e90a8f
Turn if-clause into simple input check
Makes the code more readable in my opinion.

Contributes to issue CURA-2006.
2016-08-23 17:27:09 +02:00
Jack Ha
090b8d4f50 Solved merge conflict. 2016-08-23 10:35:20 +02:00
fieldOfView
344be2687e Display the appropriate profile settings on Profiles page
CURA-2006
2016-08-22 22:38:13 +02:00
fieldOfView
cfb062718f Fix creating a clone of criteria
CURA-2006
2016-08-22 21:43:32 +02:00
fieldOfView
08091209f1 Fix profile display for printers without machine-specific material profiles
CURA-2006, CURA-1774
2016-08-22 19:21:44 +02:00
Ghostkeeper
bb90c593b9 Merge branch 'feature_quality_changes' 2016-08-22 15:13:27 +02:00
Ghostkeeper
aefb36d1ec
Update activeValidationState if setting validation changed
This was removed from onGlobalSettingChanged but never re-added anywhere.

I've updated it to check for both the global and the active stack, since some settings modify only the global stack (such as layer height).

Contributes to issue CURA-2006.
2016-08-22 13:42:14 +02:00
fieldOfView
1003066ce1 Show qualities for the material associated with the currently selected quality
CURA-2095
2016-08-22 11:31:31 +02:00
fieldOfView
52dda935fc Switch to a generic quality profile if a material has no specific qualities
CURA-2095
2016-08-22 11:14:53 +02:00
fieldOfView
d8d328c491 Code style 2016-08-19 17:22:55 +02:00
Jaime van Kessel
e3d4a33954 Fixed legacy profile reader
Updated some settings that were changed from 2.1 to 2.2. Also fixed some
architecture changes that were not changed correctly (or at all)

CURA-1493 and CURA-1779
2016-08-19 10:38:18 +02:00
Ghostkeeper
0c0871656b
Cache container registry before for loop
Slight performance increase. We should pay more attention to this kind of thing.

Contributes to issue CURA-2006.
2016-08-18 17:26:51 +02:00
fieldOfView
063faf1520 Move the "Changes on Printer" dialog to JediWifiPrinting
...to have full control over the terminology
CURA-2116
2016-08-16 16:48:35 +02:00
fieldOfView
b2143e7d43 Remove code duplication
CURA-2116
2016-08-16 15:25:44 +02:00
Jack Ha
8c0837d75d Merge master. CURA-2006 2016-08-16 15:08:25 +02:00
Jack Ha
80214d07bc Prettier number display in Profiles page. CURA-2006 2016-08-16 15:03:01 +02:00
Jack Ha
83b89d09d8 Fix for could not find quality xxx 2016-08-16 13:34:47 +02:00
Jack Ha
759ef29b1d Fix keep user settings dialog. 2016-08-16 13:12:34 +02:00
fieldOfView
8c63216fdf Get how we name variants from the machine definition
CURA-2116
2016-08-16 10:18:57 +02:00
fieldOfView
b7b0faf44a Fix sorting of settings on Profile manager page
CURA-2123
2016-08-15 15:17:59 +02:00
Jack Ha
4ea9276682 Merge branch 'master' into cura-2007 2016-08-15 09:16:04 +02:00