195 Commits

Author	SHA1	Message	Date
Jack Ha	9ea59c1976	CURA-4557 rename ratio percentage to percentage	2018-03-20 17:07:03 +01:00
Jack Ha	9848c07a0e	Merge branch 'master' into feature_model_check	2018-03-19 14:11:37 +01:00
Lipu Fei	98b325c9d5	Fix material serialization crash	2018-03-15 14:54:37 +01:00
Jack Ha	d0609e97e4	CURA-4557 added material_shrinkage_ratio_percentage setting	2018-03-15 11:19:14 +01:00
Lipu Fei	86afd6f5ff	Do not overwrite existing metadata with in material deserializeMetadata() ... CURA-5056	2018-03-14 10:32:57 +01:00
Lipu Fei	493bfb6b17	Fix material serialization ... CURA-5086	2018-03-13 16:37:04 +01:00
Lipu Fei	c54679ba2d	Gix buildplate handling in Material profile ... CURA-4606	2018-03-12 15:25:29 +01:00
Lipu Fei	2c5cc17b49	Fix build plate compatibility check ... CURA-5078	2018-03-12 10:34:18 +01:00
Lipu Fei	75d9297c7d	Optimize 3MF writer and XML material serialization ... CURA-5049	2018-03-06 17:05:58 +01:00
Lipu Fei	6c42b662c8	Add doc for apply_to_all in XMLMaterialProfile	2018-03-05 10:54:01 +01:00
Lipu Fei	1e467b66c0	Fix protected variable access	2018-03-05 10:22:11 +01:00
Lipu Fei	2567642626	Remove outdated TODO	2018-03-03 16:13:35 +01:00
Lipu Fei	a5afaab467	WIP: Fix material duplication and metadata update	2018-02-16 14:23:11 +01:00
Lipu Fei	f024f45cfe	WIP: Rework Material management page	2018-02-16 14:23:11 +01:00
Lipu Fei	20e0f8a82a	WIP: Fix material serialization	2018-02-16 14:23:11 +01:00
Lipu Fei	4af176dbf3	WIP: Rename function to getVariantNode()	2018-02-16 14:23:11 +01:00
Lipu Fei	55bdc0c853	WIP: Create VariantManager	2018-02-16 14:20:02 +01:00
Lipu Fei	86eb9b925f	WIP: Use variant_name in metadata for XMLMaterialProfile	2018-02-16 14:20:02 +01:00
Jaime van Kessel	b4a1b97eda	Removed warning that caused massive spam	2018-02-06 14:37:39 +01:00
Jaime van Kessel	08394c99d3	PossibleDefinitionIds from name only returns distinct names ... It would sometimes return 3x the same id.	2018-02-06 14:27:54 +01:00
Aleksei S	37733f51ad	Correct name ... CURA-4851	2018-02-01 09:44:00 +01:00
Aleksei S	08c64d28cf	Typo in XmlValidator ... CURA-4851	2018-02-01 09:37:06 +01:00
alekseisasin	e5c72cfdc5	Validate material profile ... CURA-4851	2018-01-31 14:58:44 +01:00
Ghostkeeper	f88df7e5cd	Remove overzealous log entry ... This was in the happy path and gets executed for every material profile in every material file, which is hundreds of times. Better not. Found during development of CURA-4797.	2018-01-23 15:45:12 +01:00
Diego Prado Gesto	aace0e0317	CURA-4461 Remove unused code	2018-01-15 18:10:52 +01:00
Diego Prado Gesto	badf5a9043	CURA-4461 Store buildplate compatibility in the material profile	2018-01-15 14:31:52 +01:00
Diego Prado Gesto	67ca4d25cd	CURA-4461 Deserialize materials with buildplates compatibility	2018-01-15 11:35:17 +01:00
Diego Prado Gesto	c3c44e9ac4	Compatibility with materials and buildplates	2018-01-12 16:01:48 +01:00
Diego Prado Gesto	becb0cf7b9	CURA-4461 Add dropdown menu in the UI for selecting the buildplate if ... the printer has different buildplates.	2018-01-09 15:42:10 +01:00
Ghostkeeper	8f66db6565	Remove overzealeous log message ... This message appears on every machine in every material, which is far too much.	2017-12-18 13:29:10 +01:00
Jack Ha	a44cea7ac6	Update log line	2017-12-13 14:48:25 +01:00
Lipu Fei	6e6dc493f1	Fix material loading for unknown names	2017-12-13 12:27:55 +01:00
Lipu Fei	7cd3449781	Fix material loading	2017-12-13 11:26:16 +01:00
Lipu Fei	e14d78b32a	Generate more possible machine IDs in XML material profile	2017-12-13 10:16:06 +01:00
Jack Ha	a387c10686	Fix serialize hotend id in xml material. ... Contributes to issue CURA-4243.	2017-12-07 09:59:00 +01:00
Ghostkeeper	bc28189ff5	Don't serialize the name of the metadata ... It's being serialized in a different place. Contributes to issue CURA-4243.	2017-12-04 10:55:30 +01:00
Ghostkeeper	17ede12573	Also set base_file metadata when deserialising just metadata ... Contributes to issue CURA-4243.	2017-12-01 16:07:30 +01:00
Ruben D	c1ba64fd9e	Correct variants after all metadata is loaded ... As explained in the block of documentation, we can't find the variants because there is no guarantee that the variants have been loaded by the time that the metadata of materials is deserialised and we don't know their IDs either (so no lazy loading). This registers a function to be called upon completely loading the metadata, which runs a query on the metadata to find the variant by its definition and name. A bit hacky but I see no better solution. Contributes to issue CURA-4243.	2017-11-30 00:10:02 +01:00
Ghostkeeper	c34de83e3f	Use isLoaded to check if a material is already loaded ... This prevents us from having to make an expensive findContainers call if it's not necessary, and also prevents us from unnecessarily loading the subcontainers in a loop during loading. Contributes to issue CURA-4243.	2017-11-29 18:04:07 +01:00
Ghostkeeper	cacc4b8586	Properly set the definition to the currently processed machine ... Otherwise all of them stay at fdmprinter. Contributes to issue CURA-4243.	2017-11-29 16:41:20 +01:00
Ghostkeeper	99cd139ba4	Remove setting definition double ... Contributes to issue CURA-4243.	2017-11-29 13:39:24 +01:00
Ghostkeeper	dad99f5292	Merge branch 'master' into feature_local_container_server ... Contributes to issue CURA-4243.	2017-11-29 13:06:08 +01:00
Ghostkeeper	8707396ad7	Remove isReadOnly functionality ... Everyone should now ask it from the container registry. Contributes to issue CURA-4243.	2017-11-28 17:30:00 +01:00
Ghostkeeper	54a12d14c4	Add string representation for debugging ... My IDE shows the str(inst) representation of an object when indicating what value is in there. This makes it easier to find stuff. It'll also make debug prints more clear than the default <XmlMaterialProfile.XmlMaterialProfile.XmlMaterialProfile object at 0x12345678> stuff of Python. Contributes to issue CURA-4243.	2017-11-27 14:19:30 +01:00
Ghostkeeper	a2b0c4535c	Only load metadata of machines for derived profiles ... We only need the metadata of these machines (now that the ID is in the metadata). We won't need all of those machines because some of them are not added. Contributes to issue CURA-4243.	2017-11-27 10:55:51 +01:00
Ghostkeeper	9571181178	Fix ID of derived materials ... Because the ID is now in the metadata it would get overwritten by this deep copy. We need to set it again. Contributes to issue CURA-4243.	2017-11-27 10:37:54 +01:00
Ghostkeeper	aa52b9682e	Fix adding name when loading complete material file ... Also, don't use setName since that only operates on the base file and sends out unnecessary signals. Contributes to issue CURA-4243.	2017-11-27 09:10:55 +01:00
Ghostkeeper	ebe766a7c8	Set definition by their ID ... The new function for setting the definition just adds the ID to the metadata. Contributes to issue CURA-4243.	2017-11-24 16:45:09 +01:00
Ghostkeeper	1e07325d8f	Remove unused getIdsFromFile ... Since we now return all metadata at once from every file, we don't need this any more. We need to side-load the metadata anyway. Contributes to issue CURA-4243.	2017-11-23 16:11:02 +01:00
Ghostkeeper	3ee2e0488f	Only load metadata when finding hotends belonging to material ... We only need to have the hotend metadata. Contributes to issue CURA-4243.	2017-11-23 15:31:22 +01:00