21777 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ghostkeeper	d0c760d48b	Merge branch 'mb-per-object-setting-check-speedup' of https://github.com/smartavionics/Cura into smartavionics-mb-per-object-setting-check-speedup	2019-10-18 11:27:29 +02:00
Jaime van Kessel	6de7437626	Merge branch 'master' of github.com:Ultimaker/Cura	2019-10-18 10:51:37 +02:00
Jaime van Kessel	0aa2a4994c	Merge branch 'feature_restore_window_geometry' of https://github.com/fieldOfView/Cura	2019-10-18 10:45:28 +02:00
Nino van Hooff	915c8e560c	Fix mypy warning	2019-10-18 09:04:00 +02:00
Ghostkeeper	84c9b28bb2	Move maximum resolution itself out of experimental as well ... This was forgotten accidentally, it seems.	2019-10-18 00:07:43 +02:00
Mark Burton	82bd89991e	Improve code style.	2019-10-17 16:43:07 +01:00
Nino van Hooff	b182830c21	Add tooltips for intent profiles to the Custom Quality panel. ... The description is optional. Tooltip will not show if no description is set CURA-6853	2019-10-17 17:17:06 +02:00
Nino van Hooff	3709cfa4ed	Add tooltips for intent profiles to the Recommended Quality panel. ... The description is optional. Tooltip will not show if no description is set CURA-6853	2019-10-17 15:54:03 +02:00
Nino van Hooff	664ed4a6a6	Take a more generic approach to safe areas for the SimulationView ... Re-implements layer slider positioning CURA-6853	2019-10-17 12:52:30 +02:00
Mark Burton	f3f9a2393f	Return early from _checkStackForErrors() if top container is empty.	2019-10-17 09:21:24 +01:00
Ghostkeeper	ad5fae5b66	Only allow optimising infill travels when combing is enabled ... That's the only time when it will have any effect, since the only thing this does is to calculate the distance to the next infill line better if the nozzle has to make a detour due to combing.	2019-10-17 01:29:24 +02:00
Nino van Hooff	8322a36548	Fix some QML warnings in the MaterialsPage	2019-10-16 16:59:52 +02:00
Ghostkeeper	ad2077b76b	Merge branch 'CURA-6801_remove_quality_manager'	2019-10-16 16:18:53 +02:00
Ghostkeeper	87f9c6d7cc	Add typing for MachineNodeMap's constructor ... Contributes to issue CURA-6793. Co-Authored-By: Jaime van Kessel <nallath@gmail.com>	2019-10-16 14:11:29 +00:00
Ghostkeeper	c12817170c	Merge branch 'master' into CURA-6793_performance	2019-10-16 15:47:41 +02:00
Ghostkeeper	8179dfc412	Make cache of machines a protected field ... We don't want to use it outside of the mapping. This mapping should be transparent. We are still using it from our tests though but that's fine. Tests are allowed to touch private fields. Contributes to issue CURA-6793.	2019-10-16 15:04:07 +02:00
Ghostkeeper	5624f0a8ae	Fix tests with new lazy-loading technique ... The new lazy loading requests different functions from the registry so we need to mock that out. Also fix the manual insertion of things into the lazy-loaded mapping. Contributes to issue CURA-6793.	2019-10-16 14:59:46 +02:00
Remco Burema	f30f157736	Merge pull request #6504 from Ultimaker/CURA-6864_add_s5_intents ... Add UMS5 intent profiles	2019-10-16 14:56:21 +02:00
Ghostkeeper	7348c70af6	Don't get whole container to just get metadata ... A performance improvement, especially in the material models. Contributes to issue CURA-6793.	2019-10-16 13:56:23 +02:00
Ghostkeeper	9b836d95d9	Remove quality, variant and material manager ... We don't use them any more and they are deprecated. Removing them removes a lot of maintenance. Contributes to issue CURA-6801.	2019-10-16 13:00:38 +02:00
Ghostkeeper	9f84304829	Defensive against missing global qualities ... This is just something I encountered. Could be that some profiles got corrupted. In my case, I had a bug in Uranium that I fixed later. Contributes to issue CURA-6793.	2019-10-16 12:56:05 +02:00
Ghostkeeper	401390209f	Robustness against missing approximate diameter ... Pretend like that material doesn't exist then. Contributes to issue CURA-6793.	2019-10-16 10:59:58 +02:00
Lipu Fei	86ff7443cf	Fix QML undefined errors	2019-10-16 10:36:36 +02:00
Nino van Hooff	ac8a7d4aeb	Add whitespace between plugin name and licence string in license dialog	2019-10-16 09:44:09 +02:00
Lipu Fei	ae6f0eb77e	Re-fix quality model update ... CURA-6883	2019-10-15 15:55:21 +02:00
Lipu Fei	d350c9e3d9	Update quality and intent models when extruders get changed ... CURA-6894	2019-10-15 15:53:55 +02:00
Ghostkeeper	f93f26444b	Revert "Fix QualityManagementModel update" ... This reverts commit fe8b7a48e6c4e7d4dc05d21f417a9968bef73cb3. This commit caused Cura to crash when creating a custom quality profile. Contributes to issue CURA-6883.	2019-10-15 15:33:41 +02:00
Ghostkeeper	c875252b53	Fix some mistakes indicated by PyCharm's linting	2019-10-15 15:27:58 +02:00
Lipu Fei	59fa73448a	Fix material diameter change ... CURA-6868	2019-10-15 15:03:35 +02:00
Ghostkeeper	ce4c5a1c93	Remove unnecessary listening to switching extruder tabs ... Also fix unnecessary emitting of switching extruder tabs. This should improve performance a lot. I tested a lot of things and am convinced that it didn't break anything. But the automated GUI tests and QA team should be the final arbiters of that... Contributes to issue CURA-6793.	2019-10-15 15:01:45 +02:00
Lipu Fei	d105150f53	Merge pull request #6533 from Ultimaker/CURA-6863_duplicated_material_oddness ... CURA-6863 duplicated material oddness	2019-10-15 15:00:55 +02:00
Lipu Fei	0af8bd5e94	Fix merge conflicts	2019-10-15 15:00:03 +02:00
Nino van Hooff	e15952b25e	Merge remote-tracking branch 'origin/master'	2019-10-15 14:37:52 +02:00
Nino van Hooff	845cab5573	Clarified comment for duplicating materials	2019-10-15 14:37:37 +02:00
Lipu Fei	fe8b7a48e6	Fix QualityManagementModel update ... CURA-6883	2019-10-15 14:23:50 +02:00
Lipu Fei	e5450a449c	IntentManager should take into account disabled extruders ... CURA-6891	2019-10-15 13:27:58 +02:00
Lipu Fei	43fa4337f9	Fix merge conflicts	2019-10-15 13:08:00 +02:00
Lipu Fei	36aab5d56b	Fix removeMaterials() and optimization ... CURA-6886	2019-10-15 13:04:57 +02:00
Remco Burema	9963c81294	Merge pull request #6537 from Ultimaker/CURA-6862_truncate_profile_names ... CURA-6862_truncate_profile_names	2019-10-15 11:53:36 +02:00
Remco Burema	fde4804a58	Merge branch 'master' into CURA-6862_truncate_profile_names	2019-10-15 11:48:08 +02:00
Remco Burema	71701f15cf	Remove function to reintroduce binding. ... Also force max width to integer value and comment why there is a plain value like 0.7 in the code. part of CURA-6862	2019-10-15 11:38:51 +02:00
Remco Burema	26e578b059	Merge branch 'master' of https://github.com/Ultimaker/Cura	2019-10-15 10:46:46 +02:00
Nino van Hooff	ca21268a12	Elide the profile text in the middle for the PrintSetupSelector. ... This makes sure that at least some part of the name and some part of the variant details (qualityy, diameter) is visible CURA-6862	2019-10-15 10:26:52 +02:00
Lipu Fei	84080b675b	Fix tests	2019-10-15 08:29:53 +02:00
Lipu Fei	577365cf96	Fx containerAdded handling in VariantNode ... CURA-6889	2019-10-15 08:20:25 +02:00
Ghostkeeper	b5c6a0a1e3	Merge branch 'master' into CURA-6793_performance	2019-10-14 17:17:10 +02:00
Ghostkeeper	096b6431c5	Fix typos in g-code comments	2019-10-14 16:01:40 +02:00
Lipu Fei	54f7892f2d	Sort built-in qualities by layer height for all ... CURA-6883	2019-10-14 15:25:30 +02:00
Lipu Fei	2e0fd21c60	Fix setVariantByName()	2019-10-14 14:47:43 +02:00
Lipu Fei	8f66809159	Always show custom qualities ... CURA-6882	2019-10-14 14:34:35 +02:00