23023 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ghostkeeper	99ccddefa4	Move setMaterialName to MaterialManagementModel ... No longer use the material manager which is deprecated. Contributes to issue CURA-6600.	2019-08-27 15:47:40 +02:00
Ghostkeeper	5b8ed91b04	Create new MaterialManagementModel and move canMaterialBeRemoved ... Just like the QualityManagementModel, this class is intended to be used as proxy for the material management page in the preferences. I'm intending to move all relevant pyqtSlots from the material manager into this one. The advantage of this switch is that the material manager had no well-bounded scope and so tended to become a big mess of all sorts of functions. This one has a clear scope: serve as a proxy for the buttons you can press in the preferences screen for materials. Contributes to issue CURA-6600.	2019-08-27 15:47:40 +02:00
Remco Burema	f7a15ca507	Merge branch 'feature_intent_container_tree' of https://github.com/Ultimaker/Cura into feature_intent_container_tree	2019-08-27 15:46:59 +02:00
Remco Burema	d5a8b2640f	Fix 'getQualityChangesGroups' now gives a list issues. ... part of CURA-6600	2019-08-27 15:46:47 +02:00
Remco Burema	fbf4d42f06	Active quality group can be None. ... part of CURA-6600	2019-08-27 15:22:26 +02:00
Jaime van Kessel	36dfd23e3f	Remove old buildplate function ... CURA-6600	2019-08-27 15:06:27 +02:00
Jaime van Kessel	d479e5ec58	Removed no longer used initialize function ... CURA-6600	2019-08-27 15:05:39 +02:00
Lipu Fei	9f110368de	Add do_HEAD() for auth req handler ... CURA-6609	2019-08-27 14:48:02 +02:00
Jaime van Kessel	8f75a12d27	Fix network config syncing	2019-08-27 14:46:33 +02:00
Lipu Fei	79f11286a6	Fix typing ... CURA-6643	2019-08-27 14:42:31 +02:00
Lipu Fei	946b2b943e	F5 reloads gcode file ... CURA-6643	2019-08-27 14:42:31 +02:00
Jaime van Kessel	d1a8ce54a1	Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent_container_tree	2019-08-27 14:18:41 +02:00
Jaime van Kessel	8c98773f55	Fix issues with sorting if no printer type is set	2019-08-27 14:18:07 +02:00
Jaime van Kessel	1d9d411732	Merge branch 'master' of github.com:Ultimaker/Cura into feature_intent	2019-08-27 14:17:57 +02:00
Jaime van Kessel	72ea1257d7	Prevent crash when machine isn't configured correctly yet ... CURA-6600	2019-08-27 13:50:12 +02:00
Jaime van Kessel	867a881de9	Ensure bool and enum settings get control highlighted on hover	2019-08-27 13:38:55 +02:00
Jaime van Kessel	e8cd5723c9	Speedup the layerview ... We were doing a lot of re-calculations that served no purpose (and even slowed down the rest of the application)	2019-08-27 13:26:55 +02:00
Jaime van Kessel	ea11187eaf	Don't reset the data when the root updates ... Resolves #6258	2019-08-27 13:18:11 +02:00
Jaime van Kessel	511eba28b6	Ensure that min/max feedrate & thickness gets defined in init	2019-08-27 13:06:33 +02:00
Ghostkeeper	3f5563514c	Remove _current_quality_changes_group shadow administration ... Get the quality changes group back from whichever one is actually active on the stack. This prevents the two from getting out of sync, which makes the code easier to maintain. Contributes to issue CURA-6600.	2019-08-27 13:03:29 +02:00
Jaime van Kessel	9c2f8a94d5	Greatly simplify the SimulationViewProxy	2019-08-27 13:03:23 +02:00
Ghostkeeper	62395d5503	Remove _current_quality_group shadow administration ... This was causing asynchronicities. Contributes to issue CURA-6600.	2019-08-27 12:39:19 +02:00
Jaime van Kessel	ced14c7daf	Merge branch 'CURA-6388_restore_missing_metadata' of github.com:Ultimaker/Cura	2019-08-27 11:43:27 +02:00
Jaime van Kessel	bf66388939	Make functions that should have been static, static.	2019-08-27 11:41:21 +02:00
Jaime van Kessel	43d1157aa1	Fix typing error ... CURA-6388	2019-08-27 11:38:25 +02:00
Ghostkeeper	89a5fe41fe	Fix getting empty quality containers ... Contributes to issue CURA-6600.	2019-08-27 11:19:02 +02:00
Ghostkeeper	6f67e6b55f	Simplify activeQualityType() and remove dependency on _current_quality_group ... The shadow administration is annoying so I'm removing it. Contributes to issue CURA-6600.	2019-08-27 11:16:00 +02:00
Ghostkeeper	84c6ec36dc	Catch case where there is no global stack ... Contributes to issue CURA-6600.	2019-08-27 11:14:07 +02:00
Ghostkeeper	78db68369e	Simplify activeQualityOrQualityChangesName ... Removed duplicate fallback mechanism if quality is empty. And removed dependency on shadow administration in _current_quality_group. Contributes to issue CURA-6600.	2019-08-27 11:11:17 +02:00
Ghostkeeper	01796b99cd	Simplify getting layer height ... The stack already makes it fall through properly, so there's no need to implement the fallback again here. The only change is that it now displays 0.1mm as default layer height if there is no quality profile active. I don't think this makes a difference since we don't show the layer height then anyway. And technically it would be more correct too. Contributes to issue CURA-6600.	2019-08-27 11:06:35 +02:00
Ghostkeeper	0db99e8f21	Get quality groups from container tree ... Rather than from the quality manager. Contributes to issue CURA-6600.	2019-08-27 11:03:46 +02:00
Lipu Fei	69e9dc1313	Allow importing "not supported" profiles ... CURA-6542	2019-08-27 09:08:19 +02:00
Ghostkeeper	8f34b3dd73	Set quality profiles to preferred quality upon stack creation ... A good default. Possible bug: If there are multiple matching quality profiles but the preferred quality profiles matches none or multiple of them, a random one is chosen. The random profile for the global stack may not match the random one for the extruder? Contributes to issue CURA-6600.	2019-08-27 09:07:23 +02:00
Lipu Fei	3853fb6d19	Add UI feedback on invalid firmware update ... CURA-6537	2019-08-27 08:52:13 +02:00
Ghostkeeper	fcab800a8d	Add function to find preferred quality profile ... Not for global yet, so it doesn't appear as if anything is loaded yet. Contributes to issue CURA-6600.	2019-08-26 17:50:46 +02:00
Ghostkeeper	557c3d9515	Skip global stacks better ... Otherwise it wouldn't skip custom-defined stacks, such as the PPA's stack class. Contributes to issue CURA-6600.	2019-08-26 17:11:22 +02:00
Ghostkeeper	60939d220b	Log time it takes to add container tree for a printer ... It's useful to know, at least while we're building this. Contributes to issue CURA-6600.	2019-08-26 16:58:13 +02:00
Ghostkeeper	16ee96def9	Fix skipping definition containers when adding new printers ... The speed improvement didn't work. It still doesn't seem to have a lot of effect. Maybe it's not the creating of the tree that causes this slowdown? Contributes to issue CURA-6600.	2019-08-26 16:30:16 +02:00
Ghostkeeper	be36ae278b	Fix tests mocking container tree instead of quality manager ... Contributes to issue CURA-6600.	2019-08-26 16:23:20 +02:00
Ghostkeeper	01c0472872	Don't create container tree for extruder definitions ... That wouldn't work properly anyway, but it still took quite a lot of time to create these. Contributes to issue CURA-6600.	2019-08-26 15:49:52 +02:00
Lipu Fei	946ec1d32e	Apply missing metadata fields from project files ... CURA-6388	2019-08-26 15:40:34 +02:00
Ghostkeeper	599dcb34bc	Fix sorting qualities by quality type ... Otherwise the dictionary ends up being filled by container ID which then causes the quality type to not be present in the dictionary, ending up with an empty list of quality groups. Contributes to issue CURA-6600.	2019-08-26 15:25:11 +02:00
Ghostkeeper	a90b4cc136	Fix finding global qualities: Metadata is not boolean ... It's a string, strangely. Contributes to issue CURA-6600.	2019-08-26 15:05:01 +02:00
Jaime van Kessel	b20a349b44	Merge branch 'master' of github.com:Ultimaker/Cura	2019-08-26 14:55:59 +02:00
Jaime van Kessel	108b22932b	Override saveDirtyContainers with Cura specific logic	2019-08-26 14:55:30 +02:00
Ghostkeeper	af9c5cd55c	Find global qualities for quality_definition as well ... We don't have global qualities specific to e.g. the Ultimaker 3 Extended. Contributes to issue CURA-6600.	2019-08-26 14:47:58 +02:00
Ghostkeeper	3655981c41	Use container tree to get the current printer's quality groups ... Contributes to issue CURA-6600.	2019-08-26 14:00:35 +02:00
Ian Paschal	f5af418b03	Merge pull request #6247 from Ultimaker/feature_ms_slots ... Support available configurations for network printing	2019-08-26 11:34:06 +02:00
pinchies	15e91bb32a	Add JGAurora A3S (#6235) ... * Add profile for JGAurora JGMaker Magic CURA-6734	2019-08-26 10:34:58 +02:00
Ghostkeeper	23f4aa6e4f	Fix potential race condition when slice messages arrive after clearing build plate ... Fixes #6245.	2019-08-26 09:15:37 +02:00