15945 Commits

Author SHA1 Message Date
Lipu Fei
3bc91f15c3 Fix mypy complains 2018-09-28 14:17:00 +02:00
Lipu Fei
7ae6800a14 Fix imports in QualityManager 2018-09-28 14:01:28 +02:00
Jaime van Kessel
3b70e5eb6b Fix typing
For some reason, my MyPy started acting up once I started using the PythonPath while calling it.
2018-09-27 20:01:55 +02:00
Jaime van Kessel
57334dd751 Merge branch 'master' of github.com:Ultimaker/Cura into CURA-5744-move-oauth-login 2018-09-27 17:52:00 +02:00
Lipu Fei
dc2c074bc0 Verbose output for Linux CI 2018-09-27 17:50:39 +02:00
Jaime van Kessel
f585afe77b Fix spacing 2018-09-27 17:31:45 +02:00
Jaime van Kessel
7310a677ce Clean up more code
This fixes some typing and moves a property to protected, as it should be
2018-09-27 16:07:18 +02:00
Jaime van Kessel
c15f8aa693 Move printer type checking to where it belongs; inside the UM3 plugin. 2018-09-27 15:54:23 +02:00
Jaime van Kessel
889035ebfa Fixed typo 2018-09-27 15:42:12 +02:00
Jaime van Kessel
d7901907af Fix typing 2018-09-27 15:37:08 +02:00
Jaime van Kessel
b58c01400b Updated typing & documentation 2018-09-27 15:28:53 +02:00
Jaime van Kessel
1467e703ae No longer make BuildVolume set max bounds.
We didn't use it anymore and it added an extra requirement for buildvolume to depend on Application
2018-09-27 15:16:46 +02:00
Jaime van Kessel
d83241f13a Add missing typing to number of decorators 2018-09-27 14:29:09 +02:00
Jaime van Kessel
853ccbdb71 Fix mypy typing issue 2018-09-27 14:00:28 +02:00
Jaime van Kessel
4adbfd467e Merge branch 'master' of github.com:Ultimaker/Cura into CURA-5744-move-oauth-login 2018-09-27 13:58:47 +02:00
Ghostkeeper
0ce9bf61be
Move MIME type declarations into constructors of readers
So that if you disable the plug-in, the MIME type declaration is also not added.

Fixes #4151.
2018-09-27 13:58:06 +02:00
Jaime van Kessel
8d9a1fb85d Merge branch 'CURA-5744-move-oauth-login' of github.com:Ultimaker/Cura into CURA-5744-move-oauth-login 2018-09-27 13:47:32 +02:00
Jaime van Kessel
f8369703ed Connect signals before loading auth data
CURA-5744
2018-09-27 13:45:46 +02:00
ChrisTerBeke
6d402806ac Ensure logged in state is not always set to False after loading from preferences 2018-09-27 13:35:18 +02:00
Ghostkeeper
88ba2ac345
Define gcode.gz extension in GCodeGzReader
So if you were to disable the GCodeGzReader plug-in, you will now no longer see the extension in the files you can read.

Fixes #4151.
2018-09-27 13:27:42 +02:00
Jaime van Kessel
47c5dbaf84 Add extra unit test that tests the storing and loading of data to the preferences 2018-09-27 13:07:37 +02:00
Jaime van Kessel
202cf698c3 Change callback for succes / failure to the new location
CURA-5744
2018-09-27 11:56:19 +02:00
Ghostkeeper
80804b232f
Merge branch 'refactor_singleton_settingsbase' 2018-09-27 11:53:11 +02:00
Jaime van Kessel
649f1c8961 Make it optional for the AuthService to have a preference object
This should make it easier if we ever want to re-use the authService, since
it no longer has a hard link with the Preferences

CURA-5744
2018-09-27 11:42:12 +02:00
Jaime van Kessel
0ccbabd857 Switch SHA512 implementation to use the one from hashlib
CURA-5744
2018-09-27 11:37:44 +02:00
Jaime van Kessel
506ec5109d Moved loading of the authentication to the account
CURA-5744
2018-09-27 11:37:22 +02:00
Ghostkeeper
1717281d2b
Always provide extruder_nr for all models
Even if you only have one extruder in your printer. This is more consistent, and probably also faster because executing one set-addition in Python is probably still slower than sending those 20 extra bytes over the socket and parsing them in C++...

Contributes to issue CURA-4410.
2018-09-27 11:20:24 +02:00
Jaime van Kessel
cf6d3b9289 Merge branch 'CURA-5744-move-oauth-login' of github.com:Ultimaker/Cura into CURA-5744-move-oauth-login 2018-09-27 11:11:54 +02:00
Jaime van Kessel
1c8804ff2c Changed documentation style to doxygen
CURA-5744
2018-09-27 11:03:17 +02:00
ChrisTerBeke
246d12a596 Remove client.package.download scope until that is deployed on production 2018-09-27 10:48:22 +02:00
ChrisTerBeke
52ffe39c07 Small fixes in settings 2018-09-27 10:33:50 +02:00
ChrisTerBeke
185a1707b2 Merge branch 'master' into CURA-5744-move-oauth-login 2018-09-27 09:40:44 +02:00
Jaime van Kessel
d5dbf91a4f Switch unit test to use decoratior instead of with waterfall
CURA-5744
2018-09-26 17:23:36 +02:00
Jaime van Kessel
16ff1c3712 Add property for the accessToken
CURA-5744
2018-09-26 17:12:00 +02:00
Jaime van Kessel
067e59a254 Add logged_in as argument to loginStateChanged callback
CURA-5744
2018-09-26 17:06:09 +02:00
Ghostkeeper
3127108d00
Only set top/bottom pattern to concentric for initial layer
I'm taking responsibility for this. I'm changing it as a reaction to #4167 since I think concentric is good for the first layer but not so good for the rest of the layers. That user seems to agree but it hasn't been tested thoroughly. It's my intuition, sorry if it went wrong.
2018-09-25 13:17:32 +02:00
Diego Prado Gesto
987ae73078 Remove call to undefined function. 2018-09-25 13:15:26 +02:00
Lipu Fei
51f2386db1 Merge remote-tracking branch 'origin/3.5' 2018-09-25 11:56:12 +02:00
Lipu Fei
8837ffc06d Fix mateial management QML reference
CURA-5682
2018-09-25 11:52:53 +02:00
Ghostkeeper
a8493ee35d
Give black materials at least some albedo
Otherwise you can't see the diffuse reflections and the entire thing just becomes a black silhouette.
2018-09-25 11:24:48 +02:00
Diego Prado Gesto
b52c28321a Merge branch 'master' into refactor_singleton_settingsbase 2018-09-25 09:38:55 +02:00
Diego Prado Gesto
e31f35ec95 Merge branch '3.5' 2018-09-25 09:36:08 +02:00
Jaime van Kessel
b48adf5b3e Typing fixes
CURA-5744
2018-09-24 17:37:06 +02:00
Jaime van Kessel
f16a9c62b5 Fix typo
CL-5744
2018-09-24 17:28:19 +02:00
Jaime van Kessel
7360313ff7 Add LocalAuthServer test
This is to ensure that once we try to login, it actually attempts to start the local server

CURA-5744
2018-09-24 17:26:08 +02:00
Ghostkeeper
7d7227cfc8
Merge branch 'master' into refactor_singleton_settingsbase 2018-09-24 17:25:15 +02:00
Jaime van Kessel
fe85c020b1 Fixed incorrect OAuth2 settings
CURA-5744
2018-09-24 17:12:45 +02:00
Jaime van Kessel
1e5177a44f Added unit tests for authorization service
CURA-5744
2018-09-24 17:04:20 +02:00
Ghostkeeper
c46e0e7556
Only print message about excluded materials if there are any
Otherwise the message is very strange (with double spaces and such) and unnecessary.
2018-09-24 11:59:02 +02:00
Lipu Fei
fe8aa02e7c Fix a direct signal emission that causes max recursion error
CURA-5682

A max recursion error will occur when the user creates a material on the
material management page. Too many signals get directly triggered and
some of them head back again and causes a max recursion error.
2018-09-24 11:44:55 +02:00