GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-17 10:36:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,880 Commits 290 Branches 260 Tags
Commit Graph

411 Commits

Author SHA1 Message Date
Diego Prado Gesto
37520b26b8 CURA-5170 When the connection status of a printer output device changes, only add it to the list if the device belongs to the current printer. 2018-03-28 14:28:07 +02:00
Diego Prado Gesto
79daf3706b CURA-5158 Create a custom signal that is emitted when global container 
changes and output devices change.
 2018-03-28 11:07:48 +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
Ian Paschal
6443db5853 CURA-4902 Removed useless case 
Default case _is_ unknown!
 2018-03-21 11:32:52 +01:00
Ian Paschal
3e7e828f4b CURA-4902 Standardized i18nc message labels 
This one goes out to @fieldofview. ❤️
 2018-03-21 11:31:01 +01:00
Ian Paschal
db316708d6 CURA-4902 Challenging network message fix 
This bug was very complicated to fix and involved careful troubleshooting of networked printers and eventual application of text-based message parsing and case switching. Should work now though.
 2018-03-21 10:48:03 +01:00
Ghostkeeper
f15eb4be2d
Merge branch 'feature_custom_gcode_commands' 2018-03-20 13:44:23 +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
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