Commit graph

869 commits

Author SHA1 Message Date
Jaime van Kessel
2e3c3c7bd0
Change the engineering intent tooltip (again)
Let's hope that this is the final one...

CURA-6890
2019-11-04 16:07:15 +01:00
Nino van Hooff
8389c2c17a Add the (probably) final intent profile descriptions (English)
CURA-6890
2019-11-04 11:51:10 +01:00
Jaime van Kessel
1af1a8ddcb
Rename "smooth" intent to draft
CURA-6890
2019-10-31 13:26:49 +01:00
Jaime van Kessel
f679b557dc
Add visual quality to model to be translatable
CURA-6942
2019-10-31 11:54:06 +01:00
Jaime van Kessel
1284d9fe8d
Fix setting prefered material on machine creation
The previous check would occasionaly set duplicated materials
2019-10-30 11:27:46 +01:00
Jaime van Kessel
26ba0e645a
Ensure that first start machine actions model gets initialized
CURA-6932
2019-10-28 16:33:08 +01:00
Jaime van Kessel
93e97c5dce
Add update timer to intentCategory model 2019-10-25 15:15:21 +02:00
ninovanhooff
b9b086a8c0
Merge pull request #6542 from Ultimaker/CURA-6793_performance
Performance improvements
2019-10-23 16:50:04 +02:00
ninovanhooff
9beea85482
Merge pull request #6566 from Ultimaker/CURA-6858_increase_sdk_ver_7_0
Change SDK version to 7.0.0
2019-10-23 11:54:49 +02:00
Ghostkeeper
94eb76a844
Merge branch 'master' into CURA-6793_performance
Conflicts:
	cura/Machines/MaterialManager.py -> File was deleted in Master but I changed things for the lazy loading.
	cura/Machines/Models/BaseMaterialsModel.py -> I clarified documentation on a line above a place where a timer was added in between.

Contributes to issue CURA-6793.
2019-10-23 09:58:08 +02:00
Ghostkeeper
aed2346465
Don't sleep for extruder stacks
Contributes to issue CURA-6793.
2019-10-23 09:53:22 +02:00
Ghostkeeper
5b70d409ed
Improve documentation for lazy-loading background task
In particular the thread switching sleep was a bit mysterious.

Contributes to issue CURA_6793.
2019-10-23 09:46:44 +02:00
Ghostkeeper
f69360fb14
Make lazy-load container a protected inner class
Contributes to issue CURA-6793.
2019-10-23 09:42:43 +02:00
Ghostkeeper
f1e35907d2
Make MachineNodeLoadJob protected inner class
It should not be used outside of this class.

Contributes to issue CURA-6793.
2019-10-23 09:41:05 +02:00
Ghostkeeper
f3736f0576
Add typing for _machines
Contributes to issue CURA-6793.

Co-Authored-By: Jaime van Kessel <nallath@gmail.com>
2019-10-23 07:40:12 +00:00
Lipu Fei
66bc20eab1 Revert incorrect material handling code in VariantNode
CURA-6921
2019-10-22 14:53:14 +02:00
Lipu Fei
9c92e61699 Remove deprecated getChildNode and getContainer in ContainerNode
CURA-6858
2019-10-22 14:11:40 +02:00
Jaime van Kessel
d3fb066cac
Merge branch 'CURA-6851' of github.com:Ultimaker/Cura 2019-10-21 11:49:12 +02:00
Nino van Hooff
b2f9dc612d Change intent profile descriptions to not trigger pervs and prudes.
CURA-6851
2019-10-21 10:33:52 +02:00
Lipu Fei
5602c71ec7 Fix material model update and signal recursion
CURA-6904
2019-10-21 09:53:14 +02:00
Lipu Fei
5149baf593 Fix custom quality fetching
CURA-6913
2019-10-21 09:06:07 +02:00
Nino van Hooff
915c8e560c Fix mypy warning 2019-10-18 09:04:00 +02:00
Nino van Hooff
b182830c21 Add tooltips for intent profiles to the Custom Quality panel.
The description is optional.
Tooltip will not show if no description is set

CURA-6853
2019-10-17 17:17:06 +02:00
Nino van Hooff
3709cfa4ed Add tooltips for intent profiles to the Recommended Quality panel.
The description is optional.
Tooltip will not show if no description is set

CURA-6853
2019-10-17 15:54:03 +02:00
Ghostkeeper
87f9c6d7cc
Add typing for MachineNodeMap's constructor
Contributes to issue CURA-6793.

Co-Authored-By: Jaime van Kessel <nallath@gmail.com>
2019-10-16 14:11:29 +00:00
Ghostkeeper
c12817170c
Merge branch 'master' into CURA-6793_performance 2019-10-16 15:47:41 +02:00
Ghostkeeper
8179dfc412
Make cache of machines a protected field
We don't want to use it outside of the mapping. This mapping should be transparent.
We are still using it from our tests though but that's fine. Tests are allowed to touch private fields.

Contributes to issue CURA-6793.
2019-10-16 15:04:07 +02:00
Ghostkeeper
7348c70af6
Don't get whole container to just get metadata
A performance improvement, especially in the material models.

Contributes to issue CURA-6793.
2019-10-16 13:56:23 +02:00
Ghostkeeper
9b836d95d9
Remove quality, variant and material manager
We don't use them any more and they are deprecated.

Removing them removes a lot of maintenance.

Contributes to issue CURA-6801.
2019-10-16 13:00:38 +02:00
Ghostkeeper
9f84304829
Defensive against missing global qualities
This is just something I encountered. Could be that some profiles got corrupted. In my case, I had a bug in Uranium that I fixed later.

Contributes to issue CURA-6793.
2019-10-16 12:56:05 +02:00
Ghostkeeper
401390209f
Robustness against missing approximate diameter
Pretend like that material doesn't exist then.

Contributes to issue CURA-6793.
2019-10-16 10:59:58 +02:00
Lipu Fei
ae6f0eb77e Re-fix quality model update
CURA-6883
2019-10-15 15:55:21 +02:00
Lipu Fei
d350c9e3d9 Update quality and intent models when extruders get changed
CURA-6894
2019-10-15 15:53:55 +02:00
Ghostkeeper
f93f26444b
Revert "Fix QualityManagementModel update"
This reverts commit fe8b7a48e6.

This commit caused Cura to crash when creating a custom quality profile.

Contributes to issue CURA-6883.
2019-10-15 15:33:41 +02:00
Ghostkeeper
ce4c5a1c93
Remove unnecessary listening to switching extruder tabs
Also fix unnecessary emitting of switching extruder tabs.

This should improve performance a lot. I tested a lot of things and am convinced that it didn't break anything. But the automated GUI tests and QA team should be the final arbiters of that...

Contributes to issue CURA-6793.
2019-10-15 15:01:45 +02:00
Lipu Fei
0af8bd5e94 Fix merge conflicts 2019-10-15 15:00:03 +02:00
Nino van Hooff
e15952b25e Merge remote-tracking branch 'origin/master' 2019-10-15 14:37:52 +02:00
Nino van Hooff
845cab5573 Clarified comment for duplicating materials 2019-10-15 14:37:37 +02:00
Lipu Fei
fe8b7a48e6 Fix QualityManagementModel update
CURA-6883
2019-10-15 14:23:50 +02:00
Lipu Fei
43fa4337f9 Fix merge conflicts 2019-10-15 13:08:00 +02:00
Lipu Fei
36aab5d56b Fix removeMaterials() and optimization
CURA-6886
2019-10-15 13:04:57 +02:00
Lipu Fei
577365cf96 Fx containerAdded handling in VariantNode
CURA-6889
2019-10-15 08:20:25 +02:00
Ghostkeeper
b5c6a0a1e3
Merge branch 'master' into CURA-6793_performance 2019-10-14 17:17:10 +02:00
Lipu Fei
54f7892f2d Sort built-in qualities by layer height for all
CURA-6883
2019-10-14 15:25:30 +02:00
Lipu Fei
8f66809159 Always show custom qualities
CURA-6882
2019-10-14 14:34:35 +02:00
Lipu Fei
cc64fb0a93 Fix variant handling in VariantNode
CURA-6863
2019-10-14 14:19:18 +02:00
Lipu Fei
dd8f6dc10e Fix ContainerTree reacting to duplicating materials
CURA-6863
2019-10-14 12:24:05 +02:00
Lipu Fei
8b913f4009 Merge remote-tracking branch 'origin/master' into CURA-6863_duplicated_material_oddness 2019-10-14 12:23:49 +02:00
Remco Burema
26a7de5a27 Fix boolean check.
part of CURA-6863
2019-10-14 11:02:58 +02:00
Remco Burema
4277ede64f Fix 1/2 of the duplication material bug.
The material is added multiple times to the variant nodes, and overwriting it with the eventual right one was going wrong.
This does not solve it entirely (because the less specific one still ends up selected _initially_ because it gets added first, and the order can't be guaranteed.
part of CURA-6863
2019-10-14 01:01:19 +02:00