446 Commits

Author	SHA1	Message	Date
Lipu Fei	6b0095014a	Fix merge conflicts from master	2018-02-28 12:52:45 +01:00
Lipu Fei	ab4cfa5fbb	Use userChanges instead of getContainer(0) ... CURA-4916	2018-02-28 12:49:41 +01:00
Lipu Fei	07824c21e1	Move getMachineDefinitionIDForQualitySearch() into QualityManager.py	2018-02-28 11:48:20 +01:00
Aleksei S	e533c4604c	Update infill scroll bar if setting is changed in custom mode ... CURA-4916	2018-02-28 10:52:46 +01:00
Jack Ha	ae00fc2a7e	CURA-4606 change activeQualityLayerHeight to use self._current_quality(_changes)_group	2018-02-27 15:15:04 +01:00
Jack Ha	cbeaf3b287	CURA-4606 set empty quality when setting active machine when the current quality type is not in the available qualities	2018-02-27 15:14:34 +01:00
Jack Ha	fae82ef242	Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager	2018-02-27 13:57:37 +01:00
Jack Ha	08bfe93385	CURA-4606 CURA-5020 switching to quality changes now also checks and shows keep or discard user settings	2018-02-27 13:57:30 +01:00
Lipu Fei	a2e84bbe97	Fix set quality group in init machine	2018-02-27 13:49:20 +01:00
Lipu Fei	5412a29ef9	Fix update quality upon material change	2018-02-27 13:05:19 +01:00
Lipu Fei	0b8678d2ae	Explicitly create MachineManager	2018-02-26 19:33:16 +01:00
Lipu Fei	a3a206c6dd	Quality groups are QObjects	2018-02-22 23:07:49 +01:00
Lipu Fei	e53048079d	Remove debugging logs	2018-02-22 23:05:06 +01:00
Lipu Fei	32e1015f25	WIP: Cleanup PrintInformation	2018-02-22 16:07:56 +01:00
Lipu Fei	b415a36110	WIP: Remove delayed update in MachineManager	2018-02-22 13:58:35 +01:00
Lipu Fei	25dd63dc21	WIP: Cleanup MachineManager	2018-02-22 13:45:46 +01:00
Lipu Fei	7a2c25226a	Fix initial quality_changes group setup	2018-02-22 12:59:26 +01:00
Lipu Fei	b014800eac	Fix various quality related issues	2018-02-22 11:00:32 +01:00
Lipu Fei	3095140bc3	Fix quality/qualityChanges group initialization	2018-02-22 10:27:18 +01:00
Lipu Fei	d83b803fe0	Fix: Update active material names if materials lookup table gets updated	2018-02-21 16:47:12 +01:00
Lipu Fei	7a3ebe1a42	Fix NozzleMenu active nozzle bullet	2018-02-21 16:36:42 +01:00
Jack Ha	244b109403	CURA-4606 CURA-4995 switching print core now correctly updates the material	2018-02-21 16:30:45 +01:00
Jack Ha	5ba0ac8a43	CURA-4606 switch to first extruder when switching machines; this prevents crashing when switching to single extruder machine	2018-02-21 15:59:49 +01:00
Lipu Fei	02472f6ad2	WIP: Fix material name update upon machine switching	2018-02-21 12:39:04 +01:00
Lipu Fei	6cd47453bb	WIP: Fix activeMaterialsCompatible()	2018-02-21 11:36:46 +01:00
Jack Ha	2e3e01ff95	CURA-4606 Cleanup WorkspaceSummaryDialog and prepare for single extrusion mode	2018-02-21 11:13:35 +01:00
Jack Ha	471182333d	CURA-4606 refactored activeMaterialNames	2018-02-21 10:41:39 +01:00
Jack Ha	c3349baf39	CURA-4606 fix bug concerning activeMaterialsCompatible; factor out activeQualityName	2018-02-21 10:36:51 +01:00
Jack Ha	363db9e536	CURA-4606 no stack checking for errors on active extruder switch	2018-02-21 10:35:48 +01:00
Jack Ha	ad6548a5dc	CURA-4606 factored activeMaterialName out	2018-02-21 10:35:17 +01:00
Jack Ha	f9e2d7fe2c	CURA-4606 changing current print core now always updates the correct one	2018-02-21 09:17:31 +01:00
Jack Ha	8401e1c7f7	CURA-4606 incompatible material(s) now results in an empty quality list	2018-02-21 09:13:42 +01:00
Jack Ha	b96d49c010	CURA-4606 ensure startup order for machine manager before build volume to prevent errors there	2018-02-20 16:04:41 +01:00
Jack Ha	c56b3bc7bd	CURA-4606 add the discard or keep changes screen	2018-02-20 15:35:17 +01:00
Jack Ha	9e9d981acd	CURA-4606 ensure that setting a new machine ends with correct quality (changes) group	2018-02-20 15:17:19 +01:00
Lipu Fei	c432d4ffbb	WIP: Simplify global stack and extruder stack activation and fixes	2018-02-20 11:16:51 +01:00
Lipu Fei	62c31c2f6c	WIP: Remove old QualityManager	2018-02-19 22:11:47 +01:00
Lipu Fei	5bb6efcb3e	WIP: Cleanup MachineManager	2018-02-19 21:20:10 +01:00
Lipu Fei	0c3ac090c9	WIP: Cleanup	2018-02-19 21:11:01 +01:00
Lipu Fei	faf02424a7	WIP: Cleanup MachineManager	2018-02-19 16:50:18 +01:00
Jack Ha	8efe13a55a	CURA-4606 fix profiles page Active button	2018-02-19 15:24:58 +01:00
Lipu Fei	2d5f65a954	WIP: Fix NozzleMenu QObject result type	2018-02-19 14:23:05 +01:00
Lipu Fei	6124729f01	WIP: Cleanup MachineManager	2018-02-17 22:27:56 +01:00
Lipu Fei	495fc8bbd7	WIP: Refactor BuildPlateModel and split MultiBuildPlateModel	2018-02-17 22:24:05 +01:00
Lipu Fei	2cfdbc1b16	WIP: Remove old quality models	2018-02-17 14:10:01 +01:00
Lipu Fei	720dd70935	WIP: Cleanup MachineManager	2018-02-16 17:01:57 +01:00
Lipu Fei	96f1264364	WIP: Rework profile management page	2018-02-16 16:40:09 +01:00
Lipu Fei	4468f4d620	WIP: Fix NozzleMenu warning on non-notifiable bindings	2018-02-16 14:23:11 +01:00
Lipu Fei	9ffe89b49c	WIP: Remove setActiveVariant()	2018-02-16 14:23:11 +01:00
Lipu Fei	13d745f07d	WIP: Move NozzleModel.py	2018-02-16 14:23:11 +01:00