3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 07:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
11685 commits 307 branches 272 tags 787 MiB
Commit graph

3012 commits

Author SHA1 Message Date
Lipu Fei
9fab4070a6 Fix quality_changes upgrade from 2.7 to 3.1 2017-11-22 12:11:18 +01:00
Diego Prado Gesto
10ec02840e Merge branch 'feature_simulation_ux_tweaks' of https://github.com/fieldOfView/Cura into fieldOfView-feature_simulation_ux_tweaks 2017-11-22 09:55:57 +01:00
Diego Prado Gesto
72954e758c CURA-4593 Workaround to fix the rendering glitches when the last layer has no data 2017-11-21 17:15:07 +01:00
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
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
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
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
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
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
Diego Prado Gesto
56db10d9cb CURA-4526 Change simulation behavior when clicking on Play button 2017-11-20 11:24:25 +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
Diego Prado Gesto
39428991de Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-11-17 15:07:10 +01:00
Diego Prado Gesto
a0304255d1 CURA-4577 Take into account relative movements in GCodes 2017-11-17 15:05:08 +01:00
Diego Prado Gesto
98d48978a8 CURA-4526 Add the SimulationView plugin to Cura and deleting LayerView 
plugin
 2017-11-17 14:27:46 +01:00
ChrisTerBeke
f48539cc93
Merge pull request #2685 from Ultimaker/container_stack_improvements 
Container stack improvements
 2017-11-17 13:09:54 +01:00
Lipu Fei
2c39612bc8 Fix UM2 upgrade regarding the variant 
CURA-4482

UM2 by default doesn't have variants, but if the user enables Olsson
Block, the variant option will become available. This commit fixes the
following cases:

- Make sure that the variant is set on the extruder stack but not the
  global stack
- Extruder stacks don't contain information such as has_variant. Such
  info should be retrieved from the global stack and not just from the
  definition container because they can be overriden by other
  containers.
 2017-11-17 12:47:30 +01:00
Lipu Fei
9b102f9a7e Remove unused function in StartSliceJob 
CURA-4482
 2017-11-17 11:03:13 +01:00
Diego Prado Gesto
b868f913c4 CURA-4577 Adding relative positioning to GCodeReader 2017-11-16 10:27:52 +01:00
Diego Prado Gesto
50308c6e39 CURA-4526 Calculate the line width from the GCode 2017-11-15 13:03:36 +01:00
Ruben D
e55bb1e25c
Simplify getting material's GUID 2017-11-15 00:35:53 +01:00
Diego Prado Gesto
99319b223c CURA-4526 GCodeReader now reads the feedrate and layer thickness 2017-11-14 15:28:31 +01:00
Mark
913bcf45b1 Add stderr to send errors to 2017-11-14 11:53:24 +01:00
Diego Prado Gesto
1008789364 Merge branch 'master' into print_simulation_view 2017-11-13 11:28:27 +01:00
fieldOfView
2d2b943d07 Fix getting temperatures 2017-11-13 10:44:49 +01:00