GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-12 21:01:46 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,379 Commits 295 Branches 268 Tags
Commit Graph

23379 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lipu Fei
fe8b7a48e6 Fix QualityManagementModel update 
CURA-6883
 2019-10-15 14:23:50 +02:00
Lipu Fei
e5450a449c IntentManager should take into account disabled extruders 
CURA-6891
 2019-10-15 13:27:58 +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
Remco Burema
9963c81294
Merge pull request #6537 from Ultimaker/CURA-6862_truncate_profile_names 
CURA-6862_truncate_profile_names
 2019-10-15 11:53:36 +02:00
Remco Burema
fde4804a58 Merge branch 'master' into CURA-6862_truncate_profile_names 2019-10-15 11:48:08 +02:00
Remco Burema
71701f15cf Remove function to reintroduce binding. 
Also force max width to integer value and comment why there is a plain value like 0.7 in the code.
part of CURA-6862
 2019-10-15 11:38:51 +02:00
Remco Burema
26e578b059 Merge branch 'master' of https://github.com/Ultimaker/Cura 2019-10-15 10:46:46 +02:00
Nino van Hooff
ca21268a12 Elide the profile text in the middle for the PrintSetupSelector. 
This makes sure that at least some part of the name and some part of the
variant details (qualityy, diameter) is visible

CURA-6862
 2019-10-15 10:26:52 +02:00
Lipu Fei
84080b675b Fix tests 2019-10-15 08:29:53 +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
Ghostkeeper
096b6431c5
Fix typos in g-code comments 2019-10-14 16:01:40 +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
2e0fd21c60 Fix setVariantByName() 2019-10-14 14:47:43 +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
Nino van Hooff
279d5671d8 Cleanup CustomPrintSetup.qml 
CURA-6862
 2019-10-14 12:14:31 +02:00
Nino van Hooff
c147174668 Limit profile name to 70% of available width for CustomPrintSetup 
This leaves 30% for the variant detail info

CURA-6862
 2019-10-14 11:05:24 +02:00
Remco Burema
26a7de5a27 Fix boolean check. 
part of CURA-6863
 2019-10-14 11:02:58 +02:00
Ghostkeeper
4cb59b5454
Fix overriding of prime tower position 
We had changed it for all printers back when we changed the prime tower position to a formula, but since then we've been getting new printer definitions that were made from templates floating around with the old structure.
We should really have an automated test for this.

Discovered during review of #6518.
 2019-10-14 11:02:43 +02:00
Remco Burema
09dc6ae44a Scouting: Try not to spam signals or errors as much. 
nominally part of CURA-6863
 2019-10-14 01:03:41 +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
KOUBeMT
fbf583b577 Update strateo3d.def.json 2019-10-11 15:27:46 +02:00
Jaime van Kessel
bba43fafcc
Remove another unused signal 2019-10-11 14:35:44 +02:00
Jaime van Kessel
85859f0b1b
Merge branch 'master' of github.com:Ultimaker/Cura 2019-10-11 14:33:26 +02:00
Jaime van Kessel
be675d9343
Remove unused signal 2019-10-11 14:33:08 +02:00
Jaime van Kessel
a91b35c2ce
Merge pull request #6518 from photodude/patch-1 
Overwrite prime_tower_position_* use value not default_value
 2019-10-11 11:46:27 +02:00
Jaime van Kessel
2860512e96
Merge branch 'master' of github.com:Ultimaker/Cura 2019-10-11 11:04:54 +02:00
Jaime van Kessel
05a6c9c3cf
Make code a bit smarter about reusing ExtruderConfigurationModels 
This prevents a lot of unneeded signal noise
 2019-10-11 11:04:16 +02:00
Lipu Fei
6ae2ddacf5
Merge pull request #6515 from Ultimaker/CURA-6872_crash_changing_material_material_disabled_extruder 
Prevent changing material / variant of disabled extruder
 2019-10-11 10:04:11 +02:00
Walt Sorensen
faf50a301c
Overwrite prime_tower_position_* value not default_value 
The default value here would not be used. Override must be `value` not `default_value` solves #6491 for BIBO but other printers may also be affected by #6491.
 2019-10-10 10:09:49 -06:00
Ghostkeeper
f6d83d7a6b
Fix sign of __contains__ 
Should've been the other way around!

Contributes to issue CURA-6793.
 2019-10-10 16:10:19 +02:00
Ghostkeeper
22d874d932
Code style 
Found during work on CURA-6973.
 2019-10-10 16:02:47 +02:00
Ghostkeeper
d3a3be832f
Fix QML errors when extruder list is temporarily 0 
Found during work on CURA-6793.
 2019-10-10 16:02:13 +02:00
Ghostkeeper
ab4fade017
Fix check if definition with ID exists 
It's not an InstanceContainer but a DefinitionContainer.
Also, when checking with the ID, it'll short circuit to the dictionary look up by ID. Then it's faster to directly check without specifying what type of container it is to prevent another nested function call.

Contributes to issue CURA-6793.
 2019-10-10 15:36:19 +02:00
Nino van Hooff
c8d65e86f1 Truncate/elide/ellipsize the material name in Preferences 
if it doesn't fit it's parent

CURA-6862
 2019-10-10 15:36:14 +02:00
Ghostkeeper
38e723b51c
Fix loading GlobalStacks on different thread 
The findContainerStacks() will list all container stacks and lazily load them. However this lazy loading is done on the thread that's calling it. The lazy loading will create GlobalStack objects, which are QObjects. The QML code then can't access those QObjects because they are created on different threads. So now instead we'll do the find query on the main thread but all the rest on the background thread.

Contributes to issue CURA-6973.
 2019-10-10 15:32:14 +02:00
Ghostkeeper
c698938c60
Remove debug print 2019-10-10 15:22:52 +02:00
Ghostkeeper
9323ed5d04
Add implementation of get() for the pretend-dict 
Some places are using this.

Contributes to issue CURA-6973.
 2019-10-10 14:56:00 +02:00
Ghostkeeper
268da885ee
Remove unused _loadAll function 
This one is no longer used since we no longer load all stacks upon start-up.

Contributes to issue CURA-6793.
 2019-10-10 14:48:46 +02:00
Ghostkeeper
7b2037fd47
Fix code style 2019-10-10 14:30:39 +02:00
Ghostkeeper
94f1749d58
Merge branch 'master' of ssh://github.com/Ultimaker/Cura 2019-10-10 13:53:40 +02:00
Ghostkeeper
b611126c00
Merge branch 'master' of https://github.com/FiCacador/Cura into FiCacador-master 2019-10-10 13:52:13 +02:00
Jaime van Kessel
ee25c4b94c
Merge branch 'CURA-6873_fix_um2_crash' of github.com:Ultimaker/Cura 2019-10-10 13:32:05 +02:00
Jaime van Kessel
07a20e131a
Prevent changing material / variant of disabled extruder 
It is disabled, so changing it's material / variant doesn't make that much sense...

CURA-6872
 2019-10-10 13:03:39 +02:00
Remco Burema
25db711adc Fix tooltips absorbed mouseclicks for view-buttons. 2019-10-10 12:57:27 +02:00
Jaime van Kessel
ec4817db87
Fix crash when syncing with configuration that has no printcores active 
CURA-6826
 2019-10-10 09:55:17 +02:00