20151 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Remco Burema	810fee37eb	Start to test other IntentManager functions. ... Very rudimentary at the moment, need to split the method into 3, and make a class for the setup. This also uncovered that the currentAvailableIntents doesn't (unless the global stack is missing) retrun any default intents, while currentAvailableIntentCategories does do that. Since it's not clear how we're going to handle that right now, I made a TODO in the code, which of course will have to be fixed before this/these branch/es are merged. part of CURA-6091	2019-06-28 12:10:39 +02:00
Remco Burema	6b918dbd1d	Fix typing in IntentCategoryModel.	2019-06-28 12:04:04 +02:00
Remco Burema	2843fc903b	First OK test-case for 'currentAvailableIntents'. ... part of CURA-6091	2019-06-28 11:09:42 +02:00
Remco Burema	e8a1c68d92	Added (partial) test for 'currentAvailableIntents'. ... part of CURA-6091	2019-06-27 17:07:26 +02:00
Lipu Fei	67f10d8bc3	Merge pull request #5885 from Ultimaker/CURA-6329_add_crystallinity_setting ... Add deprime settings	2019-06-27 16:09:36 +02:00
Ghostkeeper	fe0fcc6eec	Change human-readable names of renamed settings too ... Forgot about those. Contributes to issue CURA-6329.	2019-06-26 16:43:11 +02:00
Ghostkeeper	faf256b2f0	Rename deprime settings with the new name ... These have been renamed for greater clarity. We also have to rename them on this side now. Contributes to issue CURA-6329.	2019-06-26 16:41:51 +02:00
Remco Burema	ad4e78c8e4	Merge branch 'master' into feature_intent_per_quality	2019-06-25 18:09:30 +02:00
Remco Burema	9e3f3c194c	Small refactor: Dont retrieve global-stack twice. ... Part of CURA-6091	2019-06-25 18:00:58 +02:00
pkuiper-ultimaker	67191c4040	Merge pull request #5863 from Ultimaker/CURA-6414_no_blob_for_one_at_a_time ... Don't prime-blob when print-sequence is one-at-a-time. [CURA-6414]	2019-06-25 17:44:51 +02:00
Ian Paschal	48a69afbcf	Merge pull request #5912 from Ultimaker/cloud-print-job-actions ... CS-134: Print job actions via cloud	2019-06-25 15:52:10 +02:00
Lipu Fei	934248e218	Merge pull request #5578 from curso007/master ... Adding Geeetech A30 & FLSUN QQ-S machine definitons	2019-06-24 13:27:03 +02:00
Lipu Fei	92d029d18f	Update flsun_qq_s.def.json	2019-06-24 13:22:18 +02:00
Lipu Fei	7bd297bef5	Fix setting_version	2019-06-24 13:21:04 +02:00
Jaime van Kessel	d9358d56cc	Update issue templates ... Added a bit more clarification to the issue template.	2019-06-24 13:20:05 +02:00
Lipu Fei	544e7a1614	Rename Geeetech_A30.def.json to geeetech_a30.def.json	2019-06-24 13:20:04 +02:00
Lipu Fei	6a7da56057	geeetech_a30.def.json ... Fix geeetech_a30.def.json	2019-06-24 13:19:24 +02:00
ChrisTerBeke	1d09cb5b9c	Fix typing for optional data argument ... Co-Authored-By: Jaime van Kessel <nallath@gmail.com>	2019-06-24 13:18:27 +02:00
Jaime van Kessel	9e4f2a441b	Revert "Also upgrade profiles if only the setting version is incorrect" ... This reverts commit 77d396b9bdbfe52f70548b26adcc18038ff6115d. The upgrade only needs to be run if it still uses "profile" as type (eg 2.1 profiles). So for a regular setting version upgrade, this does not need to be run (and breaks importing profiles). Fixes CURA-6592	2019-06-24 11:59:13 +02:00
Jaime van Kessel	0a0b4821ef	Added logging for cases where the upgrade of the profile failed ... CURA-6592	2019-06-24 11:32:43 +02:00
Remco Burema	308fcb6b9f	Fix typing for IntentManager ... Part of CURA-6091.	2019-06-21 15:39:27 +02:00
Remco Burema	02516f0f47	Refactor: Move common fixtures to 'conftest'. ... Part of CURA-6091.	2019-06-21 14:58:55 +02:00
Remco Burema	96bb1e8915	Merge branch 'master' into feature_intent_per_quality	2019-06-21 14:38:30 +02:00
Remco Burema	0f9de9935e	Add unit-test for .intentCategories ... Part of CURA-6091.	2019-06-21 14:37:10 +02:00
Ghostkeeper	f339686c49	Implement category model ... Not just pseudocode. However this code is not yet tested. Contributes to issue CURA-6091.	2019-06-21 12:45:44 +02:00
Ghostkeeper	6273d34eae	Merge branch 'master' of https://github.com/Robokinetics/Cura into Robokinetics-master	2019-06-21 11:33:07 +02:00
Робокинетика	f5d94b9646	Fixed the value of "retraction_amount"	2019-06-21 11:53:06 +03:00
Remco Burema	f03c239041	Update some documentation. [CURA-6091]	2019-06-20 17:57:15 +02:00
Remco Burema	d076bfae77	Merge branch 'feature_intent_per_quality' of https://github.com/Ultimaker/Cura into feature_intent_per_quality	2019-06-20 17:49:41 +02:00
Remco Burema	fd80a6c1b6	Change some leftover pseudo-code to real code. ... Part of CURA-6091.	2019-06-20 17:48:52 +02:00
Ghostkeeper	ede6efb799	Missing documentation ... Contributes to issue CURA-6091.	2019-06-20 16:09:56 +02:00
Remco Burema	53c387f34d	Add TestIntentManager (mostly a dummy file), prevents future conflicts. [CURA-6091]	2019-06-20 16:04:37 +02:00
Ghostkeeper	96c111553a	Implement selectDefaultIntent ... Bit of a weird one. Contributes to issue CURA-6091.	2019-06-20 15:30:57 +02:00
Ghostkeeper	aa0bf2f6ba	Implement selectIntent ... Selects a certain intent profile, applying it to the stack. Contributes to issue CURA-6091.	2019-06-20 15:27:07 +02:00
Ghostkeeper	744fbec38c	Implement defaultIntent ... We keep this function in as a way of documentation. Contributes to issue CURA-6091.	2019-06-20 15:12:53 +02:00
Ghostkeeper	2b775497b5	Implement complete code for currentAvailableIntentCategories ... There is an inconsistency here with the available quality types. It's documented in the function for now. Contributes to issue CURA-6091.	2019-06-20 15:06:24 +02:00
Ghostkeeper	28e2569c86	Implement complete code for currentAvailableIntents ... Slightly more complex than the original pseudocode was indicating: It needs to filter on the available quality types first in order to only show the quality types that can be printed with all extruders, but still show the union of all intents for those quality types. Contributes to issue CURA-6091.	2019-06-20 14:48:18 +02:00
Diego Prado Gesto	efa42ccbd1	Merge branch 'master' into CURA-6329_add_crystallinity_setting	2019-06-20 14:06:18 +02:00
Ghostkeeper	c83b9d158b	Final implementation of intentMetadatas and intentCategories ... Instead of pseudocode. Contributes to issue CURA-6091.	2019-06-20 14:02:34 +02:00
ChrisTerBeke	1ab109ade0	Fix 'resume' action	2019-06-20 13:46:20 +02:00
ChrisTerBeke	baf9dc041c	Fix typing of Any	2019-06-20 12:56:45 +02:00
ChrisTerBeke	0513322f86	Fix expected controller options in test	2019-06-20 12:36:56 +02:00
ChrisTerBeke	93351ec9b9	Show context menu on printers with firmware 5.3 or later	2019-06-20 12:36:15 +02:00
Remco Burema	9845178d26	Remove superfluous bracket (causing 'EOF'). [CURA-6460]	2019-06-20 09:44:19 +02:00
Ghostkeeper	15997685df	Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master	2019-06-20 09:18:16 +02:00
Ghostkeeper	64e3a99ad3	Also select correct quality level on the stack when changing intent ... Contributes to issue CURA-6091.	2019-06-19 16:52:54 +02:00
Ghostkeeper	fa65875824	Add psuedocode/boilerplate for intent manager ... This won't run. Don't try to import this class yet. It's outlining what we need to implement to get intents per stack. It does no form of caching at this point. Build first, optimise later, right. Contributes to issue CURA-6091.	2019-06-19 14:29:19 +02:00
ChrisTerBeke	6cbe89f832	Remove weird file	2019-06-19 13:58:26 +02:00
ChrisTerBeke	eb8d353e11	Add basic support for print job actions via Cloud output device	2019-06-19 13:58:11 +02:00
Ghostkeeper	aea5e50401	Stacks are upgraded to a higher version number ... So indicate to the plug-in metadata that they are.	2019-06-19 13:14:02 +02:00