Commit graph

4006 commits

Author SHA1 Message Date
Ghostkeeper
eda0d34fd9
Call from QtApplication instead of Application
Because we're using createQmlComponent which is only in QtApplication.

Contributes to issue CURA-5330.
2018-06-15 11:21:59 +02:00
Ghostkeeper
6e663ac6f5
Don't call getMachineManager on Uranium's application
It is a function of CuraApplication.

Contributes to issue CURA-5330.
2018-06-15 11:15:31 +02:00
Ghostkeeper
c3d4d5eba7
Ignore MyPy errors caused by DepthFirstIterator not being detected as iterator
MyPy is wrong in this case.

Contributes to issue CURA-5330.
2018-06-15 11:02:15 +02:00
Ghostkeeper
4418cf3aac
Prevent accessing private _instances variable
We can get at this via the getProperty function.

Contributes to issue CURA-5330.
2018-06-15 10:59:41 +02:00
Ghostkeeper
01a645e726
Use only CuraApplication
It was complaining that getMachineManager doesn't exist, because that is in CuraApplication instead of UM.Application. I removed all references to UM.Application so that the imports are a bit simpler.

Contributes to issue CURA-5330.
2018-06-15 10:28:07 +02:00
Diego Prado Gesto
7eba868574 CURA-5330 Fix typing and code style in the UM3NetworkPrinting plugin 2018-06-14 15:41:12 +02:00
Ghostkeeper
b331736cb2
Let _findInstanceContainerDefinitionId work with DefinitionContainerInterface
But where it needs the .id field it needs to ignore this type because this works with getattr weirdness.

Contributes to issue CURA-5330.
2018-06-14 09:58:16 +02:00
Ghostkeeper
eac3c759cd
Cast each container in their stack to actual types
We know for sure that these containers have those types. We'll accept the risk here that this assumption was wrong.

Contributes to issue CURA-5330.
2018-06-14 09:58:07 +02:00
Diego Prado Gesto
51888d86fe CURA-5330 Fix typing check 2018-06-13 17:13:33 +02:00
Ghostkeeper
5bf553c63c
Merge branch 'mypy_fixes' of ssh://github.com/Ultimaker/Cura into mypy_fixes 2018-06-13 17:03:31 +02:00
Diego Prado Gesto
f2768fd761 CURA-5330 Fix typing in the Backups 2018-06-13 16:35:48 +02:00
Diego Prado Gesto
f700a39547 CURA-5330 Fix type checking in ContainerNodes 2018-06-13 16:10:11 +02:00
Diego Prado Gesto
803d945fb6 CURA-5330 Add assertions when the networkmanager is not None after creating it. 2018-06-13 13:35:17 +02:00
Diego Prado Gesto
d03b0e610b CURA-5330 Fix typing in the PreviewPass 2018-06-13 11:56:53 +02:00
Diego Prado Gesto
554a3fd908 Merge branch 'master' into mypy_fixes
Conflicts:
cura/Backups/Backup.py
cura/Settings/ExtruderManager.py
cura/Settings/MachineManager.py
2018-06-13 11:53:02 +02:00
Diego Prado Gesto
981eed313c FindNodePlacement should find a placement for the node, but not creating
a new node.
2018-06-13 11:28:20 +02:00
Diego Prado Gesto
f1b0c6238f CURA-5330 Add return type to some constructors 2018-06-13 11:01:30 +02:00
Diego Prado Gesto
6e364f0895 CURA-5330 Fix typing and code-style in the ContainerNode and all the
related children, and QualityGroup and its children.
Also fix the related calls in the managers.
2018-06-13 10:55:57 +02:00
Lipu Fei
b0b4f78cf2 Revert "Update SettingOverrideDecorator upon extruder enabled/disabled"
CURA-5456

This reverts commit 7a6e711276.
2018-06-13 10:34:01 +02:00
Lipu Fei
880e098031 Revert "Fix for code style checks"
CURA-5456

This reverts commit cc11e0a242.
2018-06-13 10:33:55 +02:00
Lipu Fei
abed6052d0 Revert "CURA-5456 Fix some code-style"
CURA-5456

This reverts commit c5d48a3a9a.
2018-06-13 10:33:46 +02:00
Diego Prado Gesto
f860b9c99e CURA-5330 Fix typing in GenericOutputController 2018-06-13 09:07:34 +02:00
Diego Prado Gesto
221cd3e73e CURA-5330 Fix typing in SingleInstance 2018-06-13 09:06:05 +02:00
Lipu Fei
1b3706e172 Fix missing new quality_changes
CURA-5471

Otherwise they don't get saved...
2018-06-13 08:59:14 +02:00
Diego Prado Gesto
3a8756efa5 CURA-5330 Fix typing in the Arranger 2018-06-13 08:53:01 +02:00
Diego Prado Gesto
698c72e190 CURA-5330 Fix typing in ExtruderManager and ContainerManager 2018-06-12 17:24:20 +02:00
Diego Prado Gesto
e6d3fd548d CURA-5330 Fix some typing in the MachineManager 2018-06-12 16:52:10 +02:00
Diego Prado Gesto
5cd464c5de CURA-5330 Fix some typing issues in QualityProfilesDropDownMenuModel and
SettingInheritanceManager.
2018-06-12 16:35:46 +02:00
Lipu Fei
3bb65a2760 No need to deepcopy before auto-arrange 2018-06-12 16:32:47 +02:00
Diego Prado Gesto
2e174e75fa CURA-5330 Add typing checks to the MachineManager 2018-06-12 16:28:39 +02:00
Diego Prado Gesto
c31d329657 Remove preference 'arrange models on load' since it was experimental and
now the arranger makes the job.
2018-06-12 13:20:20 +02:00
Diego Prado Gesto
c5d48a3a9a CURA-5456 Fix some code-style 2018-06-12 11:21:36 +02:00
Lipu Fei
cc11e0a242 Fix for code style checks
CURA-5456
2018-06-12 10:50:09 +02:00
Diego Prado Gesto
e554adc1c8 CURA-5453 Remove duplicate line. 2018-06-12 10:40:02 +02:00
Jack Ha
b3f6e5c9e0 CURA-5327 renamed MachineManager._updateMaterialWithVariant to updateMaterialWithVariant 2018-06-11 15:52:28 +02:00
Ghostkeeper
2eedc96f36
Convert to Doxygen documentation
Like the rest of Cura and Uranium.
2018-06-11 15:06:48 +02:00
Lipu Fei
48bac1a0f7 Do not move locked nodes
CURA-5347
2018-06-11 14:45:46 +02:00
Lipu Fei
74e3785a03 Fix material update upon loading a machine
CURA-5327
2018-06-11 13:42:38 +02:00
Lipu Fei
7a6e711276 Update SettingOverrideDecorator upon extruder enabled/disabled
CURA-5456

When an extruder gets disabled, the SettingOverrideDecorator should
update its associated extruder to an enabled one so the whole setup can
be sliced.
2018-06-11 13:29:36 +02:00
Lipu Fei
a04bf7d814 Merge remote-tracking branch 'origin/3.4' 2018-06-11 11:32:51 +02:00
Lipu Fei
310a99fba7 Fix deepcopy in SettingOverrideDecorator
Obvious mistake...
2018-06-11 11:32:25 +02:00
Lipu Fei
c779795618 Remove unnecessary updateMaterialForDiameter()
CURA-5327
2018-06-11 10:55:10 +02:00
Lipu Fei
8ea3c879f4 Fix quality profile update
CURA-5453

Should take into account that the custom profile being updated may not
have a quality_changes container for each stack, and Cura should create
one if this is the case, so the user changes results can be stored.
2018-06-11 10:48:22 +02:00
Lipu Fei
ef4218830b Fix package manager initialization 2018-06-11 09:37:45 +02:00
Lipu Fei
19b02cd6e8 Use MachineManager to update material container
CURA-5327

The old update function in ExtruderManager is not functioning correctly.
2018-06-11 08:13:16 +02:00
Diego Prado Gesto
2dfedf3ae4 CURA-5330 Add typing in CuraContainerRegistry and
QualityProfilesDropDownMenuModel
2018-06-08 17:02:59 +02:00
Diego Prado Gesto
7f34d7615e CURA-5330 Add typing to CuraSceneNode 2018-06-08 16:56:52 +02:00
Diego Prado Gesto
8c2ba64f32 CURA-5330 Add typing to NetworkedPrinterOutputDevice 2018-06-08 16:47:52 +02:00
Diego Prado Gesto
a6815e7c61 CURA-5330 Add typing to Backup 2018-06-08 16:31:43 +02:00
Ghostkeeper
b9d47f6092
Add function typing
This allows MyPy to detect mistakes in the typing of these functions.

Contributes to issue CURA-5330.
2018-06-08 16:31:32 +02:00