16749 Commits

Author SHA1 Message Date
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
Lipu Fei
329b38663e Fix code style 2018-09-27 11:44:10 +02:00
Lipu Fei
b1198ee1b8 Remove an if-else block that assumes no ExtruderStack
There is always an ExtruderStack, so the else-block will never be
executed.
2018-09-27 11:44:10 +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
alekseisasin
2a201cef23 Prevent cura crash after setting Print as Support in per object setting
menu
CURA-5766
2018-09-26 17:06:24 +02:00
Jaime van Kessel
067e59a254 Add logged_in as argument to loginStateChanged callback
CURA-5744
2018-09-26 17:06:09 +02:00
Lipu Fei
3c8368827b Remove unused functions in ExtruderManager 2018-09-26 17:04:15 +02:00
Lipu Fei
7a681a2ae4 Move Cura custom setting functions to a separate file 2018-09-26 16:54:00 +02:00
THeijmans
d5c86365f8 S5 profile optimizations
Removing the prime blob, equalizing flows and avoiding supports.
2018-09-26 15:02:25 +02:00
Simon Edwards
baa8064ec7
Merge pull request #4429 from Ultimaker/cura_connect_improvements_3.5
Cura connect improvements 3.5
2018-09-25 17:26:55 +02:00
Simon Edwards
e99b376374 Merge remote-tracking branch 'origin/3.5' into cura_connect_improvements_3.5 2018-09-25 16:59:33 +02:00
Lipu Fei
91bcfb9445 Take in account extruders that haven't been loaded yet
CURA-5751
2018-09-25 15:29:31 +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
drzejkopf
79cd9f332d
Update fdmprinter.def.json.po 2018-09-23 15:28:14 +02:00
drzejkopf
8c6f2dc86a
Complete Polish translation for version 3.5 2018-09-23 15:21:14 +02:00
Cherubim
c29d38361b
Fix initial start-up when providing model parameter
If you're adding a model file as command line argument to Cura, it should auto-load this file upon start-up. However when adding this command line argument upon first launch of Cura, there is no printer yet so Cura would crash because it tries to load a model before there is a build volume. This prevents that crash and instead doesn't load the model at all.
2018-09-23 00:27:50 +02:00
Aleksei S
b44fb7ca24 Select correct material according to the active extruder
CURA-5682
2018-09-21 17:35:46 +02:00
Jaime van Kessel
081b2a28fe Expose Account API to QML
This is done by adding the API as an SingletonType to Cura.

CURA-5744
2018-09-21 17:23:30 +02:00
Jaime van Kessel
b54383e685 Added account object to API
CURA-5744
2018-09-21 16:43:32 +02:00
Jaime van Kessel
060ea0b762 Fixed up final bit of mypy issues
CURA-5744
2018-09-21 14:12:31 +02:00
Ghostkeeper
30ef724322
Update STL MIME type
Since march, there is now an official MIME type for STL files. See https://www.iana.org/assignments/media-types/model/stl for the new MIME type specification.

Fixes #4141.
2018-09-21 14:11:59 +02:00
Jaime van Kessel
d0fc4878c2 Fix number of mypy mistakes
CURA-5744
2018-09-21 13:54:37 +02:00
Aleksei S
86d8f8517d In material page was not defined the used extruder nr, for generic materials
CURA-5682
2018-09-21 13:48:46 +02:00
Ghostkeeper
b26c78202b
Consolidate log entries about excluded materials
I got a log where 80% of the log was this particular message. Let's not do that.
2018-09-21 13:11:12 +02:00
Lipu Fei
a80fde1495 Merge remote-tracking branch 'origin/3.5' 2018-09-21 12:11:18 +02:00