2253 Commits

Author SHA1 Message Date
fieldOfView
af280047d1 Add extruder fields for start/end gcode, offset, nozzle size (non-functional) 2017-04-06 11:35:56 +02:00
fieldOfView
91bc023d2a Add tabs for extruder settings 2017-04-06 09:41:16 +02:00
fieldOfView
940a60a4cb Fix font rendering on second column 2017-04-06 09:41:16 +02:00
fieldOfView
a41bc77e5a Hide nozzlesize field for multiextrusion printers...
and hide extruder count combobox when no extruders are defined
2017-04-06 09:41:15 +02:00
fieldOfView
e853d87779 Add control to set the number of extruders in Machine Settings 2017-04-06 09:41:15 +02:00
Jack Ha
1a01d1b193 Change permissions back to 644 2017-04-05 10:19:12 +02:00
Jack Ha
2d6df1ae4a Fix workspacedialog booboo typo. 2017-04-05 10:18:36 +02:00
Lipu Fei
3f82eae73c Use layer_id to determine total layer count
CURA-3615
2017-04-04 16:52:53 +02:00
jack
38fe709736 Merge pull request #1648 from Ultimaker/bugfix_CURA-3615_fix_raft_layer_count
CURA-3615 Fix total layer count when raft is enabled
2017-04-04 16:47:07 +02:00
Lipu Fei
6b9d3e8041 Merge pull request #1636 from fieldOfView/fix_recent_dialogs
Fix issues with Workspace and Profile Changes dialogs
2017-04-04 14:35:12 +02:00
Lipu Fei
9f5a1b3695 Merge pull request #1564 from nallath/usb_fixes
Usb fixes
2017-04-04 12:05:49 +02:00
Lipu Fei
7315a09c7d Use layer_id to determine total layer count
CURA-3615
2017-04-04 11:45:30 +02:00
Lipu Fei
5de3a614ea Merge pull request #1578 from fieldOfView/fix_savitar_gracefull_degradation
Fail gracefully when libSavitar is not found
2017-04-03 12:53:35 +02:00
fieldOfView
fd09a1959b Simplify margins and make them DPI aware 2017-04-02 15:54:06 +02:00
fieldOfView
ed8954c1db Replace font.pixelSize with DPI-aware font.pointSize
This also uses the same pointSize as eg the PreferencesPage.qml uses
2017-04-02 15:31:35 +02:00
fieldOfView
2e1dd46ea4 Replace hardcoded color with system-theme color 2017-04-02 14:38:11 +02:00
fieldOfView
d536bbd6b9 Fix Hi DPI issues with Workspace and Profile Changes dialogs 2017-04-02 12:38:41 +02:00
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
fieldOfView
adf2ac10b0 Fix check for succesfully imported 3MFReader & 3MFWriter modules 2017-03-30 13:56:19 +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
fieldOfView
2b761b87ac Fail gracefully when libSavitar is not found
By catching the ImportError, this prevents the logs being clogged with exceptions in start and when the plugins preference page is touched.
2017-03-25 09:56:02 +01: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
e30e2a8018 Instead of not sending the line at all, just send a get temp command 2017-03-23 20:13:13 +01:00