2739 commits

Author	SHA1	Message	Date
Ghostkeeper	c63ef6fed6	Remove unused variables ... The machine_name variable is later redefined. Contributes to issue CURA-4243.	2017-11-28 16:58:04 +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
Ghostkeeper	def7b6994d	Store correct ID in metadata after deserialising ... Contributes to issue CURA-4243.	2017-11-21 12:50:10 +01:00
Ghostkeeper	4fa38c26e8	Don't add any extra metadata to the end of the list you're iterating over ... Stupid mistake. This causes infinite loops. Contributes to issue CURA-4243.	2017-11-21 11:46:14 +01:00
Ghostkeeper	0831451371	Fix returning resulting metadata ... Forgot to change that back. Contributes to issue CURA-4243.	2017-11-21 11:05:11 +01:00
Ghostkeeper	c4debbea8b	Implement deserializeMetadata ... Let's hope this works... Contributes to issue CURA-4243.	2017-11-21 10:59:01 +01:00
Ghostkeeper	cf7bad1bbb	Make _profile_name a class method ... This way we can execute it statically while getting the metadata. Contributes to issue CURA-4243.	2017-11-02 10:18:52 +01:00
Ghostkeeper	d369f92020	Make get[ConfigurationType|Version]FromSerialized class methods ... This way we can call them before an instance has been created, in order to upgrade the serialized forms. Contributes to issue CURA-4243.	2017-11-01 16:18:08 +01:00
Ghostkeeper	07947d5d2c	Override getIdsFromFile to load multiple IDs ... This should result in all IDs in the XML file, since there are multiple per file here. Contributes to issue CURA-4243.	2017-11-01 14:53:52 +01:00
Ghostkeeper	ddf5ab0494	Make _parseCompatibleValue a class method ... It might as well be static, since it doesn't need an instance. Contributes to issue CURA-4243.	2017-11-01 14:52:57 +01:00
Ghostkeeper	74bd527b03	Load product_id_map from file ... For now this file is hard-coded. We should eventually try to generate this in the build system. Contributes to issue CURA-4243.	2017-11-01 14:52:03 +01:00
Ghostkeeper	a08875c5eb	Remove redundant setting of name ... It's just copied along with the rest of the metadata now. Contributes to issue CURA-4243.	2017-10-31 11:11:56 +01:00
Ghostkeeper	d24fa3bc3b	Set name directly in metadata when clearing ... Because the setName function checks if the name is equal to the previous name, but at that point the previous name doesn't exist. Contributes to issue CURA-4243.	2017-10-31 08:23:57 +01:00
Ghostkeeper	8eaec149fa	Make sure the ID stays in the metadata when clearing it ... Previously the ID was also exempted from the clear. Contributes to issue CURA-4243.	2017-10-30 15:54:26 +01:00
Ghostkeeper	3a9c8d16a2	Fix remaining references to instance_container._id ... These must've slipped through the cracks. Contributes to issue CURA-4243.	2017-10-30 15:07:46 +01:00
Ghostkeeper	8bbb6c1af5	Load and serialize container ID and name properly: not in metadata ... We shouldn't write the name or ID, who are now in the metadata. Also we should load the name and ID properly from the file. Contributes to issue CURA-4243.	2017-10-27 16:50:13 +02:00
Ghostkeeper	a31c39b225	Use setters and getters for name and ID ... Because their implementation changed, these would have been implemented in some other way. Instead I use the getters and setters which are inherited from the parent class and therefore are already updated. Contributes to issue CURA-4243.	2017-10-27 16:35:58 +02:00
Ghostkeeper	7ac3c1446b	Make ignored metadata keys a set ... It needs to be a set now for Uranium. Contributes to issue CURA-4243.	2017-10-27 16:25:52 +02:00
Ghostkeeper	6c4c7fff4d	Use findContainersMetadata whenever possible ... This ensures that we only load those containers that we actually need the data of. Contributes to issue CURA-4243.	2017-10-20 15:09:45 +02:00
Ghostkeeper	7745113704	Re-use stack variable ... We're creating the variable but then requesting the 0th element from the list each time... That can be more logical and more efficient. Contributes to issue CURA-4243.	2017-10-19 15:32:21 +02:00
ChrisTerBeke	795eda64e3	Merge branch 'master' into CURA-4248_BAM	2017-10-18 15:08:51 +02:00
ChrisTerBeke	78ba3c3aa0	Move BAM equations to BAM quality profiles as they are very specific - CURA-4248	2017-10-18 13:51:06 +02:00
Ghostkeeper	b119119ed2	Merge branch '3.0'	2017-10-18 13:09:38 +02:00
Ghostkeeper	4d0c0f606e	Use new version for downloading plugins	2017-10-17 16:44:27 +02:00
ChrisTerBeke	c0903f539e	Merge branch 'master' into CURA-4248_psp	2017-10-17 13:07:22 +02:00
ChrisTerBeke	91589ed29d	Add surface energy property to get correct behaviour - CURA-4248	2017-10-17 13:03:29 +02:00
Diego Prado Gesto	40f548ba99	Merge branch 'CURA-4252_improve_zeroconf_service'	2017-10-17 13:02:58 +02:00
ChrisTerBeke	205ac7c50c	Merge branch 'master' into CURA-4253_psp	2017-10-16 17:16:00 +02:00
ChrisTerBeke	a444e5c883	update material xml parser to support psp values - CURA-4253	2017-10-16 15:55:46 +02:00
Lipu Fei	f4718162d3	Merge remote-tracking branch 'upstream/3.0'	2017-10-16 15:01:15 +02:00
Lipu Fei	8ef918829f	Fix quality profile upgrade for UM2 family	2017-10-16 15:00:29 +02:00
Lipu Fei	38b9df80f3	Merge remote-tracking branch 'upstream/3.0'	2017-10-16 14:54:40 +02:00
Lipu Fei	aa7b456594	Fix custom quality profile upgrade for UM2 family ... The custom quality profiles for the UM2 family used to be saved as profiles for "fdmprinter". They now should be updated to set for "ultimaker2".	2017-10-16 13:59:22 +02:00
alekseisasin	eebe4028ff	Merge pull request #2610 from fieldOfView/fix_machinesettings_backend_crash ... Fix crash when exiting Machine Settings	2017-10-16 13:46:03 +02:00
Lipu Fei	b55efdd70e	Remove timeout = 0 for get_service_info ... CURA-4252	2017-10-16 10:36:14 +02:00
Lipu Fei	7e0014eadd	Create machine name-to-id map at runtime instead of using a hard-coded map ... CURA-4223	2017-10-16 10:28:06 +02:00
fieldOfView	ad1c0046d9	Fix crash when exiting Machine Settings ... fixes #2609	2017-10-15 11:54:49 +02:00
Ghostkeeper	4627c728b2	Merge branch '3.0'	2017-10-12 17:10:22 +02:00
Ghostkeeper	cfcb47234c	Add cross infill to the change log ... Contributes to issue CURA-4391 and CURA-4095.	2017-10-12 17:10:04 +02:00
Lipu Fei	7f944ff08b	Improve zeroconf service changed handling ... CURA-4252 Use a separate thread to handle zeroconf service changed callbacks. If a service info cannot be retrieved successfully, the request will be rescheduled and tried again later.	2017-10-12 15:26:17 +02:00
Ghostkeeper	08d475b7ac	Merge branch 'master' of github.com:Ultimaker/Cura	2017-10-12 14:59:13 +02:00
Ghostkeeper	e4a53da763	Merge branch '3.0' ... Contributes to issue CL-508.	2017-10-12 14:56:30 +02:00
Lipu Fei	920c90010f	Fix base.selectedPrinter is undefined problem	2017-10-12 14:54:01 +02:00
Ghostkeeper	eda61f1ff9	Merge branch 'update_printer_blocked_icon' into 3.0	2017-10-12 14:49:07 +02:00