21242 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Lipu Fei	ddab8e204a	Add typing ... CURA-6800	2019-09-23 11:43:50 +02:00
Jaime van Kessel	08ffafa475	Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent	2019-09-23 11:19:19 +02:00
Jaime van Kessel	a4ed51342c	Fix favorite not being checked properly in MaterialMenu ... CURA-6804	2019-09-23 11:18:47 +02:00
Lipu Fei	1aa6708677	Fix typing	2019-09-23 10:59:31 +02:00
Lipu Fei	18d93d0b7b	Fix UM2 extended variants ... CURA-6775	2019-09-23 10:43:58 +02:00
Ghostkeeper	61527e082e	Mock ContainerTree instead of ContainerRegistry ... The intent models are now using the ContainerTree to build themselves rather than the registry.	2019-09-23 09:59:57 +02:00
Remco Burema	cb7d99d2dc	Revert "Make 3MF-reader aware of setting-version for introduction Intent." ... This reverts commit 16ea437255f059d7de2e9d76a4aba4e0d2cb74ab. Should have been (and is now) done in the version upgrade instead.	2019-09-20 11:56:08 +02:00
Ghostkeeper	3479a3df76	Fix _applyVariants using variant manager ... The variant manager doesn't get properly filled any more. Contributes to issue CURA-6776.	2019-09-20 09:57:36 +02:00
Ghostkeeper	4a68e7ec95	Fix favorite materials without material manager ... We just track it via the preference value itself rather than duplicating that in any other data structure. It's simple enough. Contributes to issue CURA-6776.	2019-09-20 09:57:36 +02:00
Ghostkeeper	12043df367	Don't use material manager to find or remove materials ... That remove function in the material manager was very weird... Contributes to issue CURA-6776.	2019-09-20 09:57:36 +02:00
Ghostkeeper	cc9115b3d3	Don't use material manager to reset material ... Use the container tree. Contributes to issue CURA-6776.	2019-09-20 09:57:35 +02:00
Ghostkeeper	105e782e75	Remove unused imports to MaterialManager ... Contributes to issue CURA-6776.	2019-09-20 09:57:35 +02:00
Ghostkeeper	729019a2dc	Don't use material manager to reset the material after uninstalling material package ... This class is deprecated. Contributes to issue CURA-6776.	2019-09-20 09:57:27 +02:00
Jaime van Kessel	71a22bf194	Fix few profiles that didn't have global_quality set	2019-09-19 17:31:18 +02:00
Jaime van Kessel	fff37354e2	Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent	2019-09-19 17:16:48 +02:00
Jaime van Kessel	a69a394514	Fix container tree generation for machines that only have global profiles ... CURA-6775	2019-09-19 17:16:15 +02:00
Remco Burema	37aca7d361	Menu items should be removed by index, not by object. ... part of CURA-6791	2019-09-19 17:00:16 +02:00
Jaime van Kessel	fe18e73e5b	Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent	2019-09-19 16:47:14 +02:00
Jaime van Kessel	fc67090a2f	Fix crash when adding UMO	2019-09-19 16:15:00 +02:00
Jaime van Kessel	7dcf083991	Fix container tree for printers that have no variants but do have qualities & materials ... CURA-6775	2019-09-19 15:56:06 +02:00
Lipu Fei	5690f61d40	Merge pull request #6269 from Ultimaker/feature_intent_container_tree ... Container tree structure	2019-09-19 15:51:21 +02:00
Jaime van Kessel	7016e791c8	Fix containertree for machines without materials but with specific qualities ... CURA-6775	2019-09-19 15:33:19 +02:00
Jaime van Kessel	830b22e381	Fix crash when adding a machine without materials ... CURA-6775	2019-09-19 15:12:29 +02:00
Jaime van Kessel	2b4144386f	Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_container_tree	2019-09-19 14:56:12 +02:00
Jaime van Kessel	3e474c1107	Ensure that enabling & disabling an extruder gets handled correctly ... CURA-6775	2019-09-19 14:54:58 +02:00
Lipu Fei	a3263da3f4	Merge pull request #6338 from Ultimaker/feature_intent_upgrade ... Feature intent upgrade	2019-09-19 14:44:52 +02:00
Lipu Fei	472e6e88c3	Fix typing	2019-09-19 14:39:03 +02:00
Lipu Fei	6e625b2cf8	Fix typing	2019-09-19 14:34:52 +02:00
Jaime van Kessel	3730ea247d	Ensure that intent gets updated when changing quality / material ... CURA-6775	2019-09-19 14:26:18 +02:00
Lipu Fei	d8b59c4471	Fix renamed um2 nozzles ... CURA-6599	2019-09-19 14:26:01 +02:00
Lipu Fei	823f7e5921	Merge remote-tracking branch 'origin/feature_intent_container_tree' into feature_intent_upgrade	2019-09-19 14:14:29 +02:00
Jaime van Kessel	c76c183c6b	Remove unused code	2019-09-19 13:45:13 +02:00
Jaime van Kessel	884a3ea819	Fix selection for intents if only one of the extruders has an intent ... CURA-6598	2019-09-19 09:54:47 +02:00
Jaime van Kessel	49276db073	Fix display of intent in profile selection ... CURA-6598	2019-09-19 09:39:52 +02:00
Jaime van Kessel	78ab218cc2	No longer reset to default intent when configuration changed ... This caused the intent to be reset every time a change was made. CURA-6600	2019-09-18 14:52:51 +02:00
Jaime van Kessel	ede007b860	Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_container_tree	2019-09-18 14:39:30 +02:00
Jaime van Kessel	7693de325a	Add loggin when user tries to change intent ... CURA-6598	2019-09-18 14:39:06 +02:00
Ghostkeeper	05de920c21	Once more with feeling ... Sorry, I didn't see the other review comment until after I pushed the previous commit. Contributes to issue CURA-6600.	2019-09-18 14:28:22 +02:00
Ghostkeeper	a3e9316f48	Rename all_root_materials to all_base_files ... This naming is more consistent with the naming of the metadata entry and most of the other code. Contributes to issue CURA-6600.	2019-09-18 14:27:04 +02:00
Jaime van Kessel	84e5114566	Fix minor review comments ... CURA-6598	2019-09-18 14:17:26 +02:00
Jaime van Kessel	fade8d3644	No longer make border width hardcoded ... CURA-6598	2019-09-18 14:10:52 +02:00
Ghostkeeper	2571f54d3c	Simplify looping over quality groups ... Contributes to issue CURA-6600.	2019-09-18 14:01:23 +02:00
Ghostkeeper	b460ffeb9b	Use removeMaterial from MaterialManagementModel ... Contributes to issue CURA-6600.	2019-09-17 17:59:50 +02:00
Ghostkeeper	8710bb77a7	Use MaterialManagementModel to rename materials ... It's the replacement for the deprecation. Contributes to issue CURA-6600.	2019-09-17 17:57:32 +02:00
Ghostkeeper	9392a3553c	Use implementation from MaterialManagementModel ... The material manager is deprecated now. Contributes to issue CURA-6600.	2019-09-17 17:54:26 +02:00
Ghostkeeper	0eb3c5c0d6	Refer material manager functions through to material management model ... That's where the materials are duplicated now. So we only maintain one implementation of that. Contributes to issue CURA-6600.	2019-09-17 17:50:38 +02:00
Ghostkeeper	963f5e6dd7	Use getApproximateMaterialDiameter rather than getCompatibleMaterialDiameter ... Should we deprecate getCompatibleMaterialDiameter? I don't think the un-rounded diameter should ever be used for compatibility checks. Contributes to issue CURA-6600.	2019-09-17 17:03:05 +02:00
Ghostkeeper	80e79f6e7e	Remove TODO ... Was done in previous commit, but I already pushed so no more --amend now. Contributes to issue CURA-6600.	2019-09-17 16:58:12 +02:00
Ghostkeeper	fc679758ef	Optimise getting intent categories ... It's in the container tree, so there's no need for separate queries to the container registry. Contributes to issue CURA-6600.	2019-09-17 16:57:16 +02:00
Ghostkeeper	3712f9c1f8	Correct parameter name ... It's the base file, not the ID. Contributes to issue CURA-6600.	2019-09-17 16:56:00 +02:00