Commit graph

22028 commits

Author SHA1 Message Date
Ghostkeeper
38937d8ac4
Remove material node when material is deleted
Contributes to issue CURA-6600.
2019-08-19 14:47:08 +02:00
Jaime van Kessel
4ff8991196 Ensure that materials get filtered by diameter again
CURA-6600
2019-08-19 14:10:36 +02:00
Jaime van Kessel
d29b3078b3 Clean up no longer used code
CURA-6600
2019-08-19 13:15:38 +02:00
Jaime van Kessel
fcbfa88d97 Fix creation of new materials
CURA-6600
2019-08-19 13:13:08 +02:00
Jaime van Kessel
88857a7be8 Fix setMaterialName
CURA-6600
2019-08-19 13:06:09 +02:00
Jaime van Kessel
646222f2ac Fix removing of material
CURA-6600
2019-08-19 13:01:05 +02:00
Jaime van Kessel
49e8c8d9d9 Fix the check to see if a material can be removed
CURA-6600
2019-08-19 12:52:31 +02:00
Jaime van Kessel
8759aae73e Fix crash when materialManager could not be converted to QObject
No idea why this was causing issues, but this should also be a bit faster.

CURA-6600
2019-08-19 12:47:07 +02:00
Ghostkeeper
53efad7e6f
Fix translation of horizontal expansion in French
It's not 'horizontal printing speed'.
2019-08-19 12:39:54 +02:00
Jaime van Kessel
2417705dfd Prevent crashes when duplicating a material
CURA-6600
2019-08-19 11:42:52 +02:00
Jaime van Kessel
dc26f98a3a Fix import issue
CURA-6600
2019-08-19 11:30:04 +02:00
Jaime van Kessel
76b58134ae Fix getRootMaterialIdForDiameter
CURA-6600
2019-08-19 11:07:35 +02:00
Jaime van Kessel
4dd5cb1a85 Fix getMaterialByType
CURA-6600
2019-08-19 09:44:39 +02:00
Ghostkeeper
80baeb9873
Remove _added functions for nodes that can't be added during runtime
Among the machines, variants, materials, qualities and intents, only machines and materials can ever be added during runtime. For the rest, we don't need to listen to these signals.

Contributes to issue CURA-6600.
2019-08-16 16:28:42 +02:00
Ghostkeeper
362c7d09fb
Fix displaying generic materials
I had that commented out for debugging.
2019-08-16 13:38:14 +02:00
Ghostkeeper
04d5423d81
Fix scrolling all the way down in Qt 5.13
It didn't properly connect the height of the column to the scrolled length, I think. Perhaps a Qt bug. It didn't occur in 5.11 or 5.10 yet.
2019-08-16 13:36:15 +02:00
Jaime van Kessel
97e77994a1 Update the removing & duplicating of material
CURA-6600
2019-08-16 10:55:12 +02:00
KOUBeMT
e4a4e965f9 Removing_supprot_for_generic_materials 2019-08-16 10:26:49 +02:00
Jaime van Kessel
8d05ebef9d Fix crash on adding a new printer
CURA-6600
2019-08-16 10:24:50 +02:00
Remco Burema
7ed8d0b2f7 Remove deprecated .getMetadata() call.
part of CURA-6600
2019-08-16 09:37:58 +02:00
ChrisTerBeke
60758093f1
Determine skeleton loading properly 2019-08-15 21:29:20 +02:00
ChrisTerBeke
75f52c5a24
Bring back skeleton loading for monitor stage 2019-08-15 21:25:56 +02:00
ChrisTerBeke
7e9662e30e
Fix monitor tab UI not updating for cloud device due to overridden signals 2019-08-15 20:25:59 +02:00
ChrisTerBeke
9e6e9a4beb
Enable force override print job in local network, fix override button not enabled on older firmwares 2019-08-15 20:16:55 +02:00
ChrisTerBeke
de3f82610a
Add tooltips for firmware update back, fix print job override state 2019-08-15 19:42:25 +02:00
Ghostkeeper
46e5bc897f
Fix deprecated getQualityGroups in QualityManager
It needs to get the actual extruders, not their keys.

Contributes to issue CURA-6600.
2019-08-15 17:01:23 +02:00
Ghostkeeper
606bef9b5f
Use ContainerTree structure to get quality groups
Contributes to issue CURA-6600.
2019-08-15 17:01:23 +02:00
Ghostkeeper
9bcd3d8c1e
Use ContainerTree to get quality groups instead of QualityManager
Contributes to issue CURA-6600.
2019-08-15 17:01:23 +02:00
Ghostkeeper
d4cd5a7ea5
Add convenience function to get quality groups for current printer
This is used very often all over the code.

Contributes to issue CURA-6600.
2019-08-15 17:01:22 +02:00
Ghostkeeper
3f944462ed
Use ContainerTree to get quality groups
Contributes to issue CURA-6600.
2019-08-15 17:01:22 +02:00
Ghostkeeper
ed19e9e15c
Use ContainerTree to find quality groups
Contributes to issue CURA-6600.
2019-08-15 17:01:22 +02:00
Ghostkeeper
8a51582210
Pre-fill list of qualities_per_type_per_extruder with empty dicts
Otherwise you get an IndexError later on.

Contributes to issue CURA-6600.
2019-08-15 17:01:21 +02:00
Ghostkeeper
44c98ba0d1
Fix import
Should've checked first...

Contributes to issue CURA-6600.
2019-08-15 17:01:21 +02:00
Ghostkeeper
02fbdd96a4
Don't return quality groups that are not available
And don't return an arbitrary group then. That arbitrary group could also be unavailable.

Contributes to issue CURA-6600.
2019-08-15 17:01:21 +02:00
Ghostkeeper
370d7adcd5
Let getDefaultQualityType use the container tree structure
Contributes to issue CURA-6600.
2019-08-15 17:01:20 +02:00
Ghostkeeper
bee5491879
Move getQualityGroups to MachineNode
It's specific to that machine and the container tree structure, so this is the best place for it we could find.

Contributes to issue CURA-6600.
2019-08-15 17:01:20 +02:00
Ghostkeeper
ca163ea5f0
Skip inactive extruders to determine available quality types
Contributes to issue CURA-6600.
2019-08-15 17:01:20 +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
ChrisTerBeke
36f6bdca18 Bring cast back to fix typing 2019-08-15 14:36:25 +02:00
ChrisTerBeke
83ce3f6ea6 Merge branch 'master' of https://github.com/Ultimaker/Cura 2019-08-15 14:30:25 +02:00
ChrisTerBeke
6833323845 UM3PrinterAction - refactor to property, remove discovery start from reset 2019-08-15 14:30:11 +02:00
Remco Burema
1609138d4d Remove deprecated ContainerNode.getChildNode(...) calls.
part of CURA-6600
2019-08-15 13:56:41 +02:00
Lipu Fei
581cde1ddf Use HTTPS for firmware update check URLs 2019-08-15 13:42:13 +02:00
Ghostkeeper
fb509a0692
Fix setting the global quality node
Otherwise you'd get a KeyError there.

Contributes to issue CURA-6600.
2019-08-15 13:41:11 +02:00
Remco Burema
7fb9642e45 Replace deprecated .getContainer() calls with .container
part of CURA-6600
2019-08-15 13:40:08 +02:00
Lipu Fei
4feb22e065 Fix version upgrade for imade3d jellybox
CURA-6709
2019-08-15 13:37:04 +02:00
Jaime van Kessel
76729360e1 Remove unused code
CURA-6600
2019-08-15 13:33:17 +02:00
Jaime van Kessel
c0f70c447e Ensure that the materials are loaded again
CURA-6600
2019-08-15 13:32:42 +02:00
ChrisTerBeke
ab4fd3a7f9 Merge branch 'master' of https://github.com/Ultimaker/Cura 2019-08-15 13:21:17 +02:00
ChrisTerBeke
eb5e1904ab Fix setting printer type on print job 2019-08-15 13:21:10 +02:00