21117 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jaime van Kessel	febe953226	Don't assert if there are already 7 containers in stack ... CURA-6599 Co-Authored-By: Ghostkeeper <Ghostkeeper@users.noreply.github.com>	2019-09-13 09:29:49 +02:00
Jaime van Kessel	06103b98d5	Ensure that quality_changes get their intent_category set in upgrade ... CURA-6599	2019-09-12 10:30:16 +02:00
Jaime van Kessel	958d3698db	Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_upgrade	2019-09-12 09:50:39 +02:00
Remco Burema	533e0f762f	Merge branch 'feature_intent_container_tree' of https://github.com/Ultimaker/Cura into feature_intent_container_tree	2019-09-11 17:34:49 +02:00
Remco Burema	00b02f95f9	Nix 3mf-read signal-postphoning, which prevented connects. ... This fix was originally made to fix CURA-5056, but it turns out it now gives warnings and possibly messes up 3mf reading instead of fixing it, since it prevents the connection of new listeners to those signals. After removal, the original file this was reported against still loads instead of the crash it was reported to give in the ticket (reproduction rate supposedly 100%) so the removal probably doesn't mess things up. part of CURA-6600	2019-09-11 17:34:44 +02:00
Ghostkeeper	d6e010f22b	Fix iterating over all stacks ... Contributes to issue CURA-6600.	2019-09-11 17:29:10 +02:00
Ghostkeeper	f865151e82	Don't create intent for global stack when duplicating ... Contributes to issue CURA-6600.	2019-09-11 17:28:42 +02:00
Ghostkeeper	2b96543cd3	Store intent category in metadata of quality_changes as well ... This is necessary in order to restore it properly. Contributes to issue CURA_6600.	2019-09-11 16:58:11 +02:00
Ghostkeeper	f6089ed627	Don't use material manager to get list of materials to send ... The material manager is no longer populated so it wouldn't send any materials any more. This is probably faster anyway since it doesn't need to go back to the container registry for every file. Contributes to issue CURA-6600.	2019-09-11 15:43:35 +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	626cd7e85b	Update version numbers of quality files	2019-09-10 15:08:59 +02:00
Jaime van Kessel	d6d06fb85b	Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_upgrade	2019-09-10 15:07:57 +02:00
Ghostkeeper	0b92c3f3df	Use .container property rather than deprecated getContainer() function ... Contributes to issue CURA-6600.	2019-09-10 14:56:16 +02:00
Ghostkeeper	47e1dbe38d	Remove usage of Quality Manager ... This class is deprecated. Constructing it here means that the class gets constructed on the Qt thread and makes it inaccessible for the rest. Contributes to issue CURA-6600.	2019-09-10 14:55:32 +02:00
Ghostkeeper	0d68381e61	Code style: brackets on new line ... Contributes to issue CURA-6600.	2019-09-10 14:52:51 +02:00
Ghostkeeper	ef8b9e98d1	Remove calls to quality manager's private functions ... It should never have been called that way. Contributes to issue CURA-6600.	2019-09-10 14:47:36 +02:00
Jaime van Kessel	7d8911b74d	Fix version upgrade for stacks ... CURA-6599	2019-09-10 11:41:42 +02:00
Diego Prado Gesto	b18565d9cf	Merge branch 'master' into feature_intent_container_tree	2019-09-10 11:08:21 +02:00
Jaime van Kessel	e9862fb348	Move version upgrade for intents from 4.1-4.2 to 4.3-4.4 ... CURA-6599	2019-09-10 10:57:25 +02:00
Ghostkeeper	f561218346	Merge branch '4.3'	2019-09-09 17:37:12 +02:00
Ghostkeeper	8c817e041e	Reduce size of print head without fans for one-at-a-time mode ... This allows you to place models more compactly. According to the discussion at #5590, this was tested to work well. Fixes #5590.	2019-09-09 17:37:01 +02:00
Ghostkeeper	a43de19113	Reduce size of print head without fans for one-at-a-time mode ... This allows you to place models more compactly. According to the discussion at #5590, this was tested to work well. Fixes #5590.	2019-09-09 17:36:14 +02:00
Lipu Fei	3f3aac7ce5	Merge pull request #6289 from Ultimaker/feature_intent_interface ... Feature intent interface	2019-09-09 16:53:37 +02:00
Ghostkeeper	5debdd4cf6	Fix getting extruder list everywhere ... Didn't test this beyond my own automated test, it seems. Contributes to issue CURA-6600.	2019-09-09 16:47:29 +02:00
Lipu Fei	dba3b77f61	Fix tests ... CURA-6598	2019-09-09 16:45:39 +02:00
Diego Prado Gesto	ddcd8e40cc	Merge pull request #6292 from samirabaza/patch-7 ... Update printrbot_simple.def.json	2019-09-09 16:26:51 +02:00
Lipu Fei	04e2ecde93	Init intent to empty_intent_container for new machine stacks ... CURA-6598	2019-09-09 16:12:37 +02:00
Ghostkeeper	eb401defdf	Add deprecated marker on extruders: Use extruderList ... Extruders is dangerous because it's a dict of which the values are randomly ordered. The keys are often cast to int so you can't use anything else than integer numbers. And then they are often cast back so if you're not properly counting from 0 you're also in trouble. So please, only use the list. Eventually we can switch the data structure around.	2019-09-09 14:21:57 +02:00
Jaime van Kessel	8c893caf9f	Merge pull request #6315 from Ultimaker/CURA-6755_add_retract_continue_script ... Add retract-continue script	2019-09-09 13:05:33 +02:00
Lipu Fei	ea8b7ebd02	Fix remove all nodes for loaded gcode ... Fixes the problem caused in UM commit 69057b48a1fc3df7c5c6f3e754a3beb285a94678	2019-09-09 11:49:25 +02:00
ChrisTerBeke	669fb39f40	Catch type errors when trying to populate models from API response	2019-09-09 10:44:17 +02:00
Jaime van Kessel	6f8c6b4af7	Merge branch 'master' of github.com:Ultimaker/Cura	2019-09-09 09:10:08 +02:00
Jaime van Kessel	5463f7600b	Add processEvent calls so progress bar moves while loading ... CURA-6572	2019-09-09 09:08:52 +02:00
Ghostkeeper	354729b621	Only show support flow if support is enabled	2019-09-07 23:19:59 +02:00
Ghostkeeper	5e302c6a67	Fix display of Z Hop After Extruder Switch Height on single extruder ... If the setting is enabled on a single extruder printer, it'll show the Z Hop Height setting anyway even though it has no effect.	2019-09-07 23:18:02 +02:00
Ghostkeeper	178887d8e5	Add test for getting metadata from machine node ... Contributes to issue CURA-6600.	2019-09-06 17:40:31 +02:00
Jaime van Kessel	7d3a2c60d4	Added some missing typing	2019-09-06 17:38:22 +02:00
Jaime van Kessel	5e41443bef	Merge branch 'master' of github.com:Ultimaker/Cura	2019-09-06 17:26:42 +02:00
Ghostkeeper	5106d3b7c1	Test if we actually return the result of the call to getQuality[Changes]Groups ... Contributes to issue CURA-6600.	2019-09-06 17:26:38 +02:00
Jaime van Kessel	6f92537305	Add unhappy test for serializing nonbase material	2019-09-06 17:26:28 +02:00
Ghostkeeper	7f192ce36f	Add test for getting current quality changes groups ... Similar to getting the current quality groups. Contributes to issue CURA-6600.	2019-09-06 17:25:07 +02:00
Jaime van Kessel	09025edffa	Convert some class functions to static ... Since they didn't access any class attributes, there is no need for them to be classMethods	2019-09-06 17:22:40 +02:00
Ghostkeeper	ea5530c507	Add test for getting quality changes groups without global stack ... Shouldn't crash. Instead it should give no quality changes groups. Contributes to issue CURA-6600.	2019-09-06 17:21:56 +02:00
Ghostkeeper	8bcd9b339a	Use GlobalStack.extrudersList instead of GlobalStack.extruders to iterate ... Otherwise the iteration can happen in any arbitrary order (due to the dict) and this can cause the result to not match to the desired combination of configurations per extruder. Contributes to issue CURA-6600.	2019-09-06 17:20:03 +02:00
Jaime van Kessel	94b6f7864f	Add some tests for XMLMaterialProfile	2019-09-06 17:19:23 +02:00
Ghostkeeper	4bdc819f12	Fix nondetermistic result with dictionary values list ... Because global_stack.extruders.values can be returned in any order, the configurations matching with the lists doesn't always give a result. It happened to work on my computer with the test, but there is no guarantee of that. This is probably also going wrong in other places. I don't think we should use the .extruders property anywhere really! Contributes to issue CURA-6600.	2019-09-06 17:15:45 +02:00
Ghostkeeper	d618f2df71	Add test for getCurrentQualityGroups ... The test succeeded but in writing it I discovered a bug. I'll fix that soon. Contributes to issue CURA-6600.	2019-09-06 17:06:32 +02:00
Ghostkeeper	47fab6e16f	Merge branch '4.3'	2019-09-06 16:04:26 +02:00
Ian Paschal	f517beba76	Fix typo ... CS-171	2019-09-06 16:04:03 +02:00