6290 Commits

Author	SHA1	Message	Date
Ghostkeeper	0b92c3f3df	Use .container property rather than deprecated getContainer() function ... Contributes to issue CURA-6600.	2019-09-10 14:56:16 +02:00
Diego Prado Gesto	190984462b	Merge branch '4.3'	2019-09-10 14:17:31 +02:00
Diego Prado Gesto	b18565d9cf	Merge branch 'master' into feature_intent_container_tree	2019-09-10 11:08:21 +02:00
Jaime van Kessel	e9862fb348	Move version upgrade for intents from 4.1-4.2 to 4.3-4.4 ... CURA-6599	2019-09-10 10:57:25 +02:00
Remco Burema	c7bae1e8fc	Move 'lay flat by face' operation to Uranium.	2019-09-09 23:25:16 +02:00
Ghostkeeper	f561218346	Merge branch '4.3'	2019-09-09 17:37:12 +02:00
Lipu Fei	3f3aac7ce5	Merge pull request #6289 from Ultimaker/feature_intent_interface ... Feature intent interface	2019-09-09 16:53:37 +02:00
Ghostkeeper	5debdd4cf6	Fix getting extruder list everywhere ... Didn't test this beyond my own automated test, it seems. Contributes to issue CURA-6600.	2019-09-09 16:47:29 +02:00
Lipu Fei	04e2ecde93	Init intent to empty_intent_container for new machine stacks ... CURA-6598	2019-09-09 16:12:37 +02:00
Ghostkeeper	eb401defdf	Add deprecated marker on extruders: Use extruderList ... Extruders is dangerous because it's a dict of which the values are randomly ordered. The keys are often cast to int so you can't use anything else than integer numbers. And then they are often cast back so if you're not properly counting from 0 you're also in trouble. So please, only use the list. Eventually we can switch the data structure around.	2019-09-09 14:21:57 +02:00
Lipu Fei	ea8b7ebd02	Fix remove all nodes for loaded gcode ... Fixes the problem caused in UM commit 69057b48a1fc3df7c5c6f3e754a3beb285a94678	2019-09-09 11:49:25 +02:00
Ghostkeeper	8bcd9b339a	Use GlobalStack.extrudersList instead of GlobalStack.extruders to iterate ... Otherwise the iteration can happen in any arbitrary order (due to the dict) and this can cause the result to not match to the desired combination of configurations per extruder. Contributes to issue CURA-6600.	2019-09-06 17:20:03 +02:00
Ghostkeeper	4bdc819f12	Fix nondetermistic result with dictionary values list ... Because global_stack.extruders.values can be returned in any order, the configurations matching with the lists doesn't always give a result. It happened to work on my computer with the test, but there is no guarantee of that. This is probably also going wrong in other places. I don't think we should use the .extruders property anywhere really! Contributes to issue CURA-6600.	2019-09-06 17:15:45 +02:00
Ghostkeeper	b24ea11cfc	Merge branch '4.3'	2019-09-06 16:02:21 +02:00
Ghostkeeper	82aa0492ea	Revert "CS-171 Add R2 support"	2019-09-06 14:00:04 +00:00
Jaime van Kessel	db604cdd16	Ensure that PerObjectContainer stack doesn't trigger a save	2019-09-06 11:16:12 +02:00
Ghostkeeper	71b94f6d5b	Create own quality changes profiles instead of asking quality manager ... It was a protected function call on a different class anyway, so that should never have gotten accepted. Contributes to issue CURA-6600.	2019-09-05 17:26:48 +02:00
Ghostkeeper	9a6f76c069	Add typing for get---ManagementModel ... Just to have my IDE find usages properly, really. Contributes to issue CURA-6600.	2019-09-05 16:32:34 +02:00
Jaime van Kessel	9d5ee286b4	Merge branch 'CURA-6537_ui_feedback_on_invalid_firmware' of github.com:Ultimaker/Cura	2019-09-05 16:10:30 +02:00
ChrisTerBeke	da4fcc8ee6	Revert "Revert "Remove network manager re-creation that was causing issues"" ... This reverts commit a04bcbb3e9d7a193a30684cc07a55ad8141f9a0b.	2019-09-05 14:08:18 +02:00
ChrisTerBeke	a04bcbb3e9	Revert "Remove network manager re-creation that was causing issues" ... This reverts commit 06d54f397096771ce3655c62a46f9413a6430369.	2019-09-05 11:05:26 +02:00
ChrisTerBeke	06d54f3970	Remove network manager re-creation that was causing issues	2019-09-04 19:19:49 +02:00
Remco Burema	16ea437255	Make 3MF-reader aware of setting-version for introduction Intent.	2019-09-04 14:52:54 +02:00
Lipu Fei	d154c98476	Merge pull request #6288 from Ultimaker/feature_bottom_face ... Align Face To Build-Plate	2019-09-03 16:14:48 +02:00
Remco Burema	d9b10e7180	Merge branch 'feature_bottom_face' of https://github.com/Ultimaker/Cura into feature_bottom_face	2019-09-03 16:04:38 +02:00
Remco Burema	70332978fd	Less cryptic max face-id. ... part of CURA-6745	2019-09-03 15:48:31 +02:00
Lipu Fei	efbcdcc8ac	Add None check in bottomFaceSelection() ... CURA-6745	2019-09-03 15:47:29 +02:00
Lipu Fei	44db4216bc	Rename to getEndFaceSelectionId() ... CURA-6745	2019-09-03 15:44:43 +02:00
Ghostkeeper	2f917c2841	Change definition ID upon reading profile ... Implements CURA-6713.	2019-09-03 15:38:41 +02:00
Remco Burema	503a24f7a1	Make magic value into funtion (max face-id). ... part of CURA-6745	2019-09-03 15:08:41 +02:00
Ghostkeeper	c41af1b9a0	Remove user-visible XML tags ... These XML tags are outside of the i18n call and are therefore not removed by gettext. They should not be present there.	2019-09-03 14:00:09 +02:00
Ghostkeeper	f8472d6414	Fix changing name of profiles in quality changes group ... Because quality changes don't have nodes any more. Contributes to issue CURA-6600.	2019-09-02 18:00:04 +02:00
Ghostkeeper	7216a1dbd7	Refer through to correct function of QualityManagementModel ... Contributes to issue CURA-6600.	2019-09-02 17:52:30 +02:00
Ghostkeeper	4043afd09f	Refer _createQualityChanges through to QualityManagementModel ... That's where the function was moved. This function is still being called from various places, even though it's protected. Should change that... Contributes to issue CURA-6600.	2019-09-02 17:47:31 +02:00
Ghostkeeper	a1e6ba615c	Don't use isinstance to check for extruder stack vs. global ... Just use the metadata available. Contributes to issue CURA-6600.	2019-09-02 17:44:28 +02:00
Ghostkeeper	297b430712	Fix getting container registry ... It's not in the fields of this class. Contributes to issue CURA-6600.	2019-09-02 17:42:17 +02:00
Ghostkeeper	b5d32a9b70	Move createQualityChanges function to QualityManagementModel ... This function is specific to the management page (for the most part; some things seem to call the _createQualityChanges private function nonetheless). Contributes to issue CURA-6600.	2019-09-02 17:07:18 +02:00
Ghostkeeper	b05de3e6d8	Remove unused import ... Contributes to issue CURA-6600.	2019-09-02 16:48:01 +02:00
Ghostkeeper	1c81174baf	Fix crashing upon creating QualityManagementModel and MaterialManagementModel ... The C++ object should be kept alive in QML. Contributes to issue CURA-6600.	2019-09-02 16:47:35 +02:00
Remco Burema	b97015a354	Added 'align selected face with buildplate' feature. ... Alt-click to select a face. See the (identically named) 'feature_bottom_face' branch in Uranium for more indepth information.	2019-09-02 00:17:14 +02:00
Jaime van Kessel	3fa2fefdef	Merge branch 'CURA-6643_f5_to_reload_gcode' of github.com:Ultimaker/Cura	2019-08-30 11:39:41 +02:00
Jaime van Kessel	3b321cd9e1	Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_interface	2019-08-29 16:33:12 +02:00
Jaime van Kessel	f7d61e1e24	Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent_container_tree	2019-08-29 16:31:44 +02:00
Jaime van Kessel	317052e636	Merge branch 'master' of github.com:Ultimaker/Cura into feature_intent	2019-08-29 16:31:13 +02:00
Jaime van Kessel	b00b8c8c58	Merge branch 'feature_intent_container_tree' of github.com:Ultimaker/Cura into feature_intent_interface	2019-08-29 16:28:26 +02:00
Jaime van Kessel	d548404dfd	Fix typing issues	2019-08-29 16:23:10 +02:00
Jaime van Kessel	04997fca7f	Add property for active intent category ... CURA-6598	2019-08-29 15:52:02 +02:00
Jaime van Kessel	de1065f0a3	Prevent crash if extruder is not yet set ... CURA-6598	2019-08-29 14:04:05 +02:00
Jaime van Kessel	ba0c16d968	Update intents model to use container tree ... CURA-6598	2019-08-29 13:53:23 +02:00
Jaime van Kessel	a8b818fbdc	Ensure that right intents are added to the tree ... CURA-6598	2019-08-29 13:52:01 +02:00