21225 Commits

Author SHA1 Message Date
ChrisTerBeke
945e5f08a3
Fix checking if still connected or not 2019-08-12 20:08:57 +02:00
Ghostkeeper
2bf4ac8522
No longer trigger rebuilding node tree from quality manager
Also remove part of that from the material manager while we're at it.

Contributes to issue CURA-6600.
2019-08-12 17:29:05 +02:00
Ghostkeeper
71aed6858c
Fix getting GUID from metadata
Contributes to issue CURA-6600.
2019-08-12 17:21:26 +02:00
ChrisTerBeke
77adbdd286 Simpler check if group host 2019-08-12 17:19:20 +02:00
Ghostkeeper
ee0f2d2773
Improve documentation
Contributes to issue CURA-6600.
2019-08-12 17:18:22 +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
Ghostkeeper
42ba9a9f39
Pre-filter qualities on other properties before filtering on material
This prevents a LOT of double queries.

Contributes to issue CURA-6600.
2019-08-12 17:13:25 +02:00
Ghostkeeper
5bbb44bfdf
Remove buildplate loading of materials and don't check if variant is there
So now we no longer make material subprofiles per buildplate.
And now we create subprofiles for variants regardless if the variant exists or not.

Contributes to issue CURA-6600.
2019-08-12 16:49:57 +02:00
Ghostkeeper
1bd287f888
Move getting variant manager out of the loop
This mostly just makes it easier for me to debug where the manager is obtained from the deprecated singleton signal.

Contributes to issue CURA-6600.
2019-08-12 16:49:57 +02:00
Ghostkeeper
b1fb843f09
Implement matching qualities by material_id with same material type OR GUID
This fallback with the GUID makes this part a lot more complex, but in theory it should work. I hope that we can get some tests to debug this because it's 90% made from the top of my head now.

Contributes to issue CURA-6600.
2019-08-12 16:49:56 +02:00
ChrisTerBeke
2fb1311d93 Don't register devices needlessly, for now remove initial update 2019-08-12 16:33:59 +02:00
Jaime van Kessel
e08feb1099 Fix final set of broken tests
CURA-6600
2019-08-12 16:32:59 +02:00
Jaime van Kessel
e18820b846 Fix tests for ContainerManager
CURA-6600
2019-08-12 15:37:19 +02:00
Jaime van Kessel
719e69692c Fix import issues
CURA-6600
2019-08-12 15:20:09 +02:00
Jaime van Kessel
fc3461d865 Fix the machine node test
CURA-6600
2019-08-12 15:11:59 +02:00
Ghostkeeper
98686dd088
Fix imports for CuraApplication
Also removed two unused imports.

Contributes to issue CURA-6600.
2019-08-12 15:06:04 +02:00
Jaime van Kessel
6cea609b56 Fix intentManager test
Since we changed how the QualityManager is constructed, the test should change as well

CURA-6600
2019-08-12 14:52:05 +02:00
Jaime van Kessel
99afa6b533 Fix import issue
CURA-6600
2019-08-12 14:47:28 +02:00
Ghostkeeper
74b6501235
Check for MachineNode instead of MaterialNode
I thought I already changed that, but not apparently.

Contributes to issue CURA-6600.
2019-08-12 14:39:43 +02:00
Jaime van Kessel
8c4f8e8979 Merge branch 'master' of github.com:Ultimaker/Cura 2019-08-12 14:29:38 +02:00
Jaime van Kessel
242c3a7470 Fix crash when arranging special meshtypes
CURA-6702
2019-08-12 14:29:15 +02:00
Jaime van Kessel
789eddbdee Add missing typing
CURA-6702
2019-08-12 14:23:53 +02:00
Ghostkeeper
8f075b644d
Add global quality nodes to machine node
This means that the parent of the quality node could be one of two types. A bit confusing.

Contributes to issue CURA-6600.
2019-08-12 14:18:51 +02:00
Ghostkeeper
fff26bb021
Fix imports and references to managers
Use getInstance() where applicable.

Contributes to issue CURA-6600.
2019-08-12 14:15:40 +02:00
Ghostkeeper
91e14a90b2
Update getQualityGroups to use the new ContainerTree structure
Look how greatly this is now simplified.
The fallbacks for which material nodes to check is not yet implemented. Will do that next.

Contributes to issue CURA-6600.
2019-08-12 14:02:19 +02:00
Lipu Fei
f86ca15676 Change support_infill_angle to support_infill_angles
CURA-5882
2019-08-12 13:57:29 +02:00
Jaime van Kessel
5bc7ddf3ee Merge branch 'master' of github.com:Ultimaker/Cura 2019-08-12 13:25:13 +02:00
Jaime van Kessel
290b8f4307 Add formulas to the definition file so they get notified of updates
This is a work around for a rather fundamental issue with the current setting system;
The relationships are only created based on the definitions. So if a definition doesn't
have a formula, but a profile does, it doesn't get updated in the interface.

CURA-6708
2019-08-12 13:23:42 +02:00
Lipu Fei
b65482e992 Fix typing 2019-08-12 12:22:57 +02:00
Jaime van Kessel
3b9ab9901e Merge branch 'master' of github.com:Ultimaker/Cura 2019-08-12 10:51:14 +02:00
Jaime van Kessel
ce2b1adc82 Prevent crash on sign in if the socket was already closed 2019-08-12 10:50:46 +02:00
Lipu Fei
5804110c15
Merge pull request #4598 from DesktopMetal/feature_support_line_directions
Feature: "Support Infill/Interface Line Directions"
2019-08-12 10:47:08 +02:00
Lipu Fei
3a10345c01
Fix version upgrade 2019-08-12 10:37:00 +02:00
ChrisTerBeke
57d6402611
Merge pull request #6192 from Ultimaker/CS-234_legacy_network_connect
Add legacy 'Connect over Network' button back
2019-08-12 09:11:46 +02:00
ChrisTerBeke
5ac6b7d1e8
Fix typing of received printers 2019-08-12 01:27:32 +02:00
ChrisTerBeke
e977cdd431
Add legacy 'Connect over Network' button back 2019-08-12 01:19:41 +02:00
Ghostkeeper
80e27b62d3
Don't cache singletons in constructor
It makes it harder to test these things.

Contributes to issue CURA-6600.
2019-08-09 15:53:08 +02:00
Ghostkeeper
709584cc5e
No longer listen to qualitiesChanged signal to update
It was only being called once upon initialisation. Turns out that this model updates itself properly only because the qualities don't change during runtime unless you change the active quality group (due to materials changing) or the printer itself.

Contributes to issue CURA-6600.
2019-08-09 15:14:52 +02:00
Remco Burema
d703e48007 Add random infill start setting to expert-visibility.
part of CURA-6463
2019-08-09 14:38:57 +02:00
Ghostkeeper
9ed4713cde
Don't cache singletons in fields
This makes it harder to test these things and harder to make it perform well with lazy initialisation.

Contributes to issue CURA-6600.
2019-08-09 14:34:45 +02:00
Remco Burema
3cefa39e6c Merge branch 'master' into random_infill_start_ 2019-08-09 14:27:48 +02:00
Remco Burema
44d65b2528 Don't set a formula that'll evaluate to 'on' for randomize infill start.
It's policy to default to the old behaviour as much as possible for new features. We can maybe default to true (for these values) if we ask the materials team later. Instead opted to warn the user if the infill isn't in the list of those patterns.

part of CURA-6463
2019-08-09 14:27:42 +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
Ghostkeeper
f65e672887
Don't get build plate variants from tree any more
It's not in that tree.

Contributes to issue CURA-6600.
2019-08-09 13:43:54 +02:00
Ghostkeeper
bd714f947a
Register container tree to be built once all metadata is in
So if we ever change the order of initialisation this stays working.

Contributes to issue CURA-6600.
2019-08-09 13:40:11 +02:00
ChrisTerBeke
c52974afb9 Fix possible property access on NoneType 2019-08-09 13:12:08 +02:00
Ian Paschal
9b270d5659
Merge pull request #6182 from Ultimaker/fix-network-discovery-refresh
Fixes for network plugin
2019-08-09 13:02:52 +02:00
ChrisTerBeke
e9305a20a6 cleanup not host message 2019-08-09 12:45:38 +02:00
ChrisTerBeke
90c69e079c Fix cluster host checking, show neat actionable message when not host 2019-08-09 12:38:25 +02:00
Ghostkeeper
c607247a13
Merge branch 'master' of ssh://github.com/Ultimaker/Cura 2019-08-09 11:29:21 +02:00