GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-20 01:29:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,642 Commits 291 Branches 260 Tags
Commit Graph

110 Commits

Author SHA1 Message Date
Jaime van Kessel
cd6832544b Fix for compatible_machine_families breaking for older firmwares 
Older firmwares didn't have the compatible_machine_families field yet.

Cl-894
 2018-09-05 13:17:33 +02:00
Jaime van Kessel
a0302684d6 Add handling for cluster print jobs that are in error state 
CL-896
 2018-09-05 10:06:37 +02:00
Jaime van Kessel
132366fa61 Revert "Add enabled state to printer, so that it can be displayed." 
This reverts commit dd778f0450219cbc2f7309eeb08bc20065bd51af.
 2018-09-04 13:42:24 +02:00
Jaime van Kessel
dd778f0450 Add enabled state to printer, so that it can be displayed. 
This ensures that if a printer is set to "Not available", that the interface can correctly show it

CL-896
 2018-09-04 13:27:17 +02:00
Jaime van Kessel
fb1033ad99 Add the compatible machine families property to printerOutputModel 
This is used by the cluster to indicate by which families of printers the job can be displayed

CL-894
 2018-09-03 10:03:11 +02:00
Jaime van Kessel
fc83520ad9 Added camera view back to cluster screen 
CL-893
 2018-08-23 20:34:20 +02:00
Jaime van Kessel
6a08b63f21 Ensure that extruder configurations are correctly sorted 
CL-894
 2018-08-21 13:32:22 +02:00
Jaime van Kessel
1fa3b60f94 Added rough outline of the redesigned cluster controlItem 
CL-893
 2018-08-17 16:10:23 +02:00
Jaime van Kessel
eb7d42a7f8 Added delete button to cluster queue 
CL-894
 2018-08-17 10:49:44 +02:00
Jaime van Kessel
d4aaa73928 Codestyle fixes 
CL-894
 2018-08-17 10:34:14 +02:00
Jaime van Kessel
0fe0e4ac54 Ensure that the order of the cluster queue is correctly show in monitor tab 
CL-894
 2018-08-16 15:23:16 +02:00
Jaime van Kessel
af4b7c38c7 Removed stray debug print 
CL-894
 2018-08-16 15:04:52 +02:00
Jaime van Kessel
ef00550df6 Added send to top context item 
CL-894
 2018-08-16 15:04:00 +02:00
Jaime van Kessel
28dc918e03 Merge branch 'master' of github.com:Ultimaker/Cura into cura_connect_UI_rework 2018-08-16 13:28:57 +02:00
Simon Edwards
e1e9c60016 Send UFP to Ultimakers provided the firmware version is sufficient. 
CL-980
 2018-08-15 13:56:51 +02:00
Jaime van Kessel
94b9782110 Added preview image to print cluster monitor 
CL-894
 2018-08-14 14:54:27 +02:00
Jaime van Kessel
78ebdb13f4 Cluster monitor page now shows queue instead of added printers 
CL-894
 2018-08-14 13:34:05 +02:00
Ian Paschal
413965a0ee Fighting muscle memory 2018-07-09 11:51:53 +02:00
Ian Paschal
ac0192f01f Improve fixes 2018-07-09 11:29:25 +02:00
Mark
8e7399c442 Add correct typing 2018-07-06 10:56:09 +02:00
Ian Paschal
75d5828f5f
Merge branch 'master' into fix_tests_cura_engine_backend 2018-07-06 09:48:07 +02:00
Ian Paschal
3321b23925 Fixes for UM3NetworkPrinting 2018-07-05 16:31:56 +02:00
Diego Prado Gesto
c738f306fb Fix style in some components 2018-07-05 14:35:12 +02:00
Ian Paschal
adc7fc58e9 Fixed method naming conflict 2018-07-02 13:53:35 +02:00
Ian Paschal
8f7370db6c Merge remote-tracking branch 'origin/master' into feature_send_material_profiles 2018-07-02 12:37:56 +02:00
Ghostkeeper
e717abf499
Fix typing related to Network Printing 
Contributes to issue CURA-5330.
 2018-06-15 16:53:45 +02:00
Diego Prado Gesto
7eba868574 CURA-5330 Fix typing and code style in the UM3NetworkPrinting plugin 2018-06-14 15:41:12 +02:00
Ghostkeeper
b2cd0ffc0f
Make createFormParts public 
Because the postFormWithParts function is public and it needs these parts that can (or should) only be created with this function.

Contributes to issue CURA-5034.
 2018-06-12 15:44:22 +02:00
Ghostkeeper
2e005a09ac
Remove unused import 
Contributes to issue CURA-5034.
 2018-06-12 15:41:52 +02:00
Ghostkeeper
d87166d5c2
Don't reconnect when getting printer data 
I think I accidentally added this during debugging at some point this sleepy morning.

Contributes to issue CURA-5034.
 2018-06-12 15:40:47 +02:00
Ghostkeeper
da5e4c11a4
Override connect() rather than connecting to connection state signal 
This is much more lean and a bit more semantic.

Contributes to issue CURA-5034.
 2018-06-12 15:40:10 +02:00
Ghostkeeper
a4171dd561
Also sync when connecting with printer 
Though right now it seems to sync way too often. I don't know why it keeps connecting.

Contributes to issue CURA-5034.
 2018-06-12 13:56:21 +02:00
Ghostkeeper
4727340ae4
Send only original files 
When we re-serialize them, the XML file will not be exactly the same so the signature will fail to match. We need to send the original bytes.

This changes the behaviour: It now sends all non-default files instead of all files that were loaded fully.

Contributes to issue CURA-5034.
 2018-06-08 16:02:00 +02:00
Ghostkeeper
ddb80be1ec
Send materials asynchronously 
This way we won't block the interface while those materials are sending.

Contributes to issue CURA-5034.
 2018-06-08 15:06:06 +02:00
Ghostkeeper
63f5c8346a
Implement API call to send material profile 
It seems to work now. I don't know if the material actually arrives but from this end it seems to send it at least.

Contributes to issue CURA-5034.
 2018-06-08 14:33:13 +02:00
Ghostkeeper
82a34b49eb
Add function to send material profiles to cluster 
This only works for cluster.

Contributes to issue CURA-5034.
 2018-06-08 13:55:29 +02:00
Ghostkeeper
4c1149643f
Remove unused import 
Contributes to issue CURA-5034.
 2018-06-08 13:08:34 +02:00
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