21509 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ghostkeeper	30e268e975	Add test for preferred material's diameter check ... Done during Turbo Testing and Tooling.	2019-10-04 17:16:59 +02:00
Ghostkeeper	54fcb38fe6	Add test for preferred material matching on submaterials ... Done during Turbo Testing and Tooling.	2019-10-04 17:11:32 +02:00
Ghostkeeper	a117e937b9	Add test for preferred material with the happy flow ... The exact preferred material is available. Pick that.	2019-10-04 17:07:45 +02:00
Ghostkeeper	e5c0812acc	Fix scrolling through profiles on Qt5.12+ ... Contributes to issue CURA-6843.	2019-10-04 16:22:34 +02:00
Jaime van Kessel	b3b28bc330	Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent	2019-10-04 15:46:41 +02:00
Ghostkeeper	2671f12c21	Add test for is_available on resulting quality groups ... Done during Turbo Testing and Tooling.	2019-10-04 15:35:33 +02:00
Ghostkeeper	5ae248341b	Add test for getting quality groups from the container tree ... Finally it works. Done during turbo testing and tooling.	2019-10-04 15:35:33 +02:00
Ghostkeeper	05801bb623	Directly ask metadata from node instead of container ... We only need the metadata, so far. Found with a test that got broken because I wasn't mocking out the entire container. Done during Turbo Testing and Tooling.	2019-10-04 15:35:33 +02:00
Ghostkeeper	faa32ed33e	Remove another workaround in construction of QualityGroup ... Like the previous commit. Done during Turbo Testing and Tooling.	2019-10-04 15:35:32 +02:00
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
Ghostkeeper	6f2f15c74f	Use pre-cached quality type from node rather than re-requesting it ... Minor performance increase. Done during Turbo Testing and Tooling.	2019-10-04 15:35:32 +02:00
Ghostkeeper	0a6842703c	Update documentation ... This class no longer applies to quality changes. Quality changes groups don't exist any more. Done during Turbo Testing and Tooling.	2019-10-04 15:35:24 +02:00
THeijmans	1cfcbf0b53	Clean up intent profiles ... For when infill and/or wall speeds are not formula based in the underlying quality profile.	2019-10-04 15:05:52 +02:00
Lipu Fei	c528000268	Add activeQualityDisplayName to remove code duplication ... CURA-6846	2019-10-04 14:26:20 +02:00
Jaime van Kessel	85ed22de4c	Add some profiling decorators to the ContainerTree	2019-10-04 13:29:22 +02:00
Ghostkeeper	618cbffaa7	Apply screenScaleFactor to implicitWidth (and cleanup)	2019-10-04 12:58:40 +02:00
Lipu Fei	e5c59b1308	Fix TestVariantNode	2019-10-04 11:00:01 +02:00
Jaime van Kessel	71e9fb8a22	Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent	2019-10-04 10:39:30 +02:00
Jaime van Kessel	5bd5875a20	Also add intent warning to custom print setup ... CURA-6601	2019-10-04 10:39:02 +02:00
Lipu Fei	7233bdb255	Fix TestMachineNode: remove invalid property has_machine_materials	2019-10-04 10:37:45 +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	0d554c4938	Merge remote-tracking branch 'origin/master' into feature_intent	2019-10-04 10:19:36 +02:00
Jaime van Kessel	4793c77380	Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent	2019-10-04 09:39:47 +02:00
Jaime van Kessel	f8951e4140	Add scrollbar to profile dropdown ... CURA-6843	2019-10-04 09:39:26 +02:00
Ghostkeeper	38ae0e75f2	Fallback to fdmprinter if not has_machine_quality ... Contributes to issue CURA-6847.	2019-10-03 16:25:09 +02:00
Lipu Fei	877bb1efdb	Diable local printer ListView buffer to force redraw ... CURA-6793	2019-10-03 15:56:00 +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
Lipu Fei	027768f151	Use machine def id as quality_definition fallback ... CURA-6847	2019-10-03 12:56:22 +02:00
Lipu Fei	26b523f190	Fix quality profile menu size ... CURA-6838	2019-10-03 12:37:11 +02:00
Lipu Fei	ba805b9da3	Fix QML errors ... CURA-6849	2019-10-03 12:28:07 +02:00
Lipu Fei	2d59271a69	Remove hard-coded height	2019-10-03 12:28:07 +02:00
Jaime van Kessel	2059042e60	Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent	2019-10-03 09:52:23 +02:00
Jaime van Kessel	1def289bb9	Fix crash when importing profile that has different quality_definition ... CURA-6847	2019-10-03 09:51:45 +02:00
Lipu Fei	a93fd982dd	Fix renaming custom profile ... CURA-6842	2019-10-02 23:59:48 +02:00
Jaime van Kessel	b78f34db12	Merge pull request #6434 from Ultimaker/CURA-6785_one_at_a_time_ordering ... Cura 6785 one at a time ordering	2019-10-02 17:37:41 +02:00
Jaime van Kessel	fba7a6ff33	Fix importing profiles ... CURA-6847	2019-10-02 17:01:21 +02:00
Jaime van Kessel	8beeac7fca	Make the radio button in the checkbar look consistent. ... The drake meme and CURA-6845 told me that it should look like that.	2019-10-02 16:57:04 +02:00
Jaime van Kessel	ff3837bac5	Only show "Custom Profile" header if there are custom profiles ... CURA-6844	2019-10-02 16:48:57 +02:00
Jaime van Kessel	c6850b4f73	Set right text color if menubutton is disbled ... CURA-6848	2019-10-02 16:39:50 +02:00
Remco Burema	8f2caf362d	Merge branch 'feature_intent' of https://github.com/Ultimaker/Cura into feature_intent	2019-10-02 16:12:14 +02:00
Jaime van Kessel	5ec6b2fdf7	Fix typing ... CURA-6785	2019-10-02 15:48:10 +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
Nino van Hooff	1b1029a3e0	Use 2 leading spaces for doxygen documentation ... CURA-6785	2019-10-02 13:13:32 +02:00
Nino van Hooff	9512030060	Check for adhesion area collisions in one-at-a-time ordering ... CURA-6785	2019-10-02 13:09:37 +02:00
Jaime van Kessel	3199d5f9ad	Merge branch 'master' of github.com:Ultimaker/Cura	2019-10-02 13:06:52 +02:00
Jaime van Kessel	f5f91c9c3a	Ensure that profiles are cleaned up if one of the set is incorrect	2019-10-02 13:06:27 +02:00
Ghostkeeper	672fc58930	Allow down to half the layer height for infill layer thickness ... This is possible because CuraEngine rounds these to the nearest layer thickness. So if it's more than half the layer height it gets rounded up and it's still properly one layer. Contributes to issue #6465.	2019-10-02 12:59:48 +02:00
Lipu Fei	750632ec41	Merge remote-tracking branch 'origin/master' into feature_intent	2019-10-02 12:52:37 +02:00