2897 Commits

Author	SHA1	Message	Date
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	c63ef6fed6	Remove unused variables ... The machine_name variable is later redefined. Contributes to issue CURA-4243.	2017-11-28 16:58:04 +01:00
Lipu Fei	7d01e3388f	Merge remote-tracking branch 'upstream/3.1'	2017-11-28 11:36:03 +01:00
Lipu Fei	6db06ea713	Fix project loading for single-extrusion machines ... CURA-4617	2017-11-28 11:17:17 +01:00
ChrisTerBeke	68cd9df65f	Merge branch '3.1'	2017-11-28 10:36:11 +01:00
ChrisTerBeke	7b30e9a6fc	Merge pull request #2856 from Ultimaker/simulation_view_gradient_changes ... Adapt gradient in Simulation view for better visualization of feedrates	2017-11-28 10:34:10 +01:00
Diego Prado Gesto	49537b64f7	CURA-4482 Fix error in SolidView when the support angle stack doesn't ... exist. This error was sent twice through the CrashHandler and it is in Metabase.	2017-11-28 09:39:57 +01:00
ChrisTerBeke	67d6b6ab6f	Merge branch '3.1'	2017-11-27 17:36:41 +01:00
ChrisTerBeke	0e2f60f18b	Fix toggling UM2 upgrades on extruder 0 - CURA-4626	2017-11-27 17:35:57 +01:00
ChrisTerBeke	a072af5585	Merge branch '3.1'	2017-11-27 17:17:02 +01:00
Lipu Fei	33a06e13a9	Remove legacy if check in project loading ... CURA-4617	2017-11-27 14:27:11 +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
Lipu Fei	49cac860a8	Fix project loading ... CURA-4617	2017-11-27 14:17:13 +01:00
Ghostkeeper	17a25f98a4	Merge branch '3.1'	2017-11-27 13:58:52 +01:00
Jaime van Kessel	0613b1e4b7	Creating components is now done with the prefab function ... CURA-4568	2017-11-27 13:00:49 +01:00
Lipu Fei	828fff5ee5	Fix quality check in project loading ... CURA-4617	2017-11-27 12:04:21 +01:00
Lipu Fei	46c6c6aa9b	Fix quality profile in project loading ... CURA-4617	2017-11-27 11:19:40 +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
Lipu Fei	4a4f01f9eb	Fix resetting not supported profiles for project loading ... CURA-4617	2017-11-27 10:52:29 +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
ChrisTerBeke	8082c092e5	Fix setting extruder definition in user changes container	2017-11-27 09:54:10 +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
Diego Prado Gesto	fa00a17c78	Make UI changes in the Simulation View for adapting the color gradient ... in the Feedrate color scheme. Due to the travel speed is normally very high compared with the other speeds in the model, the gradient is now gradual instead of linear in order to show more changes in the low values and less changes in the high values. Adapt also the button styles and themes' colors. Set the play/pause button to the left and reduce the size.	2017-11-26 21:21:18 +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
Diego Prado Gesto	d0c1569da6	Merge branch 'fieldOfView-feature_simulation_ux_tweaks'	2017-11-24 15:48:39 +01:00
Ghostkeeper	147cbdf592	Clarify translations of 'unknown' ... For some languages, the gender matters. Contributes to issue CURA-4601.	2017-11-24 13:16:14 +01:00
Diego Prado Gesto	1ea9379913	CURA-4609 Fix qml rectangle background in feedrate color scheme.	2017-11-24 13:02:11 +01:00
Diego Prado Gesto	bf1ecba641	Add the layer thickness back to the color options in Simulation View	2017-11-24 10:54:20 +01:00
Diego Prado Gesto	c8c2129b7e	CURA-4552 Minor changes	2017-11-24 10:51:34 +01:00
ChrisTerBeke	46a575b84f	Merge branch 'master' of https://github.com/Ultimaker/Cura	2017-11-24 10:31:30 +01:00
ChrisTerBeke	7d1db1b165	Merge branch '3.1'	2017-11-24 10:31:22 +01:00
Diego Prado Gesto	7bb82cf56f	CURA-4605 Fix render issues when importing a GCode that has empty ... layers. Also fix gaps between raft and the model.	2017-11-23 16:47:34 +01:00
Lipu Fei	6b3e130349	Fix edge cases with ultimaker2 and whatever other machines that may get affected ... CURA-4617	2017-11-23 16:28:36 +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
Diego Prado Gesto	f0dca021d8	Merge branch '3.1' of https://github.com/Ultimaker/Cura into 3.1	2017-11-23 15:42:02 +01:00
Diego Prado Gesto	2c6b2b869e	CURA-4605 Fix render issues when there are empty layers. ... Fix layer gap when raft is enabled.	2017-11-23 15:39:22 +01:00
Lipu Fei	ef37f0d8c7	Fix project loading to reset quality if it doesn't exist ... CURA-4617	2017-11-23 15:35:33 +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
Mark	49705492ce	Merge branch '3.1'	2017-11-23 14:37:31 +01:00
Jack Ha	5703f954d4	CURA-4552 fix support for relative extrusion	2017-11-23 14:13:18 +01:00
Lipu Fei	033cc4fbc7	Fix quality update in project loading ... CURA-4613	2017-11-23 14:12:41 +01:00
Lipu Fei	1db448d7d8	Use the correct quality container for global stacks loaded from project files ... CURA-4613	2017-11-23 13:04:06 +01:00
Lipu Fei	3148027fbe	Fix version upgrade for quality_changes ... CURA-4613 Explained in the code comments.	2017-11-23 12:43:14 +01:00