21225 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Ghostkeeper	5f4051ab5c	Use getApproximateMaterialDiameter instead of rounded getCompatibleMaterialDiameter ... There was a function to round it for us already. Contributes to issue CURA-6600.	2019-09-17 16:41:32 +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	5f2e2d5320	Use correct material diameter, rather than always 3 ... This function shouldn't be called any more anyway, though. Contributes to issue CURA-6600.	2019-09-17 15:58:10 +02:00
Ghostkeeper	614c2970ea	Use getApproximateMaterialDiameter instead of rounded getCompatibleMaterialDiameter ... So we don't need to round it again. Also convert both to float to be robust against the ambiguous serialisation of floats getting in the way (e.g. '3' vs. '3.0'). Python does that sometimes. Contributes to issue CURA-6600.	2019-09-17 15:50:38 +02:00
Ghostkeeper	eaf649023a	Fix setting default material after g-code flavour changes has_materials ... Don't use the material manager here any more. Contributes to issue CURA-6600.	2019-09-17 09:23:33 +02:00
Ghostkeeper	977beb8dbb	Re-build container tree if has_materials changes during runtime ... A bit of a hack and it'll be very slow. But it should work. Right now this crashes though because it still calls the Material Manager. Contributes to issue CURA-6600.	2019-09-17 08:55:29 +02:00
Ghostkeeper	5617784b48	Implement version upgrade for UM2 with Olsson ... Contributes to issue CURA-6775.	2019-09-16 15:38:01 +02:00
Ghostkeeper	8d21f75c40	Merge branch 'feature_intent_container_tree' into feature_intent_upgrade	2019-09-16 15:20:41 +02:00
Ghostkeeper	9b341cf604	Remove UM2 upgrade selection machine action ... Instead of choosing the Olsson block with this wizard, choose it by choosing the correct definition to start with. Contributes to issue CURA-6775.	2019-09-16 15:19:47 +02:00
Ghostkeeper	bda7a6ce0a	Shorten name of UM2E with Olsson ... This is necessary because on some file systems (e.g. encryptfs) the length of these file names is limited and that would crash Cura. Contributes to issue CURA-6775.	2019-09-16 15:15:17 +02:00
Ghostkeeper	3b5716a64a	Add definition for Ultimaker 2 Extended with Olsson Block ... Only the name is now too long by default. I have to shorten it. Contributes to issue CURA-6775.	2019-09-16 15:07:04 +02:00
Ghostkeeper	c6a57a0ab7	Give Ultimaker 2 with Olsson the quality definition of the Ultimaker 2 ... This way, the user's profiles should remain intact after the upgrade. Contributes to issue CURA-6775.	2019-09-16 15:00:05 +02:00
Ghostkeeper	3c9d191a6e	Add separate definition for Ultimaker 2 with Olsson block ... This is necessary because our ContainerTree class can only create one tree per definition. This tree is not created separately for every added printer and as such the tree can't be different for every added printer. However the Ultimaker 2 Olsson block upgrade allows selecting extra variants for the UM2. This changes the available variants in the container tree, so this would be impossible. By making it a separate definition, it now gets a separate tree. However this does mean that we need to do a version upgrade for this as well. Contributes to issue CURA-6775.	2019-09-16 14:57:45 +02:00
Lipu Fei	e1a52f841f	Correct typing	2019-09-16 10:48:39 +02:00
Lipu Fei	4dea8fba76	Merge pull request #6349 from Ultimaker/CURA-6775_fix_crash_empty_containers ... Fix crash when adding printers with empty profile layers	2019-09-16 09:15:10 +02:00
Ghostkeeper	2cca95384d	Don't look for quality group for empty material ... Just don't add it to the list of available intents then. Contributes to issue CURA-6775.	2019-09-13 16:09:02 +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