GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-29 01:28:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
24,795 Commits 294 Branches 267 Tags
Commit Graph

802 Commits

Author SHA1 Message Date
Lipu Fei
045f4c51fa Fix BaseMaterialsModel's QTimer lifecycle 2020-01-07 11:37:37 +01:00
Jaime van Kessel
7954f6633f
Let IntentModel update on a timer 
This prevents some double updates
 2020-01-03 14:13:13 +01:00
Jaime van Kessel
8b393317ff
Add "all" as a setting visibility preset 
CURA-7082
 2020-01-02 10:51:40 +01:00
Jaime van Kessel
0862fd493e
Fix some tests not cleaning up correctly after themselves 
The PrintInformation test wasn't cleaning up after itself correclty. This
left some stuff behind that the other tests were using. Since this is bad (as at that point
tests can influence other tests), i've fixed that
 2019-12-24 16:20:09 +01:00
Ghostkeeper
8a9b791298
Merge branch '4.4' 
Conflicts:
	cura/Machines/MaterialNode.py -> Due to some automated formatting tool. Please disable those tools, people.
 2019-12-23 16:26:25 +01:00
Kostas Karmas
cf6540f91d Fix qualities lookup for custom materials 
Search the qualities of the custom material based on the base_file
and not based on the id.

CURA-7070
 2019-12-18 16:44:19 +01:00
Lipu Fei
6c9b8f992f Fix quality search with material base_file 
CURA-7070
 2019-12-18 15:39:17 +01:00
Lipu Fei
4b313c2dac Fix formatting 
CURA-7070
 2019-12-18 15:38:23 +01:00
Ghostkeeper
a9849be1b2
Code style: Space around binary operators 2019-12-16 13:15:40 +01:00
Remco Burema
382d177a3b
Merge branch 'master' into CURA-7012_manage_materials_third_party_printers 2019-12-12 14:06:39 +01:00
Nino van Hooff
cef0ae349d
Fix selecting a new material for a base file on container deletion 
CURA-7023
 2019-12-11 17:17:57 +01:00
Nino van Hooff
6725e28c07 Connect materialsChanged signal for printers without variants 
Fixes duplicated materials not showing up for third party printers

CURA-7012
 2019-12-11 11:55:25 +01:00
Nino van Hooff
38935a1d02 Fix selecting a new material for a base file on container deletion 
CURA-7023
 2019-12-10 13:53:26 +01:00
Jaime van Kessel
b77de636d4
Prevent crashes when a variant could not be found 
This should not happen, but we've seen some cases where it would cause a crash, usually
when a previous upgrade did something a bit weird (in this specific case; a printer
with an empty variant, whereas it should have a variant).

Since any change that the user will make will ensure that the variant is no longer empty (eg;
any selection of a variant will mean it's no longer empty) and that there is no way back,
it should be pretty safe to ignore the situation as it will resolve itself eventually

CURA-6992
 2019-12-05 14:19:18 +01:00
Jaime van Kessel
cd7f0e8a76
Fix case where a global profile would be recognised as a extruder profile 
CURA-6991
 2019-12-05 14:17:55 +01:00
Jaime van Kessel
e937cdc937
Fix case where a global profile would be recognised as a extruder profile 
CURA-6991
 2019-11-21 13:10:01 +01:00
Jaime van Kessel
fb4ce43f0c
Prevent crashes when a variant could not be found 
This should not happen, but we've seen some cases where it would cause a crash, usually
when a previous upgrade did something a bit weird (in this specific case; a printer
with an empty variant, whereas it should have a variant).

Since any change that the user will make will ensure that the variant is no longer empty (eg;
any selection of a variant will mean it's no longer empty) and that there is no way back,
it should be pretty safe to ignore the situation as it will resolve itself eventually

CURA-6992
 2019-11-21 12:54:33 +01:00
Remco Burema
9aeb9912c8
Merge branch '4.4' 2019-11-19 15:57:52 +01:00
Remco Burema
5cae2fd098
Merge branch '4.4' into translations_4.4 2019-11-19 11:54:08 +01:00
Remco Burema
22fe13890e
Make sure translations are loaded before init. Intents. 
part of CURA-6957
 2019-11-14 18:26:46 +01:00
Lipu Fei
d70a6e81b1 Merge 4.4 2019-11-12 14:39:30 +01:00
Lipu Fei
8228c6a743 Make sure position is not None 
CURA-6974
 2019-11-12 14:22:21 +01:00
Jaime van Kessel
17b8e9930c
Add handling for case where variant could not be found 
CURA-6975
 2019-11-12 13:28:12 +01:00
Lipu Fei
d13683f4db Merge remote-tracking branch 'origin/4.4' 2019-11-11 08:13:53 +01:00
Jaime van Kessel
9940bc8551
Merge branch 'master' of github.com:Ultimaker/Cura 2019-11-08 13:38:58 +01:00
Jaime van Kessel
00078fd659
Remove a bunch of unused imports 2019-11-08 13:38:42 +01:00
Remco Burema
19d334f35c
Fix typing imports. 2019-11-07 14:31:38 +01:00
Lipu Fei
179d2c924d Fix typing 2019-11-06 12:59:51 +01:00
Jaime van Kessel
04304c1515
Correctly sort the intents in QualityManagementModel 
CURA-6956
 2019-11-05 14:59:44 +01:00
Jaime van Kessel
ff8d8735de
Make the intents in QualityManagementModel also translated 
CURA-6956
 2019-11-05 14:57:44 +01:00
Jaime van Kessel
674d8d387b
Move translations for intent to it's own file 
CURA-6956
 2019-11-05 14:52:12 +01:00
Jaime van Kessel
870db0641b
Ensure that machines with 1.75mm filament select the right preferred material 
CURA-6950
 2019-11-05 13:11:49 +01:00
Jaime van Kessel
9d9d82dc24
Make logging when using a fallback for preferred material more explicit 
CURA-6950
 2019-11-04 16:58:57 +01:00
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