2372 commits

Author	SHA1	Message	Date
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	3c2467b6d6	Merge branch 'feature_intent' of https://github.com/Ultimaker/Cura into feature_intent	2019-09-26 14:02:32 +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
Jaime van Kessel	eced1fe907	Fix updating a profile with changed settings	2019-09-26 14:02:11 +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	a741530db2	Also ensure that the container tree is used when selecting an intent ... CURA-6807	2019-09-24 13:17:36 +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
Jaime van Kessel	7e3f265068	Add a function to add a MachineNode to the tree. ... This solves the issue that machines created by the stack builder broke the material updating CURA-6791	2019-09-23 13:18:11 +02:00
Lipu Fei	ddab8e204a	Add typing ... CURA-6800	2019-09-23 11:43:50 +02:00
Remco Burema	cb7d99d2dc	Revert "Make 3MF-reader aware of setting-version for introduction Intent." ... This reverts commit 16ea437255. Should have been (and is now) done in the version upgrade instead.	2019-09-20 11:56:08 +02:00
Ghostkeeper	105e782e75	Remove unused imports to MaterialManager ... Contributes to issue CURA-6776.	2019-09-20 09:57:35 +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
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	7693de325a	Add loggin when user tries to change intent ... CURA-6598	2019-09-18 14:39:06 +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
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
Ghostkeeper	7942db5147	Give empty material the required material properties ... It needs a GUID, base file and material type to show up in the material nodes in the container tree. Contributes to issue CURA-6775.	2019-09-13 16:07:33 +02:00
Ghostkeeper	bb0c9c80dc	Don't use material groups to find just the root container ... Just look it up in the container registry. If you know the ID, this look-up is just a dictionary look-up as well. Contributes to issue CURA-6600.	2019-09-13 14:42:27 +02:00
Diego Prado Gesto	bca68c6db0	Merge branch 'feature_intent' into feature_intent_container_tree	2019-09-13 09:02:51 +02:00
Diego Prado Gesto	d38e60ce06	Merge branch 'master' into feature_intent	2019-09-13 09:02:30 +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	1b9e710f72	Fix exporting with new quality changes groups ... Those groups are starting to become a bit cumbersome... Contributes to issue CURA-6600.	2019-09-12 13:40:47 +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
ChrisTerBeke	558698add7	Merge branch '4.3'	2019-09-12 12:04:01 +02:00