Commit graph

17030 commits

Author SHA1 Message Date
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
2c7c167fe0 CURA-5335 Looking for the actual line number in the gcode when using the filament change script. 2018-06-13 20:41:56 +02:00
Diego Prado Gesto
eb65a11e18 CURA-5330 Fix code style and typing in Toolbox plugin 2018-06-13 18:22:27 +02:00
Diego Prado Gesto
0a21ce44b0 CURA-5330 Fix code style and typing in GCodeReader plugin 2018-06-13 17:36:04 +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
Ghostkeeper
bb366afc2b
Merge branch 'master' into feature_send_material_profiles 2018-06-13 16:57:16 +02:00
jack
06f73ac798
Merge pull request #3920 from Ultimaker/CURA-5450_remove_concentric_3d
CURA-5450 remove concentric 3d
2018-06-13 16:55:44 +02:00
Jack Ha
5b688fceb1 CURA-5450 update comment 2018-06-13 16:54:55 +02:00
Diego Prado Gesto
eca23e5b5d CURA-5330 Fix typing in 3MFReader plugin 2018-06-13 16:48:08 +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
Lipu Fei
cf0efea4c3 Fix reset to formula button and use new icon
CURA-5407
2018-06-13 12:26:26 +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
3a00ddb01d Merge branch 'master' of github.com:Ultimaker/Cura 2018-06-13 11:33:20 +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
Lipu Fei
439ea79c60 Add message for unable to slice due to disabled extruders
CURA-5456
2018-06-13 11:09: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
0c3528a613 Fix missing new quality_changes
CURA-5471

Otherwise they don't get saved...
2018-06-13 09:04: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
Ghostkeeper
dd750ce125
Fix serializing flow-temperature graph
This graph needs to have its own format in the XML material profiles, which wasn't implemented.

Contributes to issue CURA-5034.
2018-06-12 16:37:59 +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
Ghostkeeper
d5878772e8
Fix reading flow temperature graph from XML files
These have their own nice little subtags that we don't even parse.

Contributes to issue CURA-5034.
2018-06-12 16:12:03 +02:00
Ghostkeeper
b2cd0ffc0f
Make createFormParts public
Because the postFormWithParts function is public and it needs these parts that can (or should) only be created with this function.

Contributes to issue CURA-5034.
2018-06-12 15:44:22 +02:00
Ghostkeeper
2e005a09ac
Remove unused import
Contributes to issue CURA-5034.
2018-06-12 15:41:52 +02:00
Ghostkeeper
d87166d5c2
Don't reconnect when getting printer data
I think I accidentally added this during debugging at some point this sleepy morning.

Contributes to issue CURA-5034.
2018-06-12 15:40:47 +02:00
Ghostkeeper
da5e4c11a4
Override connect() rather than connecting to connection state signal
This is much more lean and a bit more semantic.

Contributes to issue CURA-5034.
2018-06-12 15:40:10 +02:00
Ghostkeeper
a4171dd561
Also sync when connecting with printer
Though right now it seems to sync way too often. I don't know why it keeps connecting.

Contributes to issue CURA-5034.
2018-06-12 13:56:21 +02:00
Ghostkeeper
194bb5e8c8
Also send built-in profiles
The printer firmware won't add them currently so we're sending these profiles to their doom. However a later firmware update might fix this so we can make older Cura versions send the profiles as well so that it is forward compatible.

Contributes to issue CURA-5034.
2018-06-12 13:45:58 +02:00
Ghostkeeper
0a557fdb79
Send material per GUID with highest version number
If you have multiple materials with the same GUID (in the case of custom profiles) then we want to send only the material with the highest version number and only the base material.

Contributes to issue CURA-5034.
2018-06-12 13:42:03 +02:00
Diego Prado Gesto
b9a94a1025 Adjust the slider label width a bit to look ok in macOS 2018-06-12 13:40:28 +02:00
Jack Ha
95f7251486 CURA-5334 remove material_diameter from all printer definitions and also from fdmprinter.def.json 2018-06-12 13:39:29 +02:00
Diego Prado Gesto
7cd0f57f22 Make the slider label width adjustable depending on the number of digits of
the total number of layers.
2018-06-12 13:32:54 +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
Ghostkeeper
2dcb185a32
First ask the printer which profiles it already has
Only let the printer have one profile per GUID and make sure it's the one with the highest version.

Contributes to issue CURA-5034.
2018-06-12 12:50:33 +02:00
Jack Ha
5f53195578 CURA-5334 factor out the need for material_diameter in machine definition for getMaterialNodeByType 2018-06-12 11:40:19 +02:00