Commit graph

4211 commits

Author SHA1 Message Date
Diego Prado Gesto
0692192d58 Merge branch '3.4' 2018-07-02 09:10:57 +02:00
Lipu Fei
dc8d9e0f96
Merge branch 'master' into mypy_fixes 2018-06-29 13:45:55 +02:00
Diego Prado Gesto
56c7c6f2b2 CURA-5518 Check whether the the findDefinitionContainers return any
element or not.
2018-06-29 10:41:54 +02:00
Jaime van Kessel
b4f59a7822 Removed unneeded application reference in construction of meshreaders 2018-06-29 09:25:38 +02:00
Ghostkeeper
0cb6e506d2
Rewrite code style of _getScaleFromUnit
It should be much more readable now.

Discovered while investigating #3847.
2018-06-28 16:39:53 +02:00
Mark
5fe812b4a4 Add downloadnumber to model and plugin view 2018-06-26 15:29:35 +02:00
Ghostkeeper
d4ca3d144e
Use latest temperature instead of a manual resume temperature
We don't need the user to fill this in. We can just track the resume temperature ourselves.

Contributes to issue CURA-5491.
2018-06-21 16:07:29 +02:00
Ghostkeeper
a401c1d64f
Disambiguate between list of metadatas and metadata
Because MyPy doesn't allow a variable to change its type later.

Contributes to issue CURA-5330.
2018-06-15 17:03:04 +02:00
Ghostkeeper
79c6b2dad8
Use CuraApplication instead of Application
Because UM.Application doesn't have any getPrintJobInformation function or anything like that.

Contributes to issue CURA-5330.
2018-06-15 16:55:30 +02:00
Ghostkeeper
e717abf499
Fix typing related to Network Printing
Contributes to issue CURA-5330.
2018-06-15 16:53:45 +02:00
Ghostkeeper
b07db74011
Fix more typing errors
It never ends.

Contributes to issue CURA-5330.
2018-06-15 15:44:29 +02:00
Ghostkeeper
cfd0bde6b1
Use CuraApplication instead of Application
Because UM.Application has no function getMultiBuildPlateModel.

Contributes to issue CURA-5330.
2018-06-15 15:32:44 +02:00
Ghostkeeper
797d05947c
Fix type errors
Contributes to issue CURA-5330.
2018-06-15 15:20:41 +02:00
Ghostkeeper
9821793b46
Don't override boundingbox of SceneNode
Whatever was intended here, it didn't work. Because when a method is called it is called on the class of the object. Methods are not attributes of instances but attributes of the class. The attribute of the class was never changed, so this had no effect.

Contributes to issue CURA-5330.
2018-06-15 15:16:55 +02:00
Ghostkeeper
10f22f9c25
Cast result of getPluginObject to the plug-in type it implements
We know for sure what the type of that plug-in is, only we can't import that type because it's a plug-in. We can (and did) import the plug-in type object MeshWriter though.

Contributes to issue CURA-5330.
2018-06-15 15:09:19 +02:00
Ghostkeeper
e957f7b650
Fix typing errors
Contributes to issue CURA-5330.
2018-06-15 15:07:08 +02:00
Ghostkeeper
2b33a1f1b6
Fix broken import with DefinitionContainerInterface
And the ensuing type error that can then be found.

Contributes to issue CURA-5330.
2018-06-15 14:31:29 +02:00
Ghostkeeper
0d52b03716
Fix the wrong types in this class
These mistakes were found by MyPy.

Contributes to issue CURA-5330.
2018-06-15 14:25:25 +02:00
Ghostkeeper
4c3d28709b
Add typing for all functions and fields
Lots of typing so that MyPy can then check whether the functions are safe to call.

Contributes to issue CURA-5330.
2018-06-15 14:07:33 +02:00
Ghostkeeper
8256788ed8
Use CuraApplication instead of Application
Because we need to call getExtruderManager which is only in CuraApplication.

Contributes to issue CURA-5330.
2018-06-15 13:40:43 +02:00
Ghostkeeper
75e5a185d9
Don't unnecessarily cast to a set
The InstanceContainer version of getAllKeys was first casting to a list but I removed that, because everywhere where we were using it we were casting it directly to a set.

Contributes to issue CURA-5330.
2018-06-15 13:07:55 +02:00
Diego Prado Gesto
b309e93767 CURA-5330 Fix typing in the VersionUpgrade plugin 2018-06-14 16:54:22 +02:00
Diego Prado Gesto
dc4556647a CURA-5330 Fix code style in XmlMaterialProfile plugin 2018-06-14 16:49:26 +02:00
Diego Prado Gesto
a184fad8ee CURA-5330 Add typing to the USBPrinting plugin 2018-06-14 15:57:30 +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
e0699a0997
Merge branch '3.4' 2018-06-14 14:57:20 +02:00
Ghostkeeper
7b82421751
Don't disable E steppers when pausing
There is no such command to disable only the E stepper drivers. This command M84 gets interpreted as disabling ALL stepper drivers, which on some printers would cause the print bed to fall down.
2018-06-14 14:57:03 +02:00
Diego Prado Gesto
dfd20e1362 CURA-5335 Looking for the actual line number in the gcode when using the filament change script. 2018-06-14 14:35:46 +02:00
Mark
49a3444b13 Unhide label for master 2018-06-14 10:59:05 +02:00
Jack Ha
f5dd7f6e92 CURA-5456 fixed typo, fixed multi objects with disabled extruders in message 2018-06-14 10:27:24 +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
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
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
b9a94a1025 Adjust the slider label width a bit to look ok in macOS 2018-06-12 13:40:28 +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
Lipu Fei
b81635ac8e Update setting_version to 5 and add 34 -> 40 upgrade
CURA-5450

Also update setting_version for all qualities and variants.
2018-06-12 10:17:35 +02:00
Jack Ha
fa93d47d5b Merge branch 'master' of github.com:Ultimaker/Cura 2018-06-11 17:00:51 +02:00
Jack Ha
89c84eb93b CURA-5327 fix crash when changing material diameter 2018-06-11 17:00:43 +02:00
Diego Prado Gesto
335d3d4329 Merge branch 'master' of github.com:Ultimaker/Cura 2018-06-11 15:55:22 +02:00
Diego Prado Gesto
6e575c9cf5 CURA-5463 The packages that are scheduled to be removed, are not old
packages.
2018-06-11 15:54:11 +02:00
Jack Ha
b3f6e5c9e0 CURA-5327 renamed MachineManager._updateMaterialWithVariant to updateMaterialWithVariant 2018-06-11 15:52:28 +02:00
Diego Prado Gesto
8c9939e797 CURA-5444 Also get the metadata even if the material was marked as not
compatible.
2018-06-11 11:20:49 +02:00
Diego Prado Gesto
dc1e36d726 CURA-5444 Always create the instance of the material even if it is not
compatible, otherwise it will never show as
incompatible if the material profile doesn't define hotends in the
machine.
2018-06-11 11:20:32 +02:00
Ghostkeeper
54a03723ab
Set encoding correctly when opening files everywhere
Otherwise the encoding is interpreted differently on Windows and Mac.
2018-06-11 11:09:07 +02:00
Lipu Fei
c779795618 Remove unnecessary updateMaterialForDiameter()
CURA-5327
2018-06-11 10:55:10 +02:00
Lipu Fei
83fcc60bee Show message for unknown machines in project files
CURA-5337

Do not crash on loading project files with unkown machine types. Show a
message instead.
2018-06-11 07:52:34 +02:00