1926 Commits

Author SHA1 Message Date
Lipu Fei
c5bf107be6 Merge branch '2.5' 2017-03-31 12:12:29 +02:00
Lipu Fei
08071c3aa5 Fix batched GCode compression
CURA-3604
2017-03-31 12:11:11 +02:00
Jaime van Kessel
f5590a98ed Added missing close for USB programmer. Thanks to legoabram for the fix 2017-03-30 21:35:26 +02:00
Jaime van Kessel
f82aecb7ca Refactoring; no longer use "Printer" to identify CuraApplication 2017-03-30 20:19:05 +02:00
Lipu Fei
74e9ee0ab7 Fix batched gcode compression for "print over network"
CURA-3604
2017-03-30 19:00:41 +02:00
Jaime van Kessel
dbfa5873ce Merge branch '2.5' of github.com:Ultimaker/Cura 2017-03-30 17:03:01 +02:00
Jaime van Kessel
06fff748e3 Decreased the size of the batches to send, as it froze the interface too much. 2017-03-30 16:59:35 +02:00
Jaime van Kessel
7ae8d96775 Simply reset the authentication when requesting a new one.
Only changing the state caused a whole lot of issues.
2017-03-30 16:47:08 +02:00
Jack Ha
3135dc7d77 Solved MC 2017-03-30 16:20:08 +02:00
Lipu Fei
bfd77f915d Compress gcode lines in batch
CURA-3604
2017-03-30 16:09:17 +02:00
Lipu Fei
c785e84b86 Check len(materialLengths) before using
CURA-3604
2017-03-30 16:09:16 +02:00
Lipu Fei
ef666aac88 Set gcode_list for Scene after loading gcode
CURA-3604
2017-03-30 16:09:16 +02:00
Lipu Fei
2158826e06 Change backend state to disabled after reading a gcode
CURA-3604
2017-03-30 16:09:16 +02:00
Jaime van Kessel
f7bbb243b8 Moved authentication request state change 2017-03-30 11:02:56 +02:00
Jack Ha
0655771cb8 Removed comment. CURA-3390 2017-03-29 11:00:59 +02:00
Jack Ha
d5d265a996 Resolve mc cherry-picking CURA-3390 2017-03-29 11:00:54 +02:00
Jack Ha
02bb575ced Fixed extruder per gcode layer. Created show_caution preference for gcode reader. CURA-3390 2017-03-29 10:56:36 +02:00
Jack Ha
1e75c84662 Less yields for G-code reader and faster. CURA-3390 2017-03-29 10:56:28 +02:00
Jack Ha
ea0c55fff1 Solved merge conflict in cherry-pick CURA-3390 2017-03-29 10:56:26 +02:00
Jack Ha
fb2c318a0a Added caution message for g-code reader. CURA-3390 2017-03-29 10:53:25 +02:00
Jaime van Kessel
fbc372812c Minor refactor to improve readability
CURA-3390
2017-03-29 10:51:56 +02:00
Ghostkeeper
f62488fd11
Catch JSONDecodeErrors on decoding messages from the network
The network can corrupt packages or the printer can only send partial messages. Cura shouldn't break on that. It's just a warning. This warning says more than the original stack trace does, because the stack trace only said like 'unexpected comma there and there' while this message actually says what message contained the error.
2017-03-29 10:34:27 +02:00
Jaime van Kessel
38a07d75c7 Merge branch 'master' of github.com:Ultimaker/Cura 2017-03-28 13:16:00 +02:00
Jaime van Kessel
db1fb8e692 Moved authentication request state change 2017-03-28 13:14:47 +02:00
Tim Kuipers
7a67ab4e66 Merge branch '2.5' 2017-03-28 12:55:18 +02:00
Jaime van Kessel
910ff7acea No longer check printer state when no material lengths are known
This fixes issues with g-code from g-code reader not having material lengths set.

CURA-3604
2017-03-28 11:59:07 +02:00
Jaime van Kessel
f04d1efb8d Removed file progress from removable output device, as writefile job now handles that itself 2017-03-24 16:32:39 +01:00
Jaime van Kessel
4b7b8600ec Shortened the logging of the auth key. Turned out it was extremely long 2017-03-24 11:22:57 +01:00
Jaime van Kessel
8d2e824205 Added even more logging 2017-03-24 11:17:59 +01:00
Jaime van Kessel
adab4a1110 Added "blurred" auth key logging.
The getSafeaAuthKey prints a key of the same length, but only the last 5 chars are real. The rest is blurred out with *
THis is a bit like how most payment services hide your credit card number.
2017-03-24 11:04:08 +01:00
Jaime van Kessel
8023341090 Merge branch '2.5' of github.com:Ultimaker/Cura 2017-03-23 15:15:08 +01:00
Lipu Fei
96e9780273 Fix typo in changelog 2.5.0 2017-03-23 08:53:57 +01:00
Lipu Fei
e35d276e25 Complete Changelog for 2.5.0
CURA-3467
2017-03-22 15:20:57 +01:00
Jack Ha
4eff58995d Merge branch '2.5' 2017-03-22 13:24:32 +01:00
Lipu Fei
c6df3adddb Update 2.5.0 BETA ChangeLog
CURA-3467
2017-03-22 10:26:01 +01:00
Jack Ha
6858db5e17 Merge branch '2.5' 2017-03-20 15:17:29 +01:00
Jack Ha
b8d8e4fac3 Updated changelog. CURA-3467 2017-03-20 15:17:18 +01:00
Jack Ha
48c6c523ec Only 3mf nodes with mesh data are getting the sliceable object decorator. CURA-3559 2017-03-20 14:43:46 +01:00
Jack Ha
a56b7cd98d Merge branch '2.5' 2017-03-20 13:42:11 +01:00
Jack Ha
b21a87b25b Fix not slicing refreshing after deleting last object from loaded project file. CURA-3559 2017-03-20 13:41:47 +01:00
jack
42e7a0defa Merge pull request #1535 from LipuFei/feature_CURA-3495_open_in_one
CURA-3495 Open project/models menu item
2017-03-20 10:59:40 +01:00
Jaime van Kessel
e620d8fd9a Added extra logging to authentication loading to indicate difference between no auth at all or (some) loaded auth 2017-03-17 10:30:04 +01:00
Jaime van Kessel
fe826d16b8 Merge branch 'master' of github.com:Ultimaker/Cura 2017-03-17 10:23:10 +01:00
Jaime van Kessel
296152ed33 Added extra logging when authentication gets removed for network printer 2017-03-17 10:22:41 +01:00
Jack Ha
6194ffa27b Removed comment. CURA-3390 2017-03-16 15:28:57 +01:00
Jack Ha
60c5112824 Merge branch 'master' of github.com:Ultimaker/Cura 2017-03-16 15:27:55 +01:00
Jack Ha
9b06983f3e GCode reader: Better layerheight guess, refactoring, more robust, take extruder offset into account of multi extrusion. CURA-3390 2017-03-16 15:27:48 +01:00
Lipu Fei
e00c68344a CURA-3495 open project/models in one dialog 2017-03-16 13:37:06 +01:00
Lipu Fei
b35a97c770 CURA-3495 preRead() takes flexible arguments 2017-03-16 13:37:06 +01:00
Jaime van Kessel
134425db90 Merge branch '2.5' of github.com:Ultimaker/Cura 2017-03-16 11:27:54 +01:00