GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-05 14:54:33 +08:00
Code Issues Packages Projects Releases Wiki Activity
29,052 Commits 289 Branches 260 Tags
Commit Graph

500 Commits

Author SHA1 Message Date
Jaime van Kessel
93e97c5dce
Add update timer to intentCategory model 2019-10-25 15:15:21 +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
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
c12817170c
Merge branch 'master' into CURA-6793_performance 2019-10-16 15:47:41 +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
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 fe8b7a48e6c4e7d4dc05d21f417a9968bef73cb3.

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
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
dd8f6dc10e Fix ContainerTree reacting to duplicating materials 
CURA-6863
 2019-10-14 12:24:05 +02:00
Ghostkeeper
23904e1dca
Don't cache machine manager and application 
This makes testing harder. Also fixed the typing of the application this way.

Contributes to issue CURA-6793.
 2019-10-08 14:16:19 +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
1967dd8404 Fix code style 
CURA-6840
 2019-10-07 08:12:54 +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
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
Lipu Fei
296f8af59c Always clear ListModel so layer height selector will align properly 
CURA-6836
 2019-10-01 16:15:36 +02:00
Lipu Fei
d1330e5ffa Fix updating custom quality menu model 
CURA-6599
 2019-09-25 14:36:46 +02:00
Lipu Fei
f2e518da6b Fix code style and typing 2019-09-25 08:23:57 +02:00
Lipu Fei
94e89ad4ac Fix merge conflicts with master 2019-09-24 14:26:43 +02:00
Lipu Fei
1aa6708677 Fix typing 2019-09-23 10:59:31 +02:00
Ghostkeeper
4a68e7ec95
Fix favorite materials without material manager 
We just track it via the preference value itself rather than duplicating that in any other data structure. It's simple enough.

Contributes to issue CURA-6776.
 2019-09-20 09:57:36 +02:00
Jaime van Kessel
830b22e381
Fix crash when adding a machine without materials 
CURA-6775
 2019-09-19 15:12:29 +02:00
Jaime van Kessel
3e474c1107
Ensure that enabling & disabling an extruder gets handled correctly 
CURA-6775
 2019-09-19 14:54:58 +02:00
Jaime van Kessel
884a3ea819
Fix selection for intents if only one of the extruders has an intent 
CURA-6598
 2019-09-19 09:54:47 +02:00
Jaime van Kessel
78ab218cc2
No longer reset to default intent when configuration changed 
This caused the intent to be reset every time a change was made.

CURA-6600
 2019-09-18 14:52:51 +02:00
Ghostkeeper
2571f54d3c
Simplify looping over quality groups 
Contributes to issue CURA-6600.
 2019-09-18 14:01:23 +02:00
Ghostkeeper
0eb3c5c0d6
Refer material manager functions through to material management model 
That's where the materials are duplicated now. So we only maintain one implementation of that.

Contributes to issue CURA-6600.
 2019-09-17 17:50:38 +02:00