763 Commits

Author SHA1 Message Date
Kostas Karmas
ad6f837f44 Force reloading the VariantNode if it exists
When the MachineNode is updated through _loadAll, it was not updating
its VariantNodes when they already existed. This caused an issue to
UM2+Olsson block printers, where changing the G-Code flavor to Marlin
was not updating the VariantNodes to search for materials (since the
variants already existed).

This commit fixes that by forcing an update to the existing Variant
nodes.

CURA-7354
2020-04-21 14:41:17 +02:00
Ghostkeeper
4050d3ccde
Prevent crash when a setting is not in any setting category
I don't know what exactly caused this since it's impossible to trace. But the crash happened with a setting called 'dual_gcode' which currently doesn't exist in Cura. So I think it must be some plug-in that adds it. In any case, it's good to be defensive about this sort of thing. Good type checking would've caught this for us.

Fixes Sentry issue CURA-JB.
2020-04-14 21:06:10 +02:00
Jaime van Kessel
2e9dca71ce
Remove a number of unused imports 2020-04-10 13:58:10 +02:00
Jaime van Kessel
fe27da5e8a
Remove a number of unused variables 2020-04-10 13:46:19 +02:00
Jaime van Kessel
e4930d3c3b
Add missing typing 2020-02-28 13:53:43 +01:00
Jaime van Kessel
769fc8fd37
Fix crashing when material could not be found
See CURA-3M in sentry. It most commonly happens with the anycubic,
since it had some weird stuff with it suddenly supporting materials.

This change will make it so that no crash happens. Old profiles will still have
an empty material. This isn't really an issue, since the interface will mark this
as an error (prompting users to switch).
2020-02-17 10:57:24 +01:00
Kostas Karmas
d5cfca4df0 Fix loading machine specific materials
The container registry was incorrectly being searched with a
variant_name == None, which always returned an empty printer-specific
materials list. As a result, the generic material settings were always
being loaded if there was no variant specifically indicated inside
the fdm_material file. The printer specific values were consistently
being ignored.

This commit fixes that by removing the search with a variant_name==None
which correctly returns the printer-specific materials list while
loading the materials from the variant nodes.

CURA-7087
2020-01-13 13:44:51 +01:00
Kostas Karmas
601a765f73 Fix typo in comment 2020-01-13 13:44:36 +01:00
Jaime van Kessel
eaf8b3491e
Fix typing issue 2020-01-10 17:49:47 +01:00
Jaime van Kessel
e74f049142
Fix bunch of issues found by pylint 2020-01-10 16:37:46 +01:00
Jaime van Kessel
81b33b8649
Add some missing typing 2020-01-10 14:58:53 +01:00
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