1033 commits

Author	SHA1	Message	Date
Lipu Fei	248fe37ed9	setDefinition() takes the ID instead of the container ... CURA-4713	2017-12-15 14:54:26 +01:00
Lipu Fei	f26872ec1f	Apply fix for single extrusion machines when a new global stack is added ... CURA-4713 Now the machines are not all loaded in the beginning, so the old way of adding extruder stacks for old single-extrusion machines don't work. With this fix, it now happens whenever a global stack is added to the registry.	2017-12-15 14:51:48 +01:00
Aleksei S	2c18127cc1	Tests: Removed python circular import dependency and added empty containers ... CURA-4687	2017-12-15 09:43:02 +01:00
Jack Ha	bae2193bfb	Merge branch 'master' of github.com:Ultimaker/Cura	2017-12-13 13:39:22 +01:00
Jack Ha	19b56404c6	Fix empty quality slider on start. ... It seemed that: - MachineManager was not connected to all the correct signals - After connecting to the correct signal, ProfilesModel was not yet updated when looping over it in SidebarSimple Because ProfilesModel's constructor already requests the MachineManager, we cannot do connect itemsChanged the way around as well. CURA-4707	2017-12-13 13:33:05 +01:00
Lipu Fei	6e6dc493f1	Fix material loading for unknown names	2017-12-13 12:27:55 +01:00
Ghostkeeper	097cc72d89	Document why we're only returning full profiles ... It's a limitation of the quality manager that would require major refactoring there to fix. Contributes to issue CURA-4243.	2017-12-11 09:44:56 +01:00
Ghostkeeper	430f3dad27	Use GlobalContainerStack.definition instead of .getBottom ... If we know it's a CuraContainerStack we can use .definition safely. Contributes to issue CURA-4243.	2017-12-08 16:57:48 +01:00
Ghostkeeper	1029d4509c	Merge branch 'master' into feature_local_container_server	2017-12-08 16:03:05 +01:00
Diego Prado Gesto	9561827bda	CURA-4680 Checking if there is global stack in the ExtruderManager. ... Intead of checking for it in all the methods in MachineManager, now the check is done in ExtruderManager when there is no printer in the list.	2017-12-06 14:12:51 +01:00
Jack Ha	f0c3aaf532	Add built-in profiles to profiles screen. ... Contributes to issue CURA-4243.	2017-12-06 14:05:09 +01:00
Lipu Fei	c0a502f99c	Check if there is an active machine before doing anything else ... CURA-4680	2017-12-06 11:48:14 +01:00
Jack Ha	20500b5c51	Merge branch 'feature_local_container_server' of github.com:Ultimaker/Cura into feature_local_container_server	2017-12-06 11:03:47 +01:00
Jack Ha	eb171231c2	Fix removeMaterial. ... The base_file must be removed first, or it gets loaded halfway during remove containers. Contributes to issue CURA-4243.	2017-12-06 11:02:50 +01:00
Ghostkeeper	ec36424a4d	Update UserProfilesModel when metadata of materials changes ... The metadata may influence which profiles are being shown. Contributes to issue CURA-4243.	2017-12-06 10:42:02 +01:00
Ghostkeeper	80f4c9181d	Correct variant name when duplicating materials ... It needs to be the variant name (swapping spaces for underscores) to be consistent with the deserialize functions. Contributes to issue CURA-4243.	2017-12-06 10:40:58 +01:00
Jack Ha	ce78bddfbb	Prefer a read-only material in findDefaultMaterial. ... Contributes to CURA-4243.	2017-12-05 09:51:57 +01:00
Jack Ha	41cde7c7f4	Fix connecting material name change signal on startup. Contributes to CURA-4243.	2017-12-04 17:07:37 +01:00
Jack Ha	c52451217b	Use timer instead of calling _update directly. ... Speeds up when the signal is called very often in a small period. Contributes to issue CURA-4243.	2017-12-04 16:29:21 +01:00
Jack Ha	ac97d0d83f	Sort materials by brand, material, name, color_name. ... Contributes to issue CURA-4243.	2017-12-04 13:23:30 +01:00
Jack Ha	44537c4ef4	Added sorting by brand to MaterialsModel. ... Contributes to issue CURA-4243.	2017-12-04 11:11:57 +01:00
Ghostkeeper	72c7d2bd76	Reconstruct ID for submaterials from unique base name ... When you make the ID of the subprofile unique it doesn't get linked to the base profile any more since the '#2' gets put at the end. Contributes to issue CURA-4243.	2017-12-04 11:04:28 +01:00
Ghostkeeper	083a4a8024	Rewrite cloning of materials ... The original was based on reading the original file back, but that won't work if the files are provided by an arbitrary container provider. Instead we'll actually make a copy of all the profiles that need to be copied. It's much faster as well. Contributes to issue CURA-4243.	2017-12-01 16:19:58 +01:00
Ghostkeeper	f045b85db3	Merge branch '3.1'	2017-12-01 10:19:36 +01:00
Lipu Fei	14c84d835a	Make quality switching clear ... CURA-4650	2017-12-01 09:55:38 +01:00
Diego Prado Gesto	7e4ed8a257	CURA-4646 Fix save containers also for the extruders	2017-11-30 17:37:16 +01:00
Ghostkeeper	96c38bce2b	Merge branch '3.1'	2017-11-30 16:57:01 +01:00
ChrisTerBeke	3abf067d25	Fix loading .curaproject files with stack setups from earlier versions - CURA-4646	2017-11-30 15:24:51 +01:00
Ruben D	d29d73413f	Remove unused function ... Contributes to issue CURA-4243.	2017-11-30 01:11:10 +01:00
Ruben D	f9c59c7e1e	Don't update model if extruders haven't all been loaded yet ... This model is created while the extruder stacks have not yet been filled in. You can't connect yet. When the extruder is ready, _extrudersChanged will be called again and then the new extruder will also get connected. Contributes to issue CURA-4243.	2017-11-30 00:33:10 +01:00
Ghostkeeper	838e49f3da	Pass just metadata through quality manager instead of full containers ... Where we only need metadata, we should pass metadata instead of full containers. Also add some type hinting. Contributes to issue CURA-4243.	2017-11-29 14:33:04 +01:00
ChrisTerBeke	0668f80792	Merge pull request #2758 from fieldOfView/feature_mesh_types ... Improved mesh type UX (Per Model Settings)	2017-11-29 13:24:38 +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
Diego Prado Gesto	e5ac33a929	CURA-4641 Minor changes	2017-11-29 11:19:11 +01:00
ChrisTerBeke	16e07fc461	Update color indicators for extruders when changing material color - CURA-4641	2017-11-29 10:47:39 +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	381d9bf3f1	Log which file caused it to go wrong ... Contributes to issue CURA-4243.	2017-11-28 16:15:20 +01:00
Ghostkeeper	eb3981b4e0	Let _fetchInstanceContainers return containers split by loaded or not ... It must now return two dictionaries: One for the profiles that have been completely loaded and one for the profiles that are only metadata. We could probably improve on these a little bit, since all of these (except the material model) will now load all available quality profiles. I'll see if it is necessary to optimise that. Contributes to issue CURA-4243.	2017-11-28 14:26:14 +01:00
ChrisTerBeke	26b9fc3163	Only create extruder stack for single extrusion machine when not yet existing - CURA-4482	2017-11-27 16:55:01 +01:00
ChrisTerBeke	8cfaa44580	Fix resolving global stack definition when switching variant - CURA-4620	2017-11-27 16:40:23 +01:00
ChrisTerBeke	9e6704a162	Fix extruder stack machine definition link for per extruder settings resolvement - CURA-4627	2017-11-27 15:14:32 +01:00
Lipu Fei	49cac860a8	Fix project loading ... CURA-4617	2017-11-27 14:17:13 +01:00
Lipu Fei	1866c4ee66	Split user settings for single extrusion machines ... CURA-4617	2017-11-27 12:56:53 +01:00
ChrisTerBeke	8082c092e5	Fix setting extruder definition in user changes container	2017-11-27 09:54:10 +01:00
Aleksei S	bb2be70dac	Finds candidate quality profile for fdmextruder ... CURA-4620	2017-11-25 02:25:36 +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
Lipu Fei	c7667b56e2	Multiple fixes for stacks ... CURA-4617	2017-11-24 09:45:59 +01:00
Lipu Fei	2397b68cd7	Optimize MaterialsModel update ... CURA-4546	2017-11-23 14:07:40 +01:00
Lipu Fei	17f09ec21e	Fix variant/material/quality handling in stacks ... CURA-4613	2017-11-23 12:46:33 +01:00
Lipu Fei	18c7a5acf3	Pass optional file_name for deserialization ... CURA-4613 Some upgrades depend on the file_name, so the file_name is needed in this case.	2017-11-23 11:28:16 +01:00