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

367 Commits

Author SHA1 Message Date
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
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
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
ChrisTerBeke
b086e9cb53 Fixes for UM3 network printing for multi build plate 2018-01-12 10:52:14 +01:00
ChrisTerBeke
7d6e41f6c8 Disable activate configuration button for now until sync functionality has been decided 2018-01-12 10:36:21 +01:00
Jaime van Kessel
665c0a81f4 Removed wrong comment 2018-01-10 16:29:36 +01:00
Lipu Fei
3f341a34c6 Fix gcode job sending issue in gcode_dict refactoring 2018-01-10 08:15:03 +01:00
Jaime van Kessel
dcf02137ad Fixed connecting for clean machine 
CL-541
 2018-01-09 14:53:16 +01:00
Lipu Fei
c8cef9583e rename scene.gcode_list to gcode_dict 
CURA-4741

With the multi build plate feature, scene.gcode_list is now a dict which
stores a list of gcode for a build plate, so it makes more sense to have
it renamed to "gcode_dict" because it's not a list.
 2018-01-08 16:18:41 +01:00
Jack Ha
86eb9c73ba CURA-4525 do not send empty build plates gcode; direct calling slice when skipping empty build plate 2018-01-08 13:41:58 +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
Jack Ha
2c831ceb05 For this version, send all build plates. No print view when multiple build plates. CURA-4525 2017-12-21 15:47:40 +01:00
Jaime van Kessel
b1e9e3b8fa Prevent crash if disconnect already happend 
CL-541
 2017-12-21 15:14:50 +01:00
Jaime van Kessel
9754aa5397 Material & hotend updated callback is enabled for LegacyUM3 again 
CL-541
 2017-12-21 13:16:44 +01:00
Jack Ha
5152b2ae65 Solved merge conflicts. CURA-4525 2017-12-21 10:52:51 +01:00
Jaime van Kessel
4796e00574 Fixed removing of manual printer 
CL-541
 2017-12-20 16:57:49 +01:00
Jaime van Kessel
041b1830fe Re-added manual printer adding 
CL-541
 2017-12-20 16:30:40 +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
37461a7934 Made sendMaterialProfiles protected 
CL-541
 2017-12-19 17:24:30 +01:00
ChrisTerBeke
b3758be12e Fix selecting cura connect printer preference 2017-12-19 11:55:08 +01:00
Jaime van Kessel
bd4797404d Changed showMonitorStage to setActiveStage 
CL-541
 2017-12-15 15:46:15 +01:00
Jaime van Kessel
80526893c2 Made setAcceptsCommands protected 
CL-541
 2017-12-14 09:36:31 +01:00
Diego Prado Gesto
d70bd0ebc9 CURA-4649 Blocking printers that have localhost IP address. 2017-12-12 13:45:35 +01:00
Jaime van Kessel
b61832bc03 Added manual entry to prevent jogging for UM3 
I've not had the time to properly build it yet, so disabling it for now

CL-541
 2017-12-12 10:41:27 +01:00
Jaime van Kessel
8bc9663294 Removed old & unused code 
CL-541
 2017-12-12 10:28:55 +01:00