73 Commits

Author SHA1 Message Date
Jaime van Kessel
c988e0eccb Also added "none" to the state list of prints_jobs not to be matched with printers 2018-05-31 17:20:53 +02:00
Jaime van Kessel
416f695610 Canceling sending job to cluster no longer results in "still sending print" message.
Previously it would always show this, requiring a restart of Cura before print could be sent. CL-913
2018-05-31 11:52:36 +02:00
Lipu Fei
0852cd2c20 WIP: Fix hanging upon send gz 2018-04-24 10:34:08 +02:00
Ian Paschal
66fa1c0a31 CURA-5140 Fixed typo 2018-03-26 11:30:57 +02:00
Ian Paschal
30b75c7988 CURA-5140 Show confirmation rather than switching to monitor tab 2018-03-22 17:05:07 +01:00
Jaime van Kessel
e0bb365e8c Merge branch 'feature_gzgcode_writer' of github.com:Ultimaker/Cura 2018-03-20 13:32:25 +01:00
Ghostkeeper
864cbe9c63
Add exception for UM3 to add UFP as supported format
We can't just add it to the supported file formats in the definition because we don't want the removable drive output to write it.

Contributes to issue CURA-5097.
2018-03-19 16:24:07 +01:00
Ghostkeeper
6f9e0431bb
Fix extension when sending to printer
It should use the extension of the preferred format.

Contributes to issue CURA-5097.
2018-03-19 15:17:10 +01:00
Ghostkeeper
c9a23d5ca3
Get the file formats directly from the stack
Instead of finding the container that contains the entry first and then getting the metadata from there.

Contributes to issue CURA-5097.
2018-03-19 14:21:41 +01:00
Jaime van Kessel
64d72c9d51 Fix where number of queued print jobs would be too big 2018-03-19 13:15:17 +01:00
Ghostkeeper
5bb20f6133
Use preferred output writer
This introduces a greenlet to allow optional interrupting of a function for waiting on the selectPrinter function.

Contributes to issue CURA-5097.
2018-03-19 11:24:15 +01:00
Jaime van Kessel
ad3c5466d1 Added bunch of typing to clusteroutput device 2018-03-14 14:45:01 +01:00
Jaime van Kessel
962c5f3260 Added bit of defensive coding to cluster output device 2018-03-14 14:39:06 +01:00
Diego Prado Gesto
2bf6d071d1 Merge branch 'master' into feature_sync_button 2018-03-13 13:54:22 +01:00
Diego Prado Gesto
dfb903fb81 CURA-4870 Wait until the configuration has all the mandatory data before
add it to the list of unique configurations.
Remove some connections to signals and reuse already defined listeners.
2018-03-13 13:14:29 +01:00
Jaime van Kessel
522e297711 Add some more states to check if print_job is active 2018-03-12 16:33:32 +01:00
Diego Prado Gesto
fe2a08a46b CURA-4870 Do not store buildplate information coming from connect if the
printer don't have buildplate in its definition.
2018-03-09 13:38:06 +01:00
Diego Prado Gesto
e7294e1299 CURA-4870 Correctly look for the buildplate variants using the
machine_buildplate_type that is also sent in the gcode and is the
information that Cura gets from connect.
Create a new dict in the VariantManager that maps the
machine_buildplate_type with the right container
2018-03-07 18:52:48 +01:00
Diego Prado Gesto
97740123fa CURA-4870 Add information about the buildplate in the printer output
model so it can be used to show the buildplate name in the configuration
list.
2018-03-07 13:57:13 +01:00
Aleksei S
23653d7357 Fix: Pressing 'cancel' button during compressing the print job should show "Prepare" page
CURA-4960
2018-03-07 11:34:10 +01:00
Aleksei S
1f883f3312 Remove reply hanlder to prevent crash after canceling a printing job
CURA-4960
2018-03-06 12:39:54 +01:00
Aleksei S
a35d4ae400 Fix: After clicking "cancel" button while sending a print job
the connection is disconnected
CURA-4960
2018-03-05 16:43:58 +01:00
Lipu Fei
3e23659c79 Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-02-28 15:29:22 +01:00
Ian Paschal
f646f11020 CURA-4890 Removed print() statement. 2018-02-28 15:16:04 +01:00
Ian Paschal
3eab99c25c CURA-4890 Empty material no longer displayed as Unknown
"Get learned how to make Cura more better-er!"
2018-02-28 15:06:02 +01:00
Lipu Fei
495fc8bbd7 WIP: Refactor BuildPlateModel and split MultiBuildPlateModel 2018-02-17 22:24:05 +01:00
Aleksei S
7b9bec2891 Fix: Wrong print jobs queued number
CURA-4888
2018-02-05 17:05:27 +01:00
Jaime van Kessel
dcfab2f923 Failed state in printjobs is now handled correctly 2018-01-22 15:47:37 +01:00
Jaime van Kessel
6225c12a9e Fixed crash on complete message
In some cases a job won't have an assigned printer when it's done.

CL-716
2018-01-16 09:44:18 +01:00
Jaime van Kessel
67aa21ba6c Merge branch 'master' of github.com:Ultimaker/Cura 2018-01-12 11:04:32 +01:00
ChrisTerBeke
d1b5744f57 Also fix gcode output for legacy UM3 networking, switch to monitor AFTER starting transferring G-code to catch potential errors before 2018-01-12 10:58:36 +01:00
Jaime van Kessel
1986677276 re-addded connection text
CL-541
2018-01-12 10:58:16 +01:00
ChrisTerBeke
06f35096ad Fix setting gcode list on output device 2018-01-12 10:54:48 +01:00
ChrisTerBeke
b086e9cb53 Fixes for UM3 network printing for multi build plate 2018-01-12 10:52:14 +01:00
Jaime van Kessel
d0ec7d10ce Printer discovery shows if a cluster is actually set up as a host
CL-541
2018-01-04 15:35:30 +01:00
Jaime van Kessel
c9b8b0333c Sending prints to a specific printer in the cluster is now possible again
CL-541
2018-01-04 14:56:42 +01:00
Jaime van Kessel
acde48108d Removed control item
CL-541
2018-01-04 13:31:54 +01:00
Jaime van Kessel
2e8ae5c590 Unsasigned jobs are now also removed from list
CL-541
2018-01-04 12:54:47 +01:00
Jaime van Kessel
6cf6d51fea Queued and printing amount now gets updated on state change
CL-541
2018-01-04 10:06:09 +01:00
Jaime van Kessel
9e055f0340 Added missing parameter
CL-541
2018-01-04 10:04:00 +01:00
Jaime van Kessel
42b50bf749 Fixed typo in function
CL-541
2018-01-03 17:14:52 +01:00
Jaime van Kessel
487fca31dd Chopped up bunch of functions.
As per review request. CL-541
2018-01-03 16:59:05 +01:00
Jaime van Kessel
d6b0fcc92e Progress message is now also shown when still compressing g-code
CL-541
2017-12-22 13:50:55 +01:00
Jaime van Kessel
562b2454b8 Added missing notifications for Connect prints
CL-541
2017-12-22 13:48:51 +01:00
Jaime van Kessel
d66e9493ca When not looking at camera, it will now actually be disabled
CL-541
2017-12-20 15:54:05 +01:00
Jaime van Kessel
bd4797404d Changed showMonitorStage to setActiveStage
CL-541
2017-12-15 15:46:15 +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
77e3965fc7 Added videostream to cluster again
CL-541
2017-12-06 14:59:20 +01:00
Jaime van Kessel
51c4062f1b Limit the amount of emits happening for PrintJobs changed
CL-541
2017-11-30 15:17:08 +01:00
Jaime van Kessel
1c1c195b93 When an printer gets added / removed, this is now correctly shown
CL-541
2017-11-30 15:01:28 +01:00