542 Commits

Author	SHA1	Message	Date
fieldOfView	b85a8ca404	Update ContainerSettingsModel when its containers have property changes ... CURA-1668	2016-06-09 07:54:13 +02:00
Ghostkeeper	4d418a7c1a	When switching active extruder, get the extruder train from definition id ... Not from extruder container stack ID. Contributes to issues CURA-340 and CURA-1278.	2016-06-08 16:36:01 +02:00
fieldOfView	485ae53660	Show quality profile and user profile settings side-by-side on Profiles manager ... Introduces ContainerSettingsModel, which can combine the settings of instances from multiple containers into one model. Towards CURA-1668	2016-06-08 16:35:10 +02:00
fieldOfView	8608468802	Add a method to get the id of the current user profile ... CURA-1668	2016-06-08 16:32:39 +02:00
Ghostkeeper	59c8a4e66d	Fix validation of extruder-type settings ... Based on how ints are validated, since the data is the same. Contributes to issues CURA-1278 and CURA-340.	2016-06-08 14:16:13 +02:00
Ghostkeeper	0a34577fdb	Add documentation for createExtruderTrain ... Contributes to issues CURA-340 and CURA-1278.	2016-06-08 14:09:37 +02:00
Ghostkeeper	fffe9b3a94	Better naming for extruder slot ... The name of the extruder stack is now the same as the name for the extruder definition. The IDs are different though! Contributes to issues CURA-1278 and CURA-340.	2016-06-08 14:09:37 +02:00
Ghostkeeper	32f90ad867	Re-add per-extruder nozzles, materials, qualities ... Slightly more efficient and correct implementation.Contributes to issue CURA-340.	2016-06-08 14:09:36 +02:00
Ghostkeeper	f6ece126c3	Don't re-create user profile if one is loaded from files ... The user profiles are also saved because they are added to the container registry. So if one exists for this extruder, don't create a new blank name, but use the pre-loaded one which contained the user settings the user had before he closed down Cura previously. Contributes to issues CURA-340 and CURA-1278.	2016-06-08 14:09:36 +02:00
Arjen Hiemstra	163642f9ad	Also remove the "current_settings" container when removing a machine ... Contributes to CURA-1628	2016-06-08 14:06:14 +02:00
Ghostkeeper	8b75a230a0	Fix findContainer call without kwargs ... It has no kwargs. This needs to be provided as dictionary. Contributes to issues CURA-340 and CURA-1278.	2016-06-08 11:29:25 +02:00
Ghostkeeper	8c7b3a05b6	Enumerate again over the machine's extruders ... We needed to get the index, after all. Contributes to issues CURA-340 and CURA-1278.	2016-06-08 11:29:25 +02:00
Ghostkeeper	21545af5c8	Get only values from extruder trains dictionary ... Instead of getting the keys, which are labeled '0' and '1', we'd like to get the values, which are the extruder train IDs themselves. Contributes to issues CURA-340 and CURA-1278.	2016-06-08 11:29:25 +02:00
Ghostkeeper	91797c3944	Log error if the machine refers to invalid extruder train ID ... This helped mostly for debugging but it should be a genuine warning. Contributes to issues CURA-1278 and CURA-340.	2016-06-08 11:29:25 +02:00
Ghostkeeper	675a8c140e	Give default colour if there is no material ... Otherwise it would try to call getMetaDataEntry on None. Contributes to issues CURA-340 and CURA-1278.	2016-06-08 11:29:25 +02:00
Ghostkeeper	4aa495f9ef	Fix getting name and colour from extruder ... There used to be an extruder object from which we could ask these properties. But now we have a container stack in its place, so we need to get the properties in a slightly different way. Contributes to issues CURA-1278 and CURA-340.	2016-06-08 11:29:24 +02:00
Ghostkeeper	8b1c363932	Load current machine's extruders upon creation, start and switch of machines ... This requires some trickery of initialising the extruder manager before the machine manager is initialised, so that it properly listens to global container stack changes. Contributes to issues CURA-340 and CURA-1278.	2016-06-08 10:40:10 +02:00
Ghostkeeper	98a0f90dae	Remove unused variable _active_extruder_index ... This index is managed by ExtruderManager. Contributes to issues CURA-340 and CURA-1278.	2016-06-08 10:38:59 +02:00
Ghostkeeper	f461ed0f5f	Document singleton ... Contributes to issues CURA-340 and CURA-1278.	2016-06-08 10:38:59 +02:00
Ghostkeeper	ec26579473	Remove unused _repopulate function ... It is replaced by the addMachineExtruders function. Contributes to issues CURA-340 and CURA-1278.	2016-06-08 10:38:48 +02:00
fieldOfView	b452af5dbf	Update Profile dropdown when renaming a quality profile ... CURA-1585	2016-06-07 19:31:35 +02:00
fieldOfView	f7480baca2	Fix selecting another quality when the currently active quality is removed ... CURA-1585	2016-06-07 19:25:12 +02:00
fieldOfView	21b1891c0e	Make unique name generation more robust and simpler ... CURA-1585	2016-06-07 18:55:27 +02:00
fieldOfView	4d0bb217af	Fix crash when enabling setting visibility for adhesion_extruder_nr or support_extruder_nr ... The fix is likely not what was intended by the author of the offending code (and does not seem to be functional), but at least it fixes the hard crash outlined in CURA-1666	2016-06-07 18:13:19 +02:00
fieldOfView	cca432742b	Fix creating a name for a new MachineManagerModel ... CURA-1585	2016-06-07 17:01:08 +02:00
fieldOfView	f7e299a750	Merge branch 'master' of https://github.com/Ultimaker/Cura	2016-06-07 15:58:08 +02:00
fieldOfView	b2782ced0a	Fix "renaming" profiles/machines to their current name without adding an increment ... CURA-1585	2016-06-07 15:56:59 +02:00
Jaime van Kessel	5761307b33	Updated deepcopy to correctly copy the instance container ... CURA-1636	2016-06-07 15:45:51 +02:00
Jaime van Kessel	57ce8edcd3	Merge branch 'master' of github.com:Ultimaker/Cura	2016-06-07 14:56:46 +02:00
Jaime van Kessel	d2405a24d2	Perobject stacks are no longer saved ... CURA-1278	2016-06-07 14:56:29 +02:00
Ghostkeeper	499a0557bd	Fix checking if an extruder train already exists ... Contributes to issues CURA-340 and CURA-1278.	2016-06-07 14:00:31 +02:00
Ghostkeeper	a9376cffd1	Fix logging ... Specify the fully qualified name. Contributes to issues CURA-340 and CURA-1278.	2016-06-07 14:00:31 +02:00
Ghostkeeper	8feed746bf	Re-apply part of b991743053edf2778a2395dc9ede7007b99386eb that worked ... This was indeed a mistake. Contributes to issues CURA-340 and CURA-1278.	2016-06-07 14:00:31 +02:00
Ghostkeeper	08d116590d	Revert "Fix ExtruderManager.py" ... That is not a fix. That is a patch. This reverts commit b991743053edf2778a2395dc9ede7007b99386eb.	2016-06-07 14:00:31 +02:00
Jaime van Kessel	84a9691390	Merge branch 'master' of github.com:Ultimaker/Cura	2016-06-07 13:33:46 +02:00
Jaime van Kessel	4695862b49	Added deepcopy function to settingOverrideDecorator ... CURA-1636	2016-06-07 13:33:19 +02:00
fieldOfView	b991743053	Fix ExtruderManager.py	2016-06-07 13:30:13 +02:00
Ghostkeeper	253061cfa4	Remove unused import ... The _uniqueName function was using this but it was moved to ContainerRegistry. Contributes to issues CURA-340 and CURA-1278.	2016-06-07 13:24:19 +02:00
Ghostkeeper	c5b07debdc	Remove iterability from ExtruderManager ... This is no longer used. Contributes to issues CURA-1278 and CURA-340.	2016-06-07 13:24:19 +02:00
Ghostkeeper	227c0f9f8c	Move _uniqueName to ContainerRegistry ... It's not specific to any type of container and we might re-use this anyway. Contributes to issues CURA-1278 and CURA-340.	2016-06-07 13:24:19 +02:00
fieldOfView	3257d949eb	Merge branch 'master' of https://github.com/Ultimaker/Cura	2016-06-07 12:00:03 +02:00
fieldOfView	4fb66afe06	Mark duplicated profiles as non-read-only ... CURA-1585	2016-06-07 11:58:44 +02:00
Ghostkeeper	66bf0831f3	Document _uniqueName ... This function should really just be moved to ContainerRegistry... I'll do that later. Contributes to issues CURA-340 and CURA-1278.	2016-06-07 11:55:14 +02:00
Ghostkeeper	dff94b4559	Make ExtruderManager a QML context item ... There were two singletons of this manager: One created by QML and managed by QML, and one created by us and managed by our own singleton pattern. That won't work! So we now manage just our own singleton type, and make it a context item for QML so it can use the manager too. Contributes to issues CURA-340 and CURA-1278.	2016-06-07 11:55:14 +02:00
Ghostkeeper	9fe5435963	Rename parameter in _uniqueName ... Original means the original name. That's better. Contributes to issues CURA-1278 and CURA-340.	2016-06-07 11:55:14 +02:00
Ghostkeeper	890303da14	Add function to add all extruder trains of a machine ... This function only adds extruder trains if they have not been added already. Contributes to issues CURA-340 and CURA-1278.	2016-06-07 11:55:14 +02:00
fieldOfView	bbc33f5d70	Merge branch 'master' of https://github.com/Ultimaker/Cura	2016-06-07 11:01:24 +02:00
Jaime van Kessel	0a84867132	Fixed multiple typos / missing things in extrudermanager	2016-06-07 09:33:29 +02:00
fieldOfView	05643eca11	Fix renaming profiles from the Profiles page ... CURA-1585	2016-06-07 08:11:53 +02:00
fieldOfView	5235f74adf	Prevent unique names like "profile #10 #2" ... CURA-1606, CURA-1585	2016-06-06 17:47:33 +02:00