47 Commits

Author SHA1 Message Date
ChrisTerBeke
62d70b46d6 Fix filtering custom profiles per extruder - CURA-4482 2017-11-21 15:31:59 +01:00
Diego Prado Gesto
b9c318d432 CURA-4451 Minor changes 2017-10-26 16:53:31 +02:00
Chris ter Beke
b95ba24530 Remove some changes, debugging - CURA-4451
WIP - CURA-4451

correctly show not supported when any of the extruders has a not supported profile - CURA-4451

Clean up and add comments - CURA-4451
2017-10-26 09:23:27 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
Diego Prado Gesto
e73e218c4e Detecting whether the profile is created for multiple extrusion printers or not - CURA-4327 2017-09-21 16:28:50 +02:00
Lipu Fei
84ad9c6ad1 Add "available" flag for quality profiles
CURA-4182

Add "available" flag for quality profile model so the slider can use it
to show available and unavailable profiles.
2017-09-13 16:40:59 +02:00
Lipu Fei
23544ad1fe Only fall back to use fdmprinter when the quality profiles for the current machine cannot be found
CURA-4139

UM2 family don't have machine material, but they do have their dedicated
profiles. When Cura searches for quality profiles, it should only fall
back to use "fdmprinter" as the definition if no quality profile can be
found for the current machine.
2017-08-30 14:59:12 +02:00
Ghostkeeper
ebd2f0b415
Fix switching to quality changes profiles
It would put the global quality changes profile in each of the extruders, thus not giving any per-extruder settings.

Contributes to issue CURA-3935.
2017-06-14 15:30:55 +02:00
Ghostkeeper
f4e620c458
Remove unused variable
Contributes to issue CURA-3935.
2017-06-14 13:40:57 +02:00
Jaime van Kessel
1020b0a2f3 Finding all qualities no longer does silly things with materials
The fetchContainer function also did magical material filtering, which caused it to go haywire.

CURA-3929
2017-06-14 09:40:11 +02:00
Jaime van Kessel
9a54ff426b FindAllQualitiesForMachineMaterial only looks with basic materials if it found them
CURA-3911
2017-06-12 15:14:25 +02:00
Jaime van Kessel
a306b4dada We now properly fall back if no basic material is found
CURA-3911
2017-06-12 13:53:35 +02:00
Lipu Fei
6bcc1c296d Do not override filter_by_material if no material is found
CURA-3884

We rely on the machine to decide whether it needs machine specific
materials, so we don't override the filter_by_material flag when
looking for quality profiles for a material.
2017-06-01 13:26:45 +02:00
Jaime van Kessel
f7f958c540 Directly use property instead of searching 2017-05-15 13:58:02 +02:00
Jaime van Kessel
c4fc797c45 Added a type hinting to QualityManager 2017-05-15 13:53:13 +02:00
Jaime van Kessel
437c78711d Added typing to all singletons
This greatly helps with pycharms ability to do auto code completion
2017-04-13 16:32:17 +02:00
Simon Edwards
4fecf55b3b Use double quotes instead of singles. 2017-01-17 20:56:50 +01:00
Simon Edwards
fb70eb6813 Merge branch 'master' into python_type_hinting 2017-01-17 08:42:55 +01:00
Simon Edwards
98bad05b7b Take materials which are sub-type into account when looking for quality profiles.
CURA-3235 Duplicate profile broken when using Ultimaker materials other than default
2017-01-12 13:25:05 +01:00
Simon Edwards
74e5798509 Lots of import fixes. Eliminated the import hacks such as those used inside UM/Settings/__init__.py.
CURA-2917
2016-12-12 16:05:35 +01:00
Simon Edwards
5884509af1 More type checking fixes after the merge.
CURA-2917
2016-11-22 11:51:18 +01:00
Simon Edwards
21f1b12ee8 Internal docs.
CURA-2852 Activating customised material will not duplicate UM2+ profiles
2016-10-31 16:03:40 +01:00
Jaime van Kessel
41ed9661f6 FindQUalityByName now also uses fallback generic materials if no result was found
CURA-2852
2016-10-31 15:43:53 +01:00
fieldOfView
740ce1fa0b Fix errors when switching from UM3 to UM2. 2016-10-27 11:34:13 +02:00
Arjen Hiemstra
e82b2c0f80 Add support for global quality profiles
Instead of using one of the extruder profiles as global quality, use
proper global qualities.

Contributes to CURA-2646
2016-10-24 10:57:18 +02:00
Simon Edwards
f659d01da1 Make the labels in the quality menus match those from the selected extruder.
CURA-2271 Warn for unsupported material/printcore combinations
2016-10-13 10:55:32 +02:00
Simon Edwards
c3cf762451 Show the warning color for unsupported materials/qualities by using the new 'supported' metadata flag.
CURA-2271
2016-10-12 15:57:50 +02:00
Arjen Hiemstra
c6afb14a09 Return the empty container if there are no results when listing qualities
Contributes to CURA-2271
2016-10-10 13:34:45 +02:00
Arjen Hiemstra
68662561e8 Return empty quality instead of None in QualityManager::findQualityByQualityType
Contributes to CURA-2271
2016-10-10 13:23:43 +02:00
fieldOfView
2aa3e1e931 Fix documentation
CURA-2248
2016-10-06 15:41:20 +02:00
Jaime van Kessel
39623ba2b8 Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-06 13:50:18 +02:00
Jaime van Kessel
fb24e55268 _getBasicMaterial now correctly filters on variants as well
CURA-2248
2016-10-06 13:49:43 +02:00
Simon Edwards
e4f60ccc34 Merge pull request #1027 from Ultimaker/profiles_revert_global_profile
Revert "global_profile" reference changes while refixing import
2016-10-06 11:05:05 +02:00
Jaime van Kessel
448c8436dc Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-05 09:40:46 +02:00
Jaime van Kessel
ad80678bc2 Gracefully handle case if no material was found
CURA-2494
2016-10-05 09:40:16 +02:00
Simon Edwards
963fac7806 Filter the list of quality changes taking into account the quality(-type) profile they depend on.
Contributes to CURA-2248 Duplicated profile not shown in the profile manager list
2016-10-05 09:32:18 +02:00
fieldOfView
6d0da0d754 Revert "global_profile" reference changes while refixing import
CURA-2518 and CURA-2478
2016-10-04 17:21:33 +02:00
fieldOfView
e1d70ed4b6 Fix selecting quality_changes profiles for extruders
Now that containers in a quality_changes set don't share a common name, the quality_changes containers for extruders have a metadata entry "global_profile" pointing to the global quality_changes container id.

Contributes to CURA-2478 and CURA-2484
2016-10-03 21:58:34 +02:00
Simon Edwards
3e6cbd58f1 Added some more method docs.
Contributes to CURA-2477 Profile menu should only contain valid options for all materials
2016-10-03 12:05:59 +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
fieldOfView
040f49e474 Fix cases where there is no "normal" quality
CURA-2494
2016-09-29 13:48:23 +02:00
fieldOfView
bee955327b Fix quality profile selection for printers that should use generic quality
Fixes CURA-2489, contributes to CURA-2477
2016-09-29 12:04:05 +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
Simon Edwards
983e963dd3 Fix for deleting quality changes profiles.
Contributes to CURA-2414 Quality changes profiles are created incorrectly
2016-09-22 11:59:03 +02:00
Simon Edwards
46dd4f6093 Fix for duplicating quality changes profiles on the UM2.
Contributes to CURA-2414 Quality changes profiles are created incorrectly
2016-09-21 16:51:30 +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