Commit graph

3150 commits

Author SHA1 Message Date
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
Jack Ha
579f2b5ec6 CURA-4525 prepare for print all or single build plate question 2017-11-16 16:34:12 +01:00
Diego Prado Gesto
b868f913c4 CURA-4577 Adding relative positioning to GCodeReader 2017-11-16 10:27:52 +01:00
Jack Ha
228039545b CURA-4525 send active build plate to legacy UM3 with Print over network 2017-11-16 09:58:53 +01:00
Jack Ha
864f417723 CURA-4525 Fix load and save projects. Not storing build plates or object names yet. 2017-11-15 16:03:32 +01:00
Diego Prado Gesto
50308c6e39 CURA-4526 Calculate the line width from the GCode 2017-11-15 13:03:36 +01:00
Jack Ha
be6561b575 CURA-4525 fixed material info per build plate, bugfix arrange on load 2017-11-15 10:28:34 +01:00
Ruben D
e55bb1e25c
Simplify getting material's GUID 2017-11-15 00:35:53 +01:00
Jack Ha
4a893c048e CURA-4525 made PrintInformation multi buildplate-aware 2017-11-14 16:35:37 +01:00
Diego Prado Gesto
99319b223c CURA-4526 GCodeReader now reads the feedrate and layer thickness 2017-11-14 15:28:31 +01:00
Jack Ha
f6c7ffac11 CURA-4525 some cleanup and comments 2017-11-14 14:48:51 +01:00
Jack Ha
bd8aa8d989 CURA-4525 automatic build plate menu items using BuildPlateModel 2017-11-14 14:27:46 +01:00
Mark
913bcf45b1 Add stderr to send errors to 2017-11-14 11:53:24 +01:00
Jack Ha
8e5e555344 CURA-4525 Send all build plate gcodes to printer at one press of the button :-) 2017-11-13 16:27:15 +01:00
Jack Ha
040cc31079 CURA-4525 layer data viewing seems fixed, although after moving an object to a different build plate triggers the reslice only after deselecting 2017-11-13 14:25:22 +01:00
Jack Ha
c732470169 CURA-4525 refined the condition when to reslice build plates; however from the layer view it (still) doesn't always show the layers 2017-11-13 13:01:58 +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
fieldOfView
e0c37cc56e Add elapsed time and total time 2017-11-12 20:59:31 +01:00
fieldOfView
698f42b837 Set job name when starting a print and clear it after printing 2017-11-12 17:55:25 +01:00
fieldOfView
826f438c72 Get target temperatures from M105 responses
Contributes to #2760
2017-11-12 15:30:55 +01:00
Diego Prado Gesto
aa9f9d5b88 Add line thickness and feedrate to the data sent from the backend 2017-11-10 16:59:06 +01:00
ChrisTerBeke
88cf40e2d7 Merge branch 'master' into container_stack_improvements 2017-11-10 14:35:13 +01:00
fieldOfView
dcdd1f8650 Tweak descriptions of mesh type options 2017-11-10 12:27:15 +01:00
fieldOfView
e00ac591bf Use material color for cutting_mesh and infill_mesh 2017-11-10 12:24:32 +01:00
fieldOfView
ac27b3f811 Add infill_mesh as an option to the dropdown 2017-11-10 10:08:27 +01:00
fieldOfView
69b707cbfe Fix coloring support_mesh with the color of the support_extruder 2017-11-09 22:02:20 +01:00
fieldOfView
a1320939e8 Update mesh type dropdown when to reflect the selected object 2017-11-09 21:42:10 +01:00
fieldOfView
316ae49b0b Fix setting mesh type through Per Model Settings combobox 2017-11-09 18:25:09 +01:00
fieldOfView
7bf40ef82b Add dropdown to per object settings for quick access to mesh types
(not yet functional)
2017-11-09 17:15:56 +01:00
Jack Ha
e21acd1a07 CURA-4525 first multi slice + multi layer data, added filter on build plate, added option arrange on load, visuals like convex hull are now correct 2017-11-09 17:03:20 +01:00
fieldOfView
3251e5915b Show the support material for support_mesh 2017-11-09 16:06:27 +01:00
fieldOfView
8f8bdc059a Render non-printing objects as semi transparent objects in Solid View 2017-11-09 12:55:03 +01:00