3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-28 13:21:10 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
21683 commits 344 branches 300 tags 757 MiB
Commit graph

686 commits

Author SHA1 Message Date
Lipu Fei
66bc20eab1 Revert incorrect material handling code in VariantNode 
CURA-6921
 2019-10-22 14:53:14 +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
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
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
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
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
Jaime van Kessel
be675d9343
Remove unused signal 2019-10-11 14:33:08 +02:00
Nino van Hooff
d60b26db15 None-check for material diameter. 
Fixes a crash for materials which don't have that metadata-entry,
such as an empty material (UM2)

CURA-6873
 2019-10-10 09:27:23 +02:00
Lipu Fei
e5b90ee306 Fix is_experimental flag update 
CURA-6869
 2019-10-09 12:52:49 +02:00
Jaime van Kessel
17ce0f5eb1
Remove unused imports 2019-10-08 10:59:37 +02:00
Lipu Fei
e4fa89ea4b Simplify quality display name (label name) generation 
CURA-6706
 2019-10-07 13:28:12 +02:00
Lipu Fei
d99386cf2e Fix recommended mode 
CURA-6706
 2019-10-07 12:58:41 +02:00
Lipu Fei
2033f24a17 Use catalog to translate intent category name 
CURA-6706
 2019-10-07 12:41:52 +02:00
Lipu Fei
c42feae11c Make intents work on quality management page 
CURA-6706
 2019-10-07 09:22:47 +02:00
Lipu Fei
1981a7c65b
Merge pull request #6479 from Ultimaker/CURA-6840_intent_profile_visibility 
Cura 6840 intent profile visibility
 2019-10-07 08:18:28 +02:00
Lipu Fei
1967dd8404 Fix code style 
CURA-6840
 2019-10-07 08:12:54 +02:00
Ghostkeeper
54c1980f78
Fix preferring correct diameter over correct preference 
If the diameter doesn't match up, then the print fails. If the preference is not held up, then it chooses some random material and the user will understand what it chose.

Done during Turbo Testing and Tooling because a test was failing.
 2019-10-04 17:35:38 +02:00
Jaime van Kessel
b3b28bc330
Merge branch 'feature_intent' of github.com:Ultimaker/Cura into feature_intent 2019-10-04 15:46:41 +02:00
Ghostkeeper
05801bb623
Directly ask metadata from node instead of container 
We only need the metadata, so far. Found with a test that got broken because I wasn't mocking out the entire container.

Done during Turbo Testing and Tooling.
 2019-10-04 15:35:33 +02:00
Ghostkeeper
faa32ed33e
Remove another workaround in construction of QualityGroup 
Like the previous commit.

Done during Turbo Testing and Tooling.
 2019-10-04 15:35:32 +02:00
Ghostkeeper
6c0772cd4a
Provide activeQualityGroupName instead of QualityGroup(QObject) 
We don't need to inherit from QObject if we expose the name elsewhere. This prevents having workarounds for C++ vs QML ownership, and also allows us to test this while mocking out CuraApplication.

Done during Turbo Testing and Tooling.
 2019-10-04 15:35:32 +02:00
Ghostkeeper
6f2f15c74f
Use pre-cached quality type from node rather than re-requesting it 
Minor performance increase.

Done during Turbo Testing and Tooling.
 2019-10-04 15:35:32 +02:00
Ghostkeeper
0a6842703c
Update documentation 
This class no longer applies to quality changes. Quality changes groups don't exist any more.

Done during Turbo Testing and Tooling.
 2019-10-04 15:35:24 +02:00
Lipu Fei
4579b06f6d Fix typing 2019-10-04 15:10:42 +02:00
Lipu Fei
3c4d29a814 Merge remote-tracking branch 'origin/feature_intent' into CURA-6840_intent_profile_visibility 2019-10-04 15:00:21 +02:00
Nino van Hooff
8d223c01d4 Add type annotation for layer_heights_added 
CURA-6840
 2019-10-04 14:07:57 +02:00
Jaime van Kessel
85ed22de4c
Add some profiling decorators to the ContainerTree 2019-10-04 13:29:22 +02:00
Nino van Hooff
88e0a57374 Fix typing and deduplicate fetch_layer_height 
CURA-6840
 2019-10-04 13:25:58 +02:00
Nino van Hooff
68f334e141 Fix: Consider all active extruder intent profiles for display. 
Remove the notion of a singular 'active' extruder from the code.
Visibility of intent profiles should consider all enabled extruders.
This fix makes sure that it doesn't matter in what order materials are
loaded, the available intent profiles will be the same.

CURA-6840
 2019-10-04 11:21:25 +02:00
Lipu Fei
a93fd982dd Fix renaming custom profile 
CURA-6842
 2019-10-02 23:59:48 +02:00