GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 11:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,033 Commits 295 Branches 268 Tags
Commit Graph

3488 Commits

Author SHA1 Message Date
fieldOfView
863b40b900 Merge branch 'master' into feature_simulation_ux_tweaks 
# Conflicts:
#	plugins/SimulationView/SimulationView.qml
 2017-11-21 16:49:41 +01:00
ChrisTerBeke
0625d22e04 Fix update script for single extrusion quality changes - CURA-4482 2017-11-21 16:43:05 +01:00
Jaime van Kessel
d8b12be5e4 LegacyUM3 now correctly gets material set 
CL-541
 2017-11-21 16:26:17 +01:00
Jaime van Kessel
0f78b05802 Connection states changes are now tied into the UI again 
CL-541
 2017-11-21 15:12:23 +01:00
Jaime van Kessel
9cfe9769d3 Printers now automatically try to connect again 
CL-541
 2017-11-21 14:47:55 +01:00
Jaime van Kessel
3f1167a7d2 Results in printer discovery are sorted again 
CL-541
 2017-11-21 14:39:03 +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
Diego Prado Gesto
d415c5fcbb CURA-4526 Add transparency to the nozzle so the user can see the lines 
and layers through the nozzle.
 2017-11-21 13:42:46 +01:00
Diego Prado Gesto
f216e2df24 Merge branch '3.1_with_simulation_view' into 3.1 2017-11-21 13:31:18 +01:00
Diego Prado Gesto
abe9ba3795 CURA-4526 Stop simulation when changing preferences. 
Hide nozzle node when in compatibility mode.
 2017-11-21 13:23:47 +01:00
Ghostkeeper
def7b6994d
Store correct ID in metadata after deserialising 
Contributes to issue CURA-4243.
 2017-11-21 12:50:10 +01:00
Diego Prado Gesto
feb0a08fd9 CURA-4581 The project name is cached instead of set 2017-11-21 12:34:08 +01:00
Ghostkeeper
4fa38c26e8
Don't add any extra metadata to the end of the list you're iterating over 
Stupid mistake. This causes infinite loops.

Contributes to issue CURA-4243.
 2017-11-21 11:46:14 +01:00
Ghostkeeper
0831451371
Fix returning resulting metadata 
Forgot to change that back.

Contributes to issue CURA-4243.
 2017-11-21 11:05:11 +01:00
Jaime van Kessel
b1649f2d38 Added PrintJob handling to ClusterUM3 
CL-541
 2017-11-21 11:01:19 +01:00
Ghostkeeper
c4debbea8b
Implement deserializeMetadata 
Let's hope this works...

Contributes to issue CURA-4243.
 2017-11-21 10:59:01 +01:00
Diego Prado Gesto
2df06bbbb9 CURA-4526 Add Simulation View plugin 2017-11-21 10:51:57 +01:00
Diego Prado Gesto
b6e997c88d CURA-4526 Delete LayerView plugin because it will be replaced with the 
SimulationView.
This commit also adapts the code in order to accept the messages coming
from the engine, with information about feedrates and line thicknesses.
Add also some changes in the GCodeReader that reads feedrates and
line thickness from the gcode file.
 2017-11-21 10:47:29 +01:00
Jaime van Kessel
fd548975cc Closing a connection now actually stops the updates 
CL-541
 2017-11-21 10:19:17 +01:00
fieldOfView
b4b39f0949 Tweak compatibility mode collapsed view panel 2017-11-20 20:32:45 +01:00
fieldOfView
532331bd44 Add a collapse button to the Simulation View panel 
See https://github.com/Ultimaker/Cura/pull/2732
 2017-11-20 20:24:38 +01:00
jack
f197508694 Merge pull request #2814 from Ultimaker/feature_maximum_resolution 
Maximum mesh resolution
 2017-11-20 18:09:11 +01:00
Lipu Fei
d00f3ba79b Fix for loop 2017-11-20 18:08:13 +01:00
Lipu Fei
8cad79831a Fix empty containers in stack upgrade 2017-11-20 18:07:51 +01:00
Diego Prado Gesto
a4ed3bb2c6 CURA-4577 Fix the previous change 2017-11-20 17:59:57 +01:00
ChrisTerBeke
85eab3606b Simplify relative positioning xyz value updates - CURA-4577 2017-11-20 17:58:46 +01:00
fieldOfView
a42d054505 Tweak simulation view panel margins 2017-11-20 17:49:00 +01:00
Diego Prado Gesto
dd8e5e2c6e CURA-4577 Take into account relative movements in GCodes 2017-11-20 17:48:05 +01:00
ChrisTerBeke
657a91c525 Merge pull request #2685 from Ultimaker/container_stack_improvements 
Container stack improvements
 2017-11-20 17:42:26 +01:00
fieldOfView
1483683992 Move play button to path slider 2017-11-20 17:17:16 +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
1167fa0a89 Added data handling for legacy printer 
CL-541
 2017-11-20 16:03:54 +01:00
Lipu Fei
775271faac Fix module importing in SimulationView 
CURA-4526
 2017-11-20 15:57:20 +01:00
Ghostkeeper
604105752d
Fix import in plugin subdirectory 
Contributes to issue CURA-4526.
 2017-11-20 15:36:54 +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
Jaime van Kessel
59e4d1af63 re-added recheck connections 
CL-541
 2017-11-20 15:11:38 +01:00
Aleksei S
9337cc8a7f Merge branch '3.1' into print_simulation_view 2017-11-20 14:32:22 +01:00
Aleksei S
20c21d6e79 Added "Signal.disconect" after changing views 
CURA-4526
 2017-11-20 13:52:22 +01:00
Jaime van Kessel
4197f18fc1 First steps to ensure that the Discover UM3 action works with new architecture 
CL-541
 2017-11-20 13:35:08 +01:00
Jaime van Kessel
1b8caa7a21 NetworkedPrinterOutputDevice now requires address in constructor 
CL-541
 2017-11-20 13:23:09 +01:00
Jaime van Kessel
68e80a88bc Rename usage of printer to more generic device. 
The usage of "printer" is a bit confusing, as in the case of CuraConnect
it's a device that can acces multiple printers.

CL-541
 2017-11-20 13:18:08 +01:00
Jaime van Kessel
9202bb11fe Added stubs for cluster & legacy output devices 
CL-541
 2017-11-20 13:12:15 +01:00
Diego Prado Gesto
56db10d9cb CURA-4526 Change simulation behavior when clicking on Play button 2017-11-20 11:24:25 +01:00
Jaime van Kessel
22f2279a76 Moved bunch of code from the old location to the new bits in archtiecture 
CL-541
 2017-11-20 10:59:57 +01:00
Diego Prado Gesto
41d0df5b5b
Merge branch 'master' into print_simulation_view 2017-11-20 09:29:18 +01:00
Diego Prado Gesto
217fb606c4 CURA-4577 Fix the previous change 2017-11-20 09:04:07 +01:00
Ruben D
6d2bcd9b3e
Fix error message when slicing with per-object setting errors 
The message was generating a list of settings that had an error state by going through all extruder stacks and the global stack, but didn't bother to check the per-object stacks. I could've added it to the regular message but then the user would be confused because he can't find any errors either. So instead I opted to specify that it happened in per-model settings. It's not perfect, but should narrow down the user's search considerably.

Fixes #2427.
 2017-11-20 01:55:57 +01:00
fieldOfView
c7f190bb26 Remove (ancient) commented out code 2017-11-18 11:30:17 +01:00
fieldOfView
1924946b59 Merge branch 'master' into feature_mesh_types 
# Conflicts:
#	plugins/SolidView/SolidView.py
 2017-11-18 11:28:15 +01:00
ChrisTerBeke
fb2ffb7270 Simplify relative positioning xyz value updates - CURA-4577 2017-11-17 16:31:16 +01:00