6290 Commits

Author	SHA1	Message	Date
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
Lipu Fei	e5d94fd2e4	Change to "name" property ... CURA-6599	2019-09-26 17:19:15 +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
Nino van Hooff	e9965ab2a6	Revert the OneAtATimeIterator to the pre 06-2018 implementation. ... This seems like a better starting point to fix print head collisions, because we got less bug reports for it compared to the 2018 rewrite. CURA-6785	2019-09-26 10:42:54 +02:00
Jaime van Kessel	241ca56e6e	Fix stupid derp issue ... I really need coffee before coding	2019-09-26 09:46:02 +02:00
Jaime van Kessel	dbbeeef9a5	Don't render buildvolume if it's set to invisible	2019-09-26 09:11:54 +02:00
Lipu Fei	9ced5e9205	Fix QObject segfaults in QML ... CURA-6599	2019-09-25 14:38:38 +02:00
Lipu Fei	d1330e5ffa	Fix updating custom quality menu model ... CURA-6599	2019-09-25 14:36:46 +02:00
Lipu Fei	f395c92732	Fix custom profile menu ... CURA-6599	2019-09-25 08:28:24 +02:00
Lipu Fei	f2e518da6b	Fix code style and typing	2019-09-25 08:23:57 +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	f469b99471	Create intent nodes based on the selected quality type ... Previously it would use the material type from the material, but since the material from the node can be different to that of the quality, we need to use the one from quality instead (This is due to the fallback system) CURA-6807	2019-09-24 11:57:50 +02:00
Lipu Fei	1977a865f1	Fix HMS434 version upgrade ... CURA-6774	2019-09-24 11:05:52 +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
Jaime van Kessel	2d1dec098b	Merge branch '4.3' of github.com:Ultimaker/Cura	2019-09-24 09:27:23 +02:00
Jaime van Kessel	3ab0b5decf	Add extra exception handling for UFPwriter	2019-09-24 09:24:36 +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
Ghostkeeper	4bf8ea9332	Merge branch '4.3'	2019-09-23 11:25:31 +02:00
Ghostkeeper	cb045fb0c2	Update default SDK version ... Just in time.	2019-09-23 11:24:20 +02:00
Lipu Fei	1aa6708677	Fix typing	2019-09-23 10:59:31 +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	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
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
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
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	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	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	7693de325a	Add loggin when user tries to change intent ... CURA-6598	2019-09-18 14:39:06 +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