121 Commits

Author SHA1 Message Date
Jaime van Kessel
0e74b8eb08 setActiveMaterial now uses id instead of entire container to set quality
CURA-2494
2016-10-03 15:58:05 +02:00
Jaime van Kessel
527a503eac Added more logging to indicate changing of certain containers actually succeeded 2016-10-03 15:54:18 +02:00
Simon Edwards
8c8cd86a08 Quality changes didn't have the right extruder ID set in some situations.
CURA-2414 Quality changes profiles are created incorrectly
2016-09-29 20:54:09 +02:00
Simon Edwards
cd45ef496b Handle materials which don't have any quality profiles of their own. Moved the quality_type computation code into the QualityManager.
Contributes to CURA-2477 Profile menu should only contain valid options for all materials
2016-09-29 16:39:30 +02:00
Jack Ha
8934555bd6 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-29 14:09:54 +02:00
Jack Ha
03c66e6e62 use resolveOrValue for adhesion_type. contributes to CURA-2232 2016-09-29 14:09:19 +02:00
fieldOfView
040f49e474 Fix cases where there is no "normal" quality
CURA-2494
2016-09-29 13:48:23 +02:00
Simon Edwards
bfa92b6b40 Correctly update the selected quality and quality changes after changing material.
Contributes to CURA-2451 Changing material does not update quality profile to correct profile
2016-09-27 17:09:04 +02:00
Simon Edwards
c902fef372 Removed a dead line.
Contributes to CURA-2320 Filtering Quality-Changes profiles on material?
2016-09-27 14:16:25 +02:00
Simon Edwards
4bb6ddaf28 Correctly update the quality profiles in the extruders when changing quality changes, taking the different materials into account.
Contributes to CURA-2320 Filtering Quality-Changes profiles on material?
2016-09-27 14:11:19 +02:00
Jaime van Kessel
960a390350 Ensure that the correct properties get set for writing profiles to g-code
CURA-2462
2016-09-27 14:05:56 +02:00
Jaime van Kessel
9e47a87375 If no quality container can be found, use empty instead
CURA-2462
2016-09-27 13:26:44 +02:00
fieldOfView
3d7680a983 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-26 10:58:57 +02:00
fieldOfView
3d61b7fb75 Prevent signal storm when changing a property
Contributes to CURA-2429
2016-09-26 10:58:15 +02:00
Jack Ha
4547cfe504 Introduced resolveOrValue which fixes resolvement with dependencies for the most part. CURA-2232 2016-09-26 10:37:44 +02:00
Jaime van Kessel
51dee95c8f Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-21 16:37:39 +02:00
Jaime van Kessel
92389365b6 If a machine inherits qualities, it tries to select the correct variant ID's as well
CURA-2424
2016-09-21 16:36:45 +02:00
Simon Edwards
90dedc354c * Make sure that quality changes are machine dependent but material independent.
* Correctly handle machines which derived (subclasses) from other machines.
* Some refactoring and a lot more comments.

Contributes to CURA-2414 Quality changes profiles are created incorrectly
2016-09-21 15:26:20 +02:00
Jack Ha
2b4377b509 Fixed update resolvements by moving signal emits. CURA-2232 2016-09-20 14:03:55 +02:00
Jaime van Kessel
aac395cb79 Settings that are not settable per extruder but used by settings who are are now also copied
CURA-2409
2016-09-19 13:01:31 +02:00
Jack Ha
692eb42aa7 When switching nozzle or material, drop mismatching quality changes. CURA-2248 2016-09-15 17:05:14 +02:00
fieldOfView
151fcfdda6 Update method order for readability 2016-09-14 15:15:54 +02:00
Simon Edwards
8086646de1 When reverting a user setting be sure to delete it from all of the stacks, global and extruder.
Contributes to CURA-2232 No resolvement strategy for prime_tower_enable and platform adhesion
2016-09-13 11:33:33 +02:00
Jaime van Kessel
2441275f29 Added message when incompatbile material is selected
CURA-2271
2016-09-09 12:57:50 +02:00
fieldOfView
8b7a8327e8 Allow machinedefinitions to specify another definition to inherit qualities from
CURA-1780
2016-09-08 18:49:34 +02:00
fieldOfView
46acc4d351 Update wording
CURA-2236
2016-09-06 08:32:51 +02:00
Jaime van Kessel
3227507297 An empty quality container will now give a "not supported" warning
CURA-2236
2016-09-05 13:31:36 +02:00
Jaime van Kessel
51d653beba Added logging if material container was not found
CURA-2236
2016-09-05 12:40:38 +02:00
Jaime van Kessel
67636d6f3c _updateMaterial container now correctly returns generic material
CURA-2236
2016-09-05 12:01:05 +02:00
Jaime van Kessel
3df1eb00da Added some extra checks when changing quality profiles
Contributes to ultimaker/cura#960
2016-09-02 10:56:27 +02:00
Jaime van Kessel
2c8b9290f8 Made checking if inheritance is allowed more explicit
CURA-2108
2016-08-31 11:41:33 +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
Jaime van Kessel
0a811b2164 Added more logging to changing of containers
CURA-2108
2016-08-30 15:42:37 +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
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
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
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
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
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
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
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