3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-22 22:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
18800 commits 305 branches 272 tags 787 MiB
Commit graph

4854 commits

Author SHA1 Message Date
Lipu Fei
e87f3d7ca9 Fix plugins import in CuraApplication 
CURA-5543

Only import types for type checking when TYPE_CHECKING is true.
 2018-07-05 10:23:20 +02:00
Ghostkeeper
4f1b2d51cc
Remove old commented code 
This is not valid any more by a long shot.
 2018-07-05 09:45:20 +02:00
Ghostkeeper
2023973e98
Use _engine_ready to detect if there is a QML engine 
We already have this variable. Let's not use a private variable from another class.
 2018-07-04 17:39:24 +02:00
Ghostkeeper
b812989f1c
Add types for width, height, depth and shape 2018-07-04 17:34:26 +02:00
Ghostkeeper
c9480f2f2b
Add types for backup metadata 2018-07-04 17:30:01 +02:00
Diego Prado Gesto
f91b6faecc Fix code-styling 2018-07-03 17:57:30 +02:00
Diego Prado Gesto
9fa8498162 Fix code-style in MaterialManager 2018-07-03 13:25:39 +02:00
Diego Prado Gesto
8633d75751 Fix error introduced when fixing code-style 2018-07-03 13:14:40 +02:00
Diego Prado Gesto
ff6bc9de4e Fix some more code-style 2018-07-03 13:09:05 +02:00
Diego Prado Gesto
762a1b1bfd Fix code-style 2018-07-03 12:06:06 +02:00
alekseisasin
debe142c18
Merge pull request #3914 from Ultimaker/CURA-5334_extruder_def_for_all 
CURA-5334 Add extruder definitions for all single-extrusion machines
 2018-07-02 15:56:45 +02:00
Jack Ha
3761123513 Merge branch 'master' into CURA-5334_extruder_def_for_all 2018-07-02 14:11:24 +02:00
Ian Paschal
680e98fb28 Removed duplicate '.self' 2018-07-02 13:11:01 +02:00
Ian Paschal
8f7370db6c Merge remote-tracking branch 'origin/master' into feature_send_material_profiles 2018-07-02 12:37:56 +02:00
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
Ghostkeeper
2b83af2497
Move initialization into Uranium's run() function 
This makes it possible to start a Uranium-based application without needing to know the magic incantation of starting the application.
 2018-06-28 21:41:16 +02:00
Diego Prado Gesto
6737dfac47 Protect against crashes when the temporary file is still in use by 
another process.

Contributes to CURA-5516.
 2018-06-28 16:09:00 +02:00
Diego Prado Gesto
36c25a29a8 CURA-5508 Add protection before reading a file that may not exist. 2018-06-27 11:04:53 +02:00
Aleksei S
c4fa50a8fc Added icon for custom Menu items 2018-06-25 16:51:40 +02:00
Aleksei S
f577789859 Added extra SettingsModel for a QML 2018-06-23 16:22:33 +02:00
Aleksei S
0906e3f1e7 Store custom Menu items in CuraApplication 2018-06-23 16:16:06 +02:00
Ghostkeeper
e717abf499
Fix typing related to Network Printing 
Contributes to issue CURA-5330.
 2018-06-15 16:53:45 +02:00
Ghostkeeper
a021820031
Fix call to getIdAtPosition 
I fixed the typing in the wrong way here. Sorry.

Contributes to issue CURA-5330.
 2018-06-15 13:34:39 +02:00
Ghostkeeper
7a33a8f212
Always import CuraVersion 
I don't know why there was this check around it because it is always necessary to start the application.

Contributes to issue CURA-5330.
 2018-06-15 13:28:55 +02:00
Ghostkeeper
1789a8f33e
Fix type of SelectionPass 
Contributes to issue CURA-5330.
 2018-06-15 13:20:20 +02:00
Ghostkeeper
fe43219e34
Fix minor type mistakes 
Contributes to issue CURA-5330.
 2018-06-15 13:14:56 +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
Ghostkeeper
b9727a33c6
Fix type of QtRenderer 
Because we're calling getWindowSize on it so it must be the QtRenderer, not the Renderer.

Contributes to issue CURA-5330.
 2018-06-15 11:38:11 +02:00
Ghostkeeper
ab32d64c01
Add types for ShaderPrograms 
Otherwise it'll think that this variable can only have None in it.

Contributes to issue CURA-5330.
 2018-06-15 11:34:35 +02:00
Ghostkeeper
7d98167383
Ignore type errors arising from misinterpretation of DepthFirstIterator type 
MyPy requests that this needs to have a __next__ function, but actually Python calls the __iter__ function first and then calls the __next__ function on the result of that. MyPy is wrong here.

Contributes to issue CURA-5330.
 2018-06-15 11:30:49 +02:00
Ghostkeeper
105f6d4271
Fix type of self._shader 
MyPy was thinking that this variable has type None, which is nonsense because no variable should always have type None.

Contributes to issue CURA-5330.
 2018-06-15 11:25:16 +02:00
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
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
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