263 Commits

Author SHA1 Message Date
Jack Ha
2c831ceb05 For this version, send all build plates. No print view when multiple build plates. CURA-4525 2017-12-21 15:47:40 +01:00
Jack Ha
5152b2ae65 Solved merge conflicts. CURA-4525 2017-12-21 10:52:51 +01:00
ChrisTerBeke
b3758be12e Fix selecting cura connect printer preference 2017-12-19 11:55:08 +01:00
Diego Prado Gesto
d70bd0ebc9 CURA-4649 Blocking printers that have localhost IP address. 2017-12-12 13:45:35 +01:00
Ghostkeeper
1029d4509c
Merge branch 'master' into feature_local_container_server 2017-12-08 16:03:05 +01:00
ChrisTerBeke
9bf954643c Use new method of setting active stage when needing to switch to monitor 2017-12-07 11:56:52 +01:00
ChrisTerBeke
af2b370921
Merge pull request #2857 from fieldOfView/fix_cluster_postprocessing
Allow postprocessing before sending data to the printer
2017-12-01 15:12:53 +01:00
Ghostkeeper
dad99f5292
Merge branch 'master' into feature_local_container_server
Contributes to issue CURA-4243.
2017-11-29 13:06:08 +01:00
Ghostkeeper
8707396ad7
Remove isReadOnly functionality
Everyone should now ask it from the container registry.

Contributes to issue CURA-4243.
2017-11-28 17:30:00 +01:00
ChrisTerBeke
eeeefcc47a Update UM3 discovery dialog creation to new method - CURA-4568 2017-11-28 15:06:53 +01:00
ChrisTerBeke
bd5e4f9a51 Cleanup cluster output device component creation - CURA-4568 2017-11-28 14:59:55 +01:00
ChrisTerBeke
b40ba0cfc7 Update network cluster output device print view component creation - CURA-4568 2017-11-28 14:58:53 +01:00
ChrisTerBeke
74eb4958af Fixes for printer output device views - CURA-4568 2017-11-28 14:21:47 +01:00
fieldOfView
bc9d31ccbc Allow postprocessing before sending data to the printer
Fixes https://github.com/Ultimaker/Cura/issues/2855
Also see 91e8ac6868
2017-11-26 21:44:09 +01:00
Ghostkeeper
147cbdf592
Clarify translations of 'unknown'
For some languages, the gender matters.

Contributes to issue CURA-4601.
2017-11-24 13:16:14 +01:00
Jack Ha
579f2b5ec6 CURA-4525 prepare for print all or single build plate question 2017-11-16 16:34:12 +01:00
Jack Ha
228039545b CURA-4525 send active build plate to legacy UM3 with Print over network 2017-11-16 09:58:53 +01:00
Jack Ha
8e5e555344 CURA-4525 Send all build plate gcodes to printer at one press of the button :-) 2017-11-13 16:27:15 +01:00
Lipu Fei
78456d5bc3 Fix clusterSize property check in QML 2017-11-09 09:06:46 +01:00
Mark
1468c3aae5 move undefined/null check 2017-11-09 07:37:09 +01:00
Mark
fdcce1780e Also check if base.selectedPrinter is null 2017-11-08 19:24:09 +01:00
ChrisTerBeke
142ff4e9dc
Merge pull request #2669 from fieldOfView/feature_jogging
Jogging
2017-11-01 16:15:40 +01:00
fieldOfView
7a9dda4022 Disable jogging for UM3
NetworkPrinterOutputDevice does not have the API to control jogging
2017-10-30 14:46:31 +01:00
Mark
334283e893 Found some more margins that wouldnt be fixed numbers and made the code more consistent 2017-10-27 14:12:35 +02:00
fieldOfView
ff847aa329 Fix qml error when there is no connected printer
Also fixes code style
2017-10-25 11:52:43 +02:00
Diego Prado Gesto
6dfd04928f CURA-4485 Activate configuration option disabled in printers within a
cluster.
Just allow when there is a cluster with just one printer.
2017-10-24 14:51:35 +02:00
fieldOfView
a9f2ad7ca3 Hide manual controls for outputdevices that don't support it 2017-10-24 11:03:51 +02:00
Ghostkeeper
6c4c7fff4d
Use findContainersMetadata whenever possible
This ensures that we only load those containers that we actually need the data of.

Contributes to issue CURA-4243.
2017-10-20 15:09:45 +02:00
Diego Prado Gesto
40f548ba99 Merge branch 'CURA-4252_improve_zeroconf_service' 2017-10-17 13:02:58 +02:00
Lipu Fei
b55efdd70e Remove timeout = 0 for get_service_info
CURA-4252
2017-10-16 10:36:14 +02:00
Lipu Fei
7f944ff08b Improve zeroconf service changed handling
CURA-4252

Use a separate thread to handle zeroconf service changed callbacks. If a
service info cannot be retrieved successfully, the request will be
rescheduled and tried again later.
2017-10-12 15:26:17 +02:00
Ghostkeeper
08d475b7ac
Merge branch 'master' of github.com:Ultimaker/Cura 2017-10-12 14:59:13 +02:00
Ghostkeeper
e4a53da763
Merge branch '3.0'
Contributes to issue CL-508.
2017-10-12 14:56:30 +02:00
Lipu Fei
920c90010f Fix base.selectedPrinter is undefined problem 2017-10-12 14:54:01 +02:00
Ghostkeeper
eda61f1ff9
Merge branch 'update_printer_blocked_icon' into 3.0 2017-10-12 14:49:07 +02:00
Simon Edwards
8ed7918b60 Update the icon used to show that a printer is blocked.
This applies to the printer status icons shown in the monitor tab when connected via Cura Connect.
2017-10-12 14:02:19 +02:00
Simon Edwards
eef4d61402 Correct the status message when a printer needs a config change but is unreachable
CL-508
2017-10-12 13:44:03 +02:00
Simon Edwards
427afdbe23 Correctly set up the cluster output device instances with the cluster size
This fixes the Cura Connect messages shown in the network printer selection dialog.

CL-555
2017-10-12 12:41:21 +02:00
Simon Edwards
af3c34b6fd Don't let the user select unreachable printers in the Cura Connect monitor tab
CL-584
2017-10-12 10:46:25 +02:00
Diego Prado Gesto
2915199367 Avoid printer connection when the status is 'error' - CURA-3868 2017-10-11 15:55:30 +02:00
ChrisTerBeke
e97bdc526b Merge branch '3.0' 2017-10-11 14:13:57 +02:00
Ghostkeeper
c4339955b3
Merge branch '3.0' into CL-508_show_lost_connection_status 2017-10-11 14:05:10 +02:00
Ghostkeeper
bf1baa2791 Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0 2017-10-11 14:04:17 +02:00
Simon Edwards
b68707d29c Show the printer unreachable status in the Cura Connect tab when needed.
CL-508
2017-10-11 13:52:45 +02:00
ChrisTerBeke
a5aa13f853 Merge pull request #2585 from Ultimaker/CL-555_manual_ip_connect_bug
CL-555 Don't blow up at plugin start up due to the plugin path not being ready yet
2017-10-11 12:40:50 +02:00
Simon Edwards
3c69442ceb Don't blow up at plugin start up due to the plugin path not being ready yet
CL-555
2017-10-11 11:54:00 +02:00
Ghostkeeper
3df98ecfc5
Change error/success messages for checking cluster-capability
This breaks the string freeze. The developers of this plug-in are well aware. However, it turns out that for these two strings the string freeze had already broken. We'll change these strings first then translate them out of band. I hate this sort of menial administration that could've been prevented...

Contributes to issue CURA-4341.
2017-10-11 11:10:08 +02:00
Ghostkeeper
d962ffb8d8
Merge branch '3.0' 2017-10-10 14:36:38 +02:00
ChrisTerBeke
e5c5f213a9 Fix info message when cluster has 0 machines 2017-10-10 12:58:43 +02:00
Lipu Fei
57b1cb3bc8 Refactor camera request fix
CURA-4376

- Simplify the exception handling
- Use isFinished() to check the state of the network request
2017-10-10 10:54:35 +02:00