838 Commits

Author SHA1 Message Date
Ghostkeeper
3f5563514c
Remove _current_quality_changes_group shadow administration
Get the quality changes group back from whichever one is actually active on the stack. This prevents the two from getting out of sync, which makes the code easier to maintain.

Contributes to issue CURA-6600.
2019-08-27 13:03:29 +02:00
Ghostkeeper
62395d5503
Remove _current_quality_group shadow administration
This was causing asynchronicities.

Contributes to issue CURA-6600.
2019-08-27 12:39:19 +02:00
Ghostkeeper
89a5fe41fe
Fix getting empty quality containers
Contributes to issue CURA-6600.
2019-08-27 11:19:02 +02:00
Ghostkeeper
6f67e6b55f
Simplify activeQualityType() and remove dependency on _current_quality_group
The shadow administration is annoying so I'm removing it.

Contributes to issue CURA-6600.
2019-08-27 11:16:00 +02:00
Ghostkeeper
84c6ec36dc
Catch case where there is no global stack
Contributes to issue CURA-6600.
2019-08-27 11:14:07 +02:00
Ghostkeeper
78db68369e
Simplify activeQualityOrQualityChangesName
Removed duplicate fallback mechanism if quality is empty. And removed dependency on shadow administration in _current_quality_group.

Contributes to issue CURA-6600.
2019-08-27 11:11:17 +02:00
Ghostkeeper
01796b99cd
Simplify getting layer height
The stack already makes it fall through properly, so there's no need to implement the fallback again here.

The only change is that it now displays 0.1mm as default layer height if there is no quality profile active. I don't think this makes a difference since we don't show the layer height then anyway. And technically it would be more correct too.

Contributes to issue CURA-6600.
2019-08-27 11:06:35 +02:00
Ghostkeeper
0db99e8f21
Get quality groups from container tree
Rather than from the quality manager.

Contributes to issue CURA-6600.
2019-08-27 11:03:46 +02:00
Ghostkeeper
3de5aa3307
Remove _initMachineState
It seems to only set profiles to whatever was already in the stack.

Contributes to issue CURA-6600.
2019-08-23 14:43:50 +02:00
Ghostkeeper
f1f25e5350
Get Quality Groups from container tree rather than quality manager
The quality manager is deprecated after all.

Contributes to issue CURA-6600.
2019-08-23 14:23:18 +02:00
Ghostkeeper
617419ccc6
Use .container property of nodes to switch profiles
This also fixes a crash when switching nozzles since the variant was set to a list of profiles rather than just one profile.

Contributes to issue CURA-6600.
2019-08-23 13:51:24 +02:00
Ghostkeeper
8e06786e7b
Use ContainerTree when updating material upon nozzle switch
Rather than the material manager which is deprecated.

Contributes to issue CURA-6600.
2019-08-22 17:27:39 +02:00
Jaime van Kessel
e7609fadf4 Deprecated the allActiveMaterialIds and replaced the single location where it was used
CURA-6600
2019-08-21 17:08:35 +02:00
Remco Burema
507cb356d2 Remove (all?, most?) deprecated ContainerNode.getMetaDataEntry calls.
part of CURA-6600
2019-08-20 15:38:45 +02:00
Remco Burema
9374934d72 Merge branch 'feature_intent_container_tree' of https://github.com/Ultimaker/Cura into feature_intent_container_tree 2019-08-15 16:47:29 +02:00
Remco Burema
7fb9642e45 Replace deprecated .getContainer() calls with .container
part of CURA-6600
2019-08-15 13:40:08 +02:00
Jaime van Kessel
c0f70c447e Ensure that the materials are loaded again
CURA-6600
2019-08-15 13:32:42 +02:00
Ghostkeeper
54b46abd0f
Use specific classes instead of ContainerNode superclass
Also update the usage of these nodes because the getContainer() function is deprecated.

Contributes to issue CURA-6600.
2019-08-13 17:20:58 +02:00
Ghostkeeper
5738af4bb8
No longer use deprecated MaterialManager when asking for available materials
Use the ContainerTree structure instead. That's what it's for.

Contributes to issue CURA-6600.
2019-08-13 17:20:58 +02:00
Ghostkeeper
6a8e1557c3
Merge branch 'feature_intent' into feature_intent_container_tree
Conflicts:
	.gitlab-ci.yml
	cura/Machines/MaterialManager.py
	cura/Machines/VariantManager.py
	cura/Settings/ContainerManager.py
	cura/Settings/MachineManager.py
	tests/TestMachineManager.py
2019-08-13 14:59:05 +02:00
Ghostkeeper
447b1b9645
Actually import MaterialManager
Because this class is being used.

Contributes to issue CURA-6600.
2019-08-12 17:14:11 +02:00
Jaime van Kessel
e08feb1099 Fix final set of broken tests
CURA-6600
2019-08-12 16:32:59 +02:00
Ghostkeeper
595b0113b3
Don't link materialsChanged signal to update in MachineManager
The materialsChanged signal only gets called when the favourites are changed, so these updates are all completely unnecessary since they just make sure that the names and such of the materials are up to date.

Contributes to issue CURA-6600.
2019-08-09 14:25:44 +02:00
Jaime van Kessel
e0c2611a0a Merge branch '4.2' of github.com:Ultimaker/Cura 2019-07-26 12:47:13 +02:00
Jaime van Kessel
a3dad0fa09 Fix issue with deprecation and pyqtSlot 2019-07-26 10:55:55 +02:00
Ghostkeeper
be4e754984
Remove cache of material manager
It doesn't make the code much simpler because the cache is also not a local variable.

Contributes to issue CURA-6679.
2019-07-24 16:04:40 +02:00
Jaime van Kessel
d8ddcba091 Fix typing ignore for breath frist iterator 2019-07-23 13:40:40 +02:00
Jaime van Kessel
a436d5e0bf Added missing cast to getMachine 2019-07-19 12:43:17 +02:00
Remco Burema
fea8262656 Listen to 'material-changed' since it doesn't update immediately.
part of CURA-6590
2019-07-03 16:14:08 +02:00
Jaime van Kessel
a7d419f497 Fix deprecation decorator breaking the getExtruder function 2019-07-01 11:18:54 +02:00
Ghostkeeper
02b0242807
Fix translatability of caution message
Never put the formatting within the i18nc call. Always put the formatted string inside, but the formatting call outside of the function, like this:

    catalog.i18nc('@info', 'I am {age} years old.').format(age = my_age)

Otherwise, when looking up the translation for the string, it's going to try to look up the translation for the formatted string (with the age already filled in). It won't be able to find that because this sentence was not translated for all possible ages of a human.
In this case I can make it even easier on the translator because the list must always follow after the text.
2019-06-14 11:00:52 +02:00
Jaime van Kessel
a98f88e6a3 Also move _getMachineTypeNameFromId to DiscoveredPrintersModel
As this is only used by that model, there is no point in keeping it in the machine manager
2019-06-07 15:04:19 +02:00
Jaime van Kessel
5eee3fc368 Move hasHumanReadableMachienTypeName to discovered printers 2019-06-07 15:01:30 +02:00
Jaime van Kessel
05a5f66856 Added few more deprecation warnings for functions that bloat the machine manager 2019-06-07 14:57:32 +02:00
Ghostkeeper
228fb62e60
Handle functions in user or user-changes profiles
Normally the user hasn't got any of these unless he selected a setting to be copied for all extruders.
2019-06-03 14:15:40 +02:00
Cherubim
63cd3a52ce
Don't reset all invisible settings
Why would you need to reset all invisible settings? It shouldn't matter whether a setting is visible or not.
This is causing bugs because the settings that are being reset are not necessarily extruder-type settings (as that is checked below). They are being reset to the value self._default_extruder, which is not always a valid setting value.

Fixes #4274.
2019-05-28 15:08:03 +02:00
Jaime van Kessel
843bb6f5a3 Change some of the logging messages to info
CURA-6525
2019-05-15 17:25:31 +02:00
Lipu Fei
5e43e723e7 Fix activeMaterialsCompatible()
CURA-6511

Looks like a merge conflict
2019-05-07 14:28:13 +02:00
Jaime van Kessel
2e90078ec7 Fix incorrect deprecation message 2019-05-03 13:19:17 +02:00
Lipu Fei
d18c11a2c1 Fix filtering in switchPrinterType()
CURA-6483
2019-04-30 12:46:35 +02:00
Lipu Fei
bed13bf42b Cleanup and make sure that group_name is set 2019-04-29 15:53:08 +02:00
Lipu Fei
d16da3da3a Add group_id and fix remove printer
CURA-6483

 - Added a unique group_id (a GUID) to all created GlobalStack.
 - Changed version upgrade to generate unique group_ids for
   GlobalStacks.
 - RemoveMachine() now uses group_ids to remove hidden GlobalStacks.
2019-04-29 15:53:08 +02:00
Lipu Fei
19cd8f4edc Better naming for hasMachineTypeName()
CURA-6449
2019-04-29 13:28:18 +02:00
Lipu Fei
0501ae2fbc Handle case that printer type can be human readable string
CURA-6449
2019-04-25 13:14:28 +02:00
Ghostkeeper
6b139a9dce
Merge branch 'deprecate_some_mm_funcs' 2019-04-16 16:29:14 +02:00
Lipu Fei
8e579d2d68 Update default extruder when applying remote config
CURA-6452
2019-04-15 13:25:24 +02:00
Lipu Fei
ba37812793 Correct some deprecations and remove duplicated code 2019-04-15 09:47:09 +02:00
Lipu Fei
5f7f7f944f Remove use XYZ instead 2019-04-15 09:39:05 +02:00
Remco Burema
d3310be846 Deprecate some MachineManagaer functions.
Note: You need the 'handle_log_once' branch in Uranium to prevent spamming the logs!

part of CURA-6457
2019-04-12 16:19:54 +02:00
Lipu Fei
ad51d8f1b6 Show readable machine type in add by ip page
CURA-6057
2019-04-08 13:06:30 +02:00