3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-10 00:07:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
34356 commits 302 branches 270 tags 770 MiB
Commit graph

993 commits

Author SHA1 Message Date
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
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