170 Commits

Author	SHA1	Message	Date
Jaime van Kessel	38a2245d74	XML materials are now added in one batch	2017-09-28 16:07:03 +02:00
Mark	9a193ad5c5	Changing AGPLv3 to LGPLv3	2017-09-28 13:00:43 +02:00
Lipu Fei	51547bf37a	Update setting_version to 3 for XMLMaterial ... CURA-4270 Technically, this is not right. This is just to postpone a time bomb... The XML material profile needs a setting number instead of getting it derived from the schema version.	2017-09-04 15:51:31 +02:00
Lipu Fei	812e262f39	When deserialising a material, also update the material derived from it ... CURA-4204	2017-08-22 11:29:35 +02:00
Ghostkeeper	b03847447f	Take manufacturer from XML profile if available ... Otherwise we fall back to the manufacturer in the machine definition. If that fails too, we fall back to Unknown (rather than an empty string). Contributes to issue CURA-4157.	2017-08-11 11:13:23 +02:00
Lipu Fei	024f2384e0	Fix mutable arg problem and rename arg ... CURA-4049	2017-07-18 08:32:22 +02:00
Lipu Fei	3c663d576c	Do not save setting_version when serializing an XML material ... CURA-4053 setting_version is derived from the "version" tag in the XML material schema.	2017-07-17 13:54:22 +02:00
Lipu Fei	ecdf0bbe33	Fix setting_version in metadata for XMLMaterial ... CURA-4053	2017-07-17 13:40:12 +02:00
Lipu Fei	63b71b8661	Fix typo in comments	2017-07-17 13:39:03 +02:00
Lipu Fei	68989f2871	Use optional arg in serialize() to exclude network auth keys ... CURA-4049	2017-07-17 11:04:08 +02:00
Ghostkeeper	d6941fef2f	Interpret material compatible 'unknown' as 'yes' ... We decide whether it is unknown (or unsupported) based on the availability of profiles for it. Contributes to issue EM-1662.	2017-07-11 13:23:51 +02:00
Lipu Fei	071005541c	Use XMLMaterialProfile version tag to determine its version ... CURA-2724	2017-07-06 14:47:59 +02:00
Lipu Fei	b4949a164c	WIP: Add temporary fix to make materials work with 2.7 version upgrade ... CURA-3975 This is a temporary fix to make materials work with 2.7 version upgrade because of the setting_version change from 1 to 2. This MUST be fixed after we have decided on how to determine the versions of an XMLMaterialProfile.	2017-07-06 14:19:30 +02:00
fieldOfView	49f2fb2cea	Fix filtering maerials after editing materials ... NB: previously the "approximate_diameter" metadata was stored as a number. This caused some issues passing arguments from QML to Python. Now "approximate_diameter" is stored as a string.	2017-06-14 10:42:04 +02:00
fieldOfView	a7cdf49018	Fix setting metadata on fdmmaterial containers	2017-06-14 10:41:12 +02:00
fieldOfView	5550fe0da8	Fix confusion around the use of the word "global"	2017-06-14 10:40:52 +02:00
fieldOfView	944318d44a	Fix loading material diameter and GUID from XML file	2017-06-14 10:40:43 +02:00
Lipu Fei	8ede981a2c	Set version in <fdmmaterial> when saving XML material files ... CURA-3884	2017-05-29 14:19:52 +02:00
Lipu Fei	9a08e0cc27	Only use <fdmmaterial version> for detecting material file version ... CURA-3540	2017-05-23 11:51:31 +02:00
Jaime van Kessel	4b826b747b	Added exception handling to XML parsing ... CURA-3843	2017-05-19 13:54:31 +02:00
Jaime van Kessel	75b3f08318	Removed unneeded logging ... THis caused a massive logging spam	2017-05-19 13:09:41 +02:00
Lipu Fei	593697e0ed	Fix XML material upgrade ... CURA-3756	2017-05-19 10:18:13 +02:00
Ghostkeeper	c48017e174	Convert all metadata fields to string ... The XML builder expects string, strictly. Only None is handled separately. Contributes to issue CURA-3808.	2017-05-15 09:37:53 +02:00
Ghostkeeper	2365267f35	Be robust against older specification version numbers ... 1.2 and lower didn't specify a version number. Assume that it was 1.2. We feed this through our translation function for form, mostly, because we know that the setting_version should be 0 then. Contributes to issue CURA-3427.	2017-05-12 17:20:49 +02:00
Ghostkeeper	365f7cad4c	Read setting_version from version attribute on root ... As per the new specification for v1.3 of the spec. Contributes to issue CURA-3427.	2017-05-12 17:20:49 +02:00
Ghostkeeper	a472fd8163	Remove debug print ... Oops again. Contributes to issue CURA-3427.	2017-05-12 14:33:44 +02:00
Ghostkeeper	1e4c394b71	Remove getting superfluous material density ... The density is already put in the 'properties' metadata entry. Don't need to put it in there doubly. Turns out that this density line was originally just superfluous. Contributes to issue CURA-3427 or something.	2017-05-12 14:12:36 +02:00
Ghostkeeper	c8295434f3	Load setting_version from XML material profile ... The setting_version is translated from the version number. The setting_version number currently happens to be the same as the version number of XML but that won't always be the case so we introduce a translation-step as well. Contributes to issue CURA-3427.	2017-05-12 14:04:56 +02:00
Ghostkeeper	38f081539a	Fix deserialising density ... That density variable was never used. Hope this fixes some unaccounted-for bug. Doesn't contribute to CURA-3427 but I'm listing it as if it does anyway.	2017-05-12 14:01:06 +02:00
Jaime van Kessel	c20542b7b8	Merge branch 'feature_CURA-3540_upgrade_for_project' of github.com:Ultimaker/Cura	2017-04-18 15:33:53 +02:00
Ghostkeeper	f1ac1bd876	Add JellyBox to XML material printer name translations ... Because the automatic translation removes the underscore, and then the definition can't be found any more. Contributes to issue CURA-3695.	2017-04-18 15:11:24 +02:00
Lipu Fei	b3f60c461b	Fix type hinting and function name for upgrade profile ... CURA-3540	2017-04-14 15:40:18 +02:00
Lipu Fei	4f2c76e462	Update a profile when deserializing it ... CURA-3540	2017-04-14 10:50:42 +02:00
fieldOfView	e92aaca7b6	Filter materials by the (approximate) material diameter of the printer ... If a machine defines material diameter of 2.85mm, there is no use to show the 1.75mm materials and vice-versa	2017-04-12 23:03:58 +02:00
Lipu Fei	18cf9e3172	CURA-3500 Make sure that material XMLs have utf-8 encoding	2017-03-15 11:47:33 +01:00
Ghostkeeper	b488441d81	Fix link to ContainerRegistry ... This one was forgotten because it is in a comment. Contributes to issue CURA-2917.	2017-02-14 17:00:33 +01:00
Simon Edwards	92cee4a9d7	Merge branch 'master' into python_type_hinting	2017-02-13 16:31:31 +01:00
Jaime van Kessel	c18fb02f82	Removed unneeded (and somewhat expensive) checks ... CURA-3311	2017-02-13 11:06:21 +01:00
Jaime van Kessel	6e7c4711e3	When creating XML profiles, directly set the name ... The setName function is intended if the user changes the name (as by means of the edit material menu). For deserializing this simply gives too much overhead	2017-02-10 14:58:22 +01:00
Jaime van Kessel	f4d4fb9001	Material values are now also lazy loaded ... CURA-3311	2017-02-10 14:50:16 +01:00
Jaime van Kessel	bda818b104	MetaData of material profile is now set in one batch instead of multiple calls ... CURA-3311	2017-02-10 14:15:35 +01:00
Simon Edwards	fb70eb6813	Merge branch 'master' into python_type_hinting	2017-01-17 08:42:55 +01:00
Simon Edwards	38a7ffa7da	Some fixes regarding submodules and imports.	2017-01-16 21:35:28 +01:00
Ghostkeeper	f4fa3ac53f	Add translation for UM3 and UM3E from XML profiles ... Otherwise it would remove all spaces and put everything lowercase, but that didn't work for UM3E. Contributes to issue CURA-2575.	2016-12-14 13:50:16 +01:00
Simon Edwards	d4619da358	Merge branch 'master' into python_type_hinting	2016-12-13 14:39:35 +01:00
Simon Edwards	74e5798509	Lots of import fixes. Eliminated the import hacks such as those used inside UM/Settings/__init__.py. ... CURA-2917	2016-12-12 16:05:35 +01:00
Jack Ha	94ccd4b04b	Solve material properties not being saved. CURA-2586	2016-12-08 17:24:25 +01:00
Jaime van Kessel	58e7e6ef5a	Added default_printing_temperature property ... CURA-2586	2016-12-06 11:38:56 +01:00
Jack Ha	b88ed76b7c	Solve merge conflict PrinterOutputDevice. CURA-1263	2016-11-24 13:55:22 +01:00
Jack Ha	a8d5537487	Fix XmlMaterialProfile setProperty in correct container. Contributes to CURA-2861	2016-11-24 11:19:46 +01:00