172 Commits

Author	SHA1	Message	Date
Ghostkeeper	ffac9adb96	Add default for extruder position ... The position argument metadata always be there. However if it's not (because the file is old, or manually modified, or a version upgrade worked incorrectly, or whatever) then we shouldn't crash. We just don't know how to order it correctly then. This tries to repair it as best it can.	2020-06-25 15:08:08 +02:00
Nino van Hooff	58ffc9dcae	Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments ... # Conflicts: # cura/API/__init__.py # cura/Settings/CuraContainerRegistry.py # cura/Settings/ExtruderManager.py # plugins/PostProcessingPlugin/scripts/PauseAtHeight.py # plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py # plugins/UM3NetworkPrinting/src/Cloud/ToolPathUploader.py # plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py	2020-05-28 17:31:24 +02:00
Nino van Hooff	c2c96faf5f	Convert remaining doxygen to rst	2020-05-28 17:13:44 +02:00
Ghostkeeper	4482b4f352	Use extruderList rather than deprecated extruders ... This fixes a possible bug, too, if the extruders dictionary weren't iterated over in the order of the extruders. It would sometimes assign the profiles to the wrong extruders then. However I think the dictionary iteration in Python is in order of insertion and we probably insert them in the proper order by accident. Done during Turbo Testing and Tooling to reduce the number of warnings in our log.	2020-05-15 15:14:56 +02:00
Ghostkeeper	e0e0371de4	Use extruderList rather than extruders ... Removes another warning from the log. And it makes the code simpler in this case. Done during Turbo Testing and Tooling to reduce the number of warnings in our log file.	2020-05-15 15:10:30 +02:00
Jaime van Kessel	e74f049142	Fix bunch of issues found by pylint	2020-01-10 16:37:46 +01:00
Lipu Fei	0d554c4938	Merge remote-tracking branch 'origin/master' into feature_intent	2019-10-04 10:19:36 +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	027768f151	Use machine def id as quality_definition fallback ... CURA-6847	2019-10-03 12:56:22 +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
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	1b9e710f72	Fix exporting with new quality changes groups ... Those groups are starting to become a bit cumbersome... Contributes to issue CURA-6600.	2019-09-12 13:40:47 +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
Diego Prado Gesto	b18565d9cf	Merge branch 'master' into feature_intent_container_tree	2019-09-10 11:08:21 +02:00
Ghostkeeper	2f917c2841	Change definition ID upon reading profile ... Implements CURA-6713.	2019-09-03 15:38:41 +02:00
Ghostkeeper	c41af1b9a0	Remove user-visible XML tags ... These XML tags are outside of the i18n call and are therefore not removed by gettext. They should not be present there.	2019-09-03 14:00:09 +02:00
Ghostkeeper	b9370f864e	Get quality definition from container tree ... Contributes to issue CURA-6600.	2019-08-28 14:34:00 +02:00
Ghostkeeper	ae77f9124c	Use container tree to determine quality_definition of profile and printer ... To see if they match. Contributes to issue CURA-6600.	2019-08-28 13:55:11 +02:00
Ghostkeeper	61e13087cd	Fix testing for available quality types ... Contributes to issue CURA-6600.	2019-08-28 13:26:18 +02:00
Ghostkeeper	6dd0333626	Use container tree instead of getMachineDefinitionIdForQualitySearch ... It's in the metadata there, so use it. Contributes to issue CURA-6600.	2019-08-28 13:21:23 +02:00
Remco Burema	745390e51f	Fix typing. ... part CURA-6600	2019-08-27 17:57:11 +02:00
Lipu Fei	69e9dc1313	Allow importing "not supported" profiles ... CURA-6542	2019-08-27 09:08:19 +02:00
Jaime van Kessel	108b22932b	Override saveDirtyContainers with Cura specific logic	2019-08-26 14:55:30 +02:00
Ghostkeeper	648999e32b	Use regex literal instead of normal literal for regex ... Hopefully this fixes the deprecation warning in newer Python versions. Contributes to issue #6114.	2019-08-08 09:46:21 +02:00
Jaime van Kessel	5f692f3028	Added missing typing	2019-08-02 15:16:29 +02:00
Ghostkeeper	7fbdccffdb	Add typing	2019-06-18 12:00:22 +02:00
Jaime van Kessel	14d5fa5529	Add a bunch of tests for importing profiles	2019-05-31 13:59:54 +02:00
Jaime van Kessel	43360aace0	Add tests for ExportQualityProfile	2019-05-31 13:07:03 +02:00
Jaime van Kessel	0616601250	Merge branch '4.0' of github.com:Ultimaker/Cura	2019-03-11 10:39:23 +01:00
Ghostkeeper	3c779b58de	Specialise _isMetadataValid for Cura to check setting_version ... Because we need to reject loading metadata for containers whose setting_version is incorrect. Contributes to issue CURA-6270.	2019-03-08 13:34:16 +01:00
Jaime van Kessel	b165b9625f	Removed unused code and fix styling for some comments	2019-02-22 15:08:51 +01:00
Ghostkeeper	27aff4e5da	Fix typing issues ... Because this function now has typing, it's raising a load of issues with it. Contributes to issue CURA-5929.	2018-11-12 12:48:49 +01:00
Ghostkeeper	9c555bf67f	Add typing and always add error message if loading failed ... There were some places where it would return None. Then in the QML it would give a QML error that the null object has no dictionary items. Contributes to issue CURA-5929.	2018-11-12 11:02:43 +01:00
Ghostkeeper	4c6744b6fc	Code style: Space around binary operators ... I just looked for lines with interpolation = None because I was looking for another possible bug, but fixing this in the meanwhile too.	2018-10-10 14:28:50 +02:00
Ghostkeeper	314b966cc9	Improvements to translated strings ... These strings were recently found to have been confusing to the translators. Improvements are: - Pulling the (untranslated) error message out of the message sentence. We really want the error message to be at the end so we'll force the translators to translate it as a prefix. - Remove extra spaces at the end. - Remove Python logic from within the i18nc call, since gettext doesn't understand that. Contributes to issue CURA-5741.	2018-10-08 15:03:21 +02:00
Lipu Fei	af02dc2758	Only use setMetaDataEntry()	2018-07-11 11:14:57 +02:00
Diego Prado Gesto	2dfedf3ae4	CURA-5330 Add typing in CuraContainerRegistry and ... QualityProfilesDropDownMenuModel	2018-06-08 17:02:59 +02:00
Diego Prado Gesto	e5e96bc600	Merge branch 'master' into mypy_fixes ... Contributes to CURA-5330	2018-06-08 15:29:22 +02:00
Lipu Fei	e518d07f5a	No need to give parent to ExtruderStack	2018-06-04 13:22:08 +02:00
Ghostkeeper	f544e3d5c0	Fix @override decorator ... They need a parameter and they need to be the last decorator. Contributes to issue CURA-5330.	2018-06-04 09:02:57 +02:00
Ghostkeeper	5a5d07865b	Fix circular imports with CuraApplication ... Contributes to issue CURA-5330.	2018-06-04 09:01:30 +02:00
Ghostkeeper	c3bac474ab	Use CuraContainerRegistry instead of ContainerRegistry ... Because we're calling functions of CuraContainerRegistry. Contributes to issue CURA-5330.	2018-06-01 16:33:32 +02:00
Lipu Fei	9a5fb47a6e	Merge master into material marketplace	2018-05-01 11:56:34 +02:00
Diego Prado Gesto	27b1e2cdd6	Fix format and add error message to log. Contributes to CURA-5301	2018-04-26 15:49:18 +02:00
Lipu Fei	4615c756a7	More clear error handling for container deserialization ... CURA-5045 - If a container cannot be deserialized in project loading, it should fail right on the spot because even if it continues, it still won't work. - In other places, at least log deserialization errors if any of them show up.	2018-04-09 14:51:05 +02:00
Ghostkeeper	572721e20d	Catch ContainerFormatError when deserialising containers ... Only the deserialize() functions themselves may pass the ContainerFormatError on, because their callers will have to handle those errors anyway. Contributes to issue CURA-5045.	2018-04-06 13:26:16 +02:00
Lipu Fei	e36ef583b7	Minor changes and cleanup	2018-04-05 15:14:15 +02:00
Lipu Fei	19bc2b78f4	Add Version upgrade 3.3 to 3.4 ... Need to distinguish between quality and quality_changes in the cura directory, so we need to move all custom quality profiles into the quality_changes directory.	2018-04-05 15:14:15 +02:00
Lipu Fei	c3fe53123b	Create module cura.ReaderWriters ... CURA-4644 Move all reader writer classes into cura.ReaderWriters.	2018-04-05 15:14:15 +02:00
Lipu Fei	f15771856f	Add parent for stacks and containers that are created	2018-03-27 15:03:11 +02:00