Commit graph

11748 commits

Author SHA1 Message Date
Jaime van Kessel
6bdce54e1d Enable progress bar for USB printing
CL-541
2017-12-15 14:47:06 +01:00
Jaime van Kessel
a6deddb6ae Added controller for USB printer
CL-541
2017-12-15 14:30:01 +01:00
Jaime van Kessel
e2845a224c No longer start print if it's already started
CL-541
2017-12-15 14:01:58 +01:00
Jaime van Kessel
aef54f99db If a print is completed, it's now also updated in UI
CL-541
2017-12-15 13:43:19 +01:00
Jaime van Kessel
d3d9a6e1bb Starting a print with USB printer now works with reworked printeroutputmodel
CL-541
2017-12-15 13:25:35 +01:00
Jaime van Kessel
d3b9ac0d45 Also start reworking the USBPrint.
It's also time for some much needed code cleaning in that bit. The auto-detect is moved to it's own job,
which should make it a whole lot easier to disable it all together.

CL-541
2017-12-14 17:37:57 +01:00
Jaime van Kessel
24bd32477a Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-12-14 13:03:02 +01:00
Aleksei S
497bc756b7 Merge branch 'master' into CURA-4234_expand_collapse 2017-12-14 09:42:05 +01:00
Jaime van Kessel
80526893c2 Made setAcceptsCommands protected
CL-541
2017-12-14 09:36:31 +01:00
Jaime van Kessel
005ba4ac53 Changed hotend properties to float
CL-541
2017-12-14 09:34:16 +01:00
Jack Ha
f3a6f50e2c CURA-4234 fix topbar resize issues and removed hard coding numbers 2017-12-13 16:47:38 +01:00
Aleksei S
88af41769e Check multiple models with non_printing settings
CURA-4703
2017-12-13 16:04:01 +01:00
Jack Ha
a44cea7ac6 Update log line 2017-12-13 14:48:25 +01:00
Jack Ha
3605edc565 CURA-4234 remove debugging logline 2017-12-13 14:16:35 +01:00
Jack Ha
63eec848fc CURA-4234 view mode button now also moves with the sidebar 2017-12-13 14:15:27 +01:00
Jack Ha
4519f9b46a CURA-4234 rename to cura/sidebar_collapse, fix spelling errors, styling 2017-12-13 14:04:02 +01:00
Jack Ha
80afda1912 Merge branch 'master' into CURA-4234_expand_collapse 2017-12-13 13:53:35 +01:00
Jack Ha
bae2193bfb Merge branch 'master' of github.com:Ultimaker/Cura 2017-12-13 13:39:22 +01:00
Jack Ha
19b56404c6 Fix empty quality slider on start.
It seemed that:
- MachineManager was not connected to all the correct signals
- After connecting to the correct signal, ProfilesModel was not yet updated when looping over it in SidebarSimple

Because ProfilesModel's constructor already requests the MachineManager, we cannot do connect itemsChanged the way around as well.

CURA-4707
2017-12-13 13:33:05 +01:00
Ghostkeeper
9ea0119011
Rename 'exception' to 'error'
Error is a less technical term, so it's more user friendly.
2017-12-13 12:58:24 +01:00
Lipu Fei
6e6dc493f1 Fix material loading for unknown names 2017-12-13 12:27:55 +01:00
Aleksei S
c6c4c5be34 Merge branch 'master' of github.com:Ultimaker/cura 2017-12-13 12:03:06 +01:00
Aleksei S
5c5f08e9ca Do not slice a model if it is only one on a build plane and has setting from non_printing_mesh
CURA-4703
2017-12-13 11:58:59 +01:00
Lipu Fei
7cd3449781 Fix material loading 2017-12-13 11:26:16 +01:00
Lipu Fei
e14d78b32a Generate more possible machine IDs in XML material profile 2017-12-13 10:16:06 +01:00
Jack Ha
e10ba065ca CURA-4707 better signal to connect solving this issue 2017-12-12 17:06:23 +01:00
Jack Ha
a85bea4bae CURA-4707 fix extruder setting not triggering reslice 2017-12-12 16:37:21 +01:00
Jack Ha
f28846acb9 Merge branch 'master' into CURA-4234_expand_collapse 2017-12-12 15:43:32 +01:00
Aleksei S
3516d01f3d Move back machine selection
CURA-4234
2017-12-12 15:30:19 +01:00
Diego Prado Gesto
d70bd0ebc9 CURA-4649 Blocking printers that have localhost IP address. 2017-12-12 13:45:35 +01:00
Aleksei S
6968c089db Add sidebar_collapse to the saved preferences, typos, move back machine selection to the top bar
CURA-4234
2017-12-12 11:26:17 +01:00
ChrisTerBeke
ca413e0496 Add extra checks to ensure backend exists, use same state everywhere 2017-12-12 11:16:40 +01:00
ChrisTerBeke
19e459d930 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-12-12 10:55:05 +01:00
ChrisTerBeke
84aa9367c7 Cleanup 2017-12-12 10:54:54 +01:00
Aleksei S
fb91edd7eb Solve arrange and multiply models issue
CURA-4703
2017-12-12 10:43:19 +01:00
Jaime van Kessel
b61832bc03 Added manual entry to prevent jogging for UM3
I've not had the time to properly build it yet, so disabling it for now

CL-541
2017-12-12 10:41:27 +01:00
Jaime van Kessel
8bc9663294 Removed old & unused code
CL-541
2017-12-12 10:28:55 +01:00
Aleksei S
00529f37d9 After sidebar expanding the builplate stays in center of the screen
CURA-4234
2017-12-11 18:51:53 +01:00
Ghostkeeper
75df653d47
Merge branch 'feature_local_container_server' 2017-12-11 15:51:17 +01:00
Aleksei S
300f29e11b Add expand button to menu
CURA-4234
2017-12-11 15:30:13 +01:00
Lipu Fei
c6cdc1d1db Container cfg files need to be parsed without interpolation
CURA-4701
2017-12-11 14:35:27 +01:00
Aleksei S
a5cb4cd316 Expand/Collapse sidebar
CURA-4234
2017-12-11 10:53:48 +01:00
Ghostkeeper
097cc72d89
Document why we're only returning full profiles
It's a limitation of the quality manager that would require major refactoring there to fix.

Contributes to issue CURA-4243.
2017-12-11 09:44:56 +01:00
Jaime van Kessel
6ad82ee1b0 Added missing name & description for ClusterOutputDevice
CL-541
2017-12-08 17:32:22 +01:00
Jaime van Kessel
1719a7b2fe Fixed preheating for Legacy UM3
CL-541
2017-12-08 17:16:59 +01:00
Ghostkeeper
430f3dad27
Use GlobalContainerStack.definition instead of .getBottom
If we know it's a CuraContainerStack we can use .definition safely.

Contributes to issue CURA-4243.
2017-12-08 16:57:48 +01:00
Ghostkeeper
1029d4509c
Merge branch 'master' into feature_local_container_server 2017-12-08 16:03:05 +01:00
ChrisTerBeke
2986a17c1d Fix for showing printer connect button on component load, use newer CuraApplication as target 2017-12-08 16:02:22 +01:00
Jaime van Kessel
ae629e2968 Fixed camera for legacy UM3 printer again
CL-541
2017-12-08 14:59:14 +01:00
ChrisTerBeke
baea9eb1e0 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-12-08 14:56:18 +01:00