849 Commits

Author	SHA1	Message	Date
Ghostkeeper	6c0772cd4a	Provide activeQualityGroupName instead of QualityGroup(QObject) ... We don't need to inherit from QObject if we expose the name elsewhere. This prevents having workarounds for C++ vs QML ownership, and also allows us to test this while mocking out CuraApplication. Done during Turbo Testing and Tooling.	2019-10-04 15:35:32 +02:00
Lipu Fei	c528000268	Add activeQualityDisplayName to remove code duplication ... CURA-6846	2019-10-04 14:26:20 +02:00
Jaime van Kessel	e197fe99fa	Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent	2019-10-04 10:33:57 +02:00
Jaime van Kessel	c86f28cc9e	Ignore disabled extruders when checking for intent warning ... CURA-6601	2019-10-04 10:33:13 +02:00
Lipu Fei	61a1b61756	Remove unnecessary activeQualityName property ... CURA-6846	2019-10-04 10:27:39 +02:00
Lipu Fei	bd84c4d98d	Show quality and intent a custom profile is based on ... CURA-6846	2019-10-03 14:18:51 +02:00
Remco Burema	784396424c	Get old diameter from old material instead of new candidate. ... part of CURA-6821	2019-10-02 15:46:01 +02:00
Lipu Fei	179fa325fc	Merge pull request #6458 from Ultimaker/CURA-6817_intent_fix_sync_config ... Fix synchronise configurations (intent branch).	2019-10-02 08:53:53 +02:00
Lipu Fei	89c35cd03c	Simplify code ... CURA-6817	2019-10-02 08:53:00 +02:00
Lipu Fei	be33a9aa7e	Fix updating current root material IDs ... CURA-6821	2019-10-02 08:41:05 +02:00
Remco Burema	a1d90c17da	Fix synchronize configurations (intent branch). ... - Approximate diameter needed to be a string. - GUID-tag is mostly in capitals. - Workaround for an overload of 'get' not being called (default parameter didn't work somehow?). part of CURA-6817	2019-10-01 16:46:11 +02:00
Lipu Fei	c030328b7f	Fix intent profile selection ... CURA-6810	2019-10-01 15:21:01 +02:00
Lipu Fei	ad7b58e460	Get diameter from material container ... CURA-6821	2019-10-01 15:05:35 +02:00
Lipu Fei	aaca4bb9a1	Fix KeyError in root material ID check ... CURA-6827	2019-10-01 11:58:54 +02:00
Lipu Fei	51c96aecde	Fix for-loop in updateMaterialWithVariant ... CURA-6821	2019-10-01 11:43:46 +02:00
Lipu Fei	df105bc822	Fix update material due to compatible material diameter change ... CURA-6821	2019-10-01 10:40:16 +02:00
Jaime van Kessel	916bb5a32b	Select correct intent when quality_changes has an intent category	2019-09-30 12:55:10 +02:00
Ghostkeeper	f33937eb7b	Use extruderList instead of extruders ... The extruders attribute is deprecated. Found during testing and tooling.	2019-09-27 15:25:41 +02:00
Jaime van Kessel	f5639192ee	Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent	2019-09-26 16:27:19 +02:00
Jaime van Kessel	b19e7cd027	Add warning icon when not all extruders have same intent ... CURA-6601	2019-09-26 16:26:55 +02:00
Remco Burema	e452c640d4	Set empty intent if quality is empty. ... ... instead of crashing. Not _really_ part of a ticket, but I'm solving this now because otherwise I can't even _reproduce_ the steps for the bug in CURA-6807	2019-09-26 14:02:21 +02:00
Lipu Fei	9ced5e9205	Fix QObject segfaults in QML ... CURA-6599	2019-09-25 14:38:38 +02:00
Lipu Fei	94e89ad4ac	Fix merge conflicts with master	2019-09-24 14:26:43 +02:00
Jaime van Kessel	56c7fb9f7d	Merge branch 'CURA-6800_project_file_intent' of github.com:Ultimaker/Cura into feature_intent	2019-09-24 10:34:21 +02:00
Ghostkeeper	557746a832	Partial fix for intent manager not finding correct profile in test ... Only in test.	2019-09-23 15:17:15 +02:00
Lipu Fei	ddab8e204a	Add typing ... CURA-6800	2019-09-23 11:43:50 +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	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
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
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	37d54071f0	Don't use material manager any more to sync with printers ... Or to change material from a base file ID. Contributes to issue CURA-6600.	2019-09-17 16:35:39 +02:00
Ghostkeeper	b34895703b	Merge branch '4.3'	2019-09-17 13:08:49 +02:00
Diego Prado Gesto	5a95788493	Use the setting's default value when the global variant instance container is empty ... Otherwise it will never show as a matching configuration in the configuration list.	2019-09-17 09:52:44 +02:00
Jaime van Kessel	6ff59bf5ab	Fix some more issues with the custom FF printer	2019-09-16 11:48:10 +02:00
Jaime van Kessel	e964035653	Fix adding custom FFF printer	2019-09-16 11:40:32 +02:00
Jaime van Kessel	0ff9d72c4c	Remove use of deprecated extruders property	2019-09-13 17:27:16 +02:00
Diego Prado Gesto	bca68c6db0	Merge branch 'feature_intent' into feature_intent_container_tree	2019-09-13 09:02:51 +02:00
Ghostkeeper	f4a2f3efa6	Emit activeStackChanged as documented when containers in the active stack change ... This fixes updating the intent models when you switch nozzles. Among other things, probably. Contributes to issue CURA-6600.	2019-09-12 17:27:30 +02:00
Ghostkeeper	92d2686fed	Pick quality changes group from quality changes groups, not quality groups ... Oops. Probably went wrong when I copied over this code from some other place. Contributes to issue CURA-6600.	2019-09-12 15:19:06 +02:00
Ghostkeeper	4f936f5c23	Fix getting active quality changes group from machine manager ... I have the feeling that we have multiple implementations of this but it's hard to find... Contributes to issue CURA-6600.	2019-09-12 13:28:59 +02:00
Jaime van Kessel	a279ee5f22	Fix sync issues when printer was added by cloud ... CURA-6769	2019-09-12 11:21:09 +02:00
Ghostkeeper	f8d72b2ea7	Fix crash when adding first quality changes profile ... This dictionary is keyed by position integers, not position strings. Contributes to issue CURA-6600.	2019-09-10 15:33:32 +02:00
Ghostkeeper	a313255bc7	Use integer positions to get quality changes per extruder from group ... It's all a mix right now... Contributes to issue CURA-6600.	2019-09-10 15:10:42 +02:00
Jaime van Kessel	b00b8c8c58	Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_interface	2019-08-29 16:28:26 +02:00
Jaime van Kessel	d548404dfd	Fix typing issues	2019-08-29 16:23:10 +02:00