Commit graph

2218 commits

Author SHA1 Message Date
fieldOfView
c89669e73e Layout & code style: move unit into numeric textfield component 2017-04-10 16:22:20 +02:00
fieldOfView
7bad718823 Don't update the global container stack unnecessarily 2017-04-10 13:36:16 +02:00
Jaime van Kessel
d02aa7f6a3 Fixed order of close & disconnect
This would cause the state change caused by close to not be sent to the printer. Fixes CURA-3668
2017-04-10 13:32:37 +02:00
Jaime van Kessel
f5785662f2 Fixed another broken logging 2017-04-10 13:19:05 +02:00
Jaime van Kessel
abe70c3a92 Fixed broken logging 2017-04-10 13:12:14 +02:00
fieldOfView
064f744bc0 Make sure we're not trying to get/set extruder values on machine stacks 2017-04-09 20:09:05 +02:00
fieldOfView
5b37353b08 Fix stuck extruder tabs when switching number of extruders 2017-04-07 11:55:07 +02:00
fieldOfView
7bc28a7e48 Make sure a valid stack is activated after changing the number of extruders 2017-04-06 21:02:33 +02:00
Arjen Hiemstra
df25fa9345 Do not try to handle resolve manually in StartSliceJob
Since the container stacks should now take care of it
2017-04-06 17:50:43 +02:00
Jack Ha
cebe52b1fe Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-06 14:08:00 +02:00
Jack Ha
88a8ed9752 Merge branch '2.5' 2017-04-06 14:07:50 +02:00
Jack Ha
f04981b08c Fixed wifi missing some lines. CURA-3664 2017-04-06 14:06:38 +02:00
Jaime van Kessel
a4afde39ff Handle connecting & disconnecting a bit more elegant
CURA-3603
2017-04-06 14:03:41 +02:00
Jaime van Kessel
953d59788e Only try to close connection when there is a connection to close
CURA-3603
2017-04-06 13:57:39 +02:00
fieldOfView
818043854d Set active extruder when switching extruder tabs in Machine Settings
We can only get/set profiles for the active extruder.
2017-04-06 11:44:09 +02:00
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