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

53 Commits

Author SHA1 Message Date
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
Jaime van Kessel
339d7ca4c9 Cluster shows default controlItem again when a specific printer is selected 
CL-541
 2017-11-30 14:36:53 +01:00
Jaime van Kessel
d8c4834362 Aborting & pausing prints is now possible again from the Cluster output device 
CL-541
 2017-11-30 13:20:58 +01:00
Jaime van Kessel
dea13899b3 Cluster can now "target" one of it's printers for display 
CL-541
 2017-11-30 13:07:01 +01:00
Jaime van Kessel
a49d3dbd8e Added missing time/date completed 
CL-541
 2017-11-30 11:57:14 +01:00
Jaime van Kessel
70cfbf0180 PostPrintjobFinished now hides messages & resets state 
CL-541
 2017-11-30 11:44:18 +01:00
Jaime van Kessel
f30f0a7194 Mismatched configuration is now shown correctly again 
CL-541
 2017-11-30 11:04:13 +01:00
Jaime van Kessel
3d3b140526 Times are correctly displayed for Cluster again 
CL-541
 2017-11-30 10:53:38 +01:00
Jaime van Kessel
e841896090 PrintJobs are now assigned if they are not queued 
It used to just do it if it was printing, but jobs can also be in other states such as
paused, pre_print, etc

CL-541
 2017-11-28 13:04:58 +01:00
Jaime van Kessel
9084dfd6bd It's now possible to send print jobs to cluster again 
CL-541
 2017-11-28 12:59:54 +01:00
Jaime van Kessel
83b13546fb Moved compressing of GCode to one class higher 
CL-541
 2017-11-27 17:12:36 +01:00
Jaime van Kessel
5d3779da26 Update cluster view components 
CL-541
 2017-11-27 15:54:44 +01:00
Jaime van Kessel
52a137a68c Ensured that sidebar has the right properties to show again 
CL-541
 2017-11-27 14:42:45 +01:00
Jaime van Kessel
7d9af8e345 Added Opencontrol panel functions 
CL-541
 2017-11-27 14:13:30 +01:00
Jaime van Kessel
cdfdaec492 ClusterUM3 now uses local material data as first source 
CL-541
 2017-11-27 14:03:53 +01:00
Jaime van Kessel
f791b53ad8 Enabled monitor items for ClusterOutputDevice again 
CL-541
 2017-11-27 13:54:34 +01:00
Jaime van Kessel
57de028608 re-implemented abort & pause for legacy um3 
CL-541
 2017-11-24 11:26:30 +01:00
Jaime van Kessel
a8e71cf50c NetworkManager is now created on demand and re-created after a certain timeout. 
CL-541
 2017-11-21 14:35:17 +01:00
Jaime van Kessel
b1649f2d38 Added PrintJob handling to ClusterUM3 
CL-541
 2017-11-21 11:01:19 +01:00
Jaime van Kessel
a9f52c2ad6 Added data handling for Connect devices 
CL-541
 2017-11-20 17:00:02 +01:00
Jaime van Kessel
61753540e4 Callbacks are now handled by url and operation type. 
It would have been nicer to use the request, but it's unhashable.

Cl-541
 2017-11-20 15:12:29 +01:00