Commit graph

1151 commits

Author SHA1 Message Date
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
7a464a92ca
Fix callback to output device with selected printer
This is a new function that just selects the printer.

Contributes to issue CURA-5097.
2018-03-19 11:39:41 +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
Diego Prado Gesto
36c5e0ad15 CURA-4870 Change message of the dialog when the connection with a printer/group already exists 2018-03-16 12:07:05 +01:00
Diego Prado Gesto
99d653cea5 CURA-4870 Don't allow to connect more than one instance to the same
group.
2018-03-15 20:01:47 +01:00
ChrisTerBeke
d4d9a58d04 Fix merge conflicts, add can_send_raw_gcode ability, rename to sendRawCommand, small fixes 2018-03-15 16:51:25 +01:00
alekseisasin
67261ccd4b
Merge pull request #3144 from fieldOfView/feature_preheat_extruder
Feature preheat extruder
2018-03-15 16:38:18 +01:00
Aleksei S
097c97b6f8 Fix: Refresh list of available printers in network
after clicking refresh button.
2018-03-15 14:33:27 +01:00
fieldOfView
dbabf3bda9 Merge branch 'master' into feature_preheat_extruder
# Conflicts:
#	cura/PrinterOutput/ExtruderOutputModel.py
#	cura/PrinterOutput/PrinterOutputModel.py
2018-03-15 11:21:37 +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
ebbb30a5be CURA-4870 Replace network key and connect group name metadata values
when the connection changes.
2018-03-09 13:37:15 +01:00
Diego Prado Gesto
260cad36cb CURA-4870 Add name of the group and hidden property to the network
printers. The printer menu shows the printers grouped by group and the
hidden printers are never listed.
2018-03-09 12:42:49 +01:00
Diego Prado Gesto
ae094c8201 CURA-4870 Disable the connect button in the discovery list when the
printer is not a host of printers.
2018-03-08 14:02:22 +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
Aleksei S
77a624d3b4 In monitor view show Finished for "wait_user_action" in printjob.status
CURA-4873
2018-02-28 13:04:51 +01:00
Lipu Fei
9a354efd19 Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-02-21 14:05:19 +01:00
Jaime van Kessel
3cf16fd34b Removed sending of material profiles.
It takes a godawfull long time and the machine ignores most of them anyway.
2018-02-19 15:37:08 +01:00
Lipu Fei
495fc8bbd7 WIP: Refactor BuildPlateModel and split MultiBuildPlateModel 2018-02-17 22:24:05 +01:00
Aleksei S
f897930950 Fix: Allow connection button for other printers
CURA-4962
2018-02-16 11:48:08 +01:00
Ghostkeeper
ee9de1f11b
Merge branch '3.2'
Lots of conflicts due to rounding vs. flooring of text element positions for weirdness with the font aliasing.
2018-02-14 10:53:51 +01:00
Mark
b531c0550d Change Math.floor to Math.round as a last try to fix garbled fonts
CURA-4941
2018-02-14 09:28:47 +01:00
Aleksei S
7b9bec2891 Fix: Wrong print jobs queued number
CURA-4888
2018-02-05 17:05:27 +01:00
Aleksei S
0954211be8 Fix: Wrong print time
CURA-4874
2018-01-29 16:01:11 +01:00
Jaime van Kessel
0e5395dfd5 Fix crash when removing manually added device.
I forgot to rename a variable :(
CURA-4861
2018-01-29 14:29:13 +01:00
fieldOfView
ed9943c732 Merge branch 'master' into feature_preheat_extruder
# Conflicts:
#	plugins/USBPrinting/USBPrinterOutputController.py
#	plugins/USBPrinting/USBPrinterOutputDevice.py
2018-01-27 16:35:55 +01:00
Jaime van Kessel
dcfab2f923 Failed state in printjobs is now handled correctly 2018-01-22 15:47:37 +01:00
Jack Ha
1796a182fa CURA-4525 fix crashing cura due to empty build plate 2018-01-18 11:54:30 +01:00
fieldOfView
6e0717a967 Merge branch 'master' into feature_preheat_extruder 2018-01-17 17:36:40 +01:00
Jaime van Kessel
4680996a49 Print window no longer gets an ever increasing list of print targets
CL-720
2018-01-17 11:32:43 +01:00
Diego Prado Gesto
0a4c30603f Change style of Add/Remove printers link in Monitor tab 2018-01-16 13:07:27 +01:00
Diego Prado Gesto
aa8057e80c Change style of Add/Remove printers link in Monitor tab 2018-01-16 11:57:39 +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