12148 Commits

Author SHA1 Message Date
Jack Ha
c5c357d126 Fixed merge conflicts of cherry picking dimensions fix 2018-01-15 09:48:17 +01:00
Lipu Fei
b54b075cc9 Use isinstance() instead or issubclass()
CURA-4525
2018-01-12 16:42:34 +01:00
Lipu Fei
51316e1dc1 Fix Prepare/Cancel button visibility conditions for manual slicing
CURA-4525
2018-01-12 11:14:01 +01:00
Lipu Fei
225b03e98e No need for the extra extrudersAdded signal
CURA-4784
2018-01-12 09:58:07 +01:00
Lipu Fei
8b3bd71b36 Get extruders list from GlobalStack itself
CURA-4784
2018-01-12 09:57:34 +01:00
ChrisTerBeke
225a205d97 Fixes for material duplication and editing, small refactoring - CURA-4787 2018-01-12 09:19:03 +01:00
Aleksei S
2ca6541712 Merge branch 'master' of github.com:Ultimaker/cura 2018-01-11 13:34:14 +01:00
Aleksei S
3f4a2c565c Fix: after extruders switch do not trigger slicing, provided a new signal
which is triggered after adding extruder and it subscribers for property changes
2018-01-11 13:32:05 +01:00
Jack Ha
b8a21a5eb3 Merge branch 'master' of github.com:Ultimaker/Cura 2018-01-11 09:33:15 +01:00
Jack Ha
b9a99d4692 CURA-4525 fix placement on load to only avoid objects on current build plate 2018-01-11 09:33:07 +01:00
Lipu Fei
702d7dd3a8 Fix model importing with multi build plate
CURA-4782
2018-01-11 08:23:19 +01:00
Diego Prado Gesto
78b42afbcb CURA-4776 Add unique id to the profiles so user can import the same
profile several times with different names.It also fixes the issue for
importing profiles from GCode.
2018-01-10 16:40:58 +01:00
Jack Ha
d91a2e1ca3 CURA-4525 move reset print information to a better place to prevent it sending info of non existent build plates 2018-01-10 16:04:56 +01:00
Jack Ha
6262003069 CURA-4525 reset the print information for build plates that are marked for slicing 2018-01-10 16:01:26 +01:00
Jack Ha
0fdb470ec7 CURA-4525 only try to slice next build plate if there are actually build plates to slice 2018-01-10 14:39:26 +01:00
Jack Ha
dab0ebd208 CURA-4525 fix saving empty gcode giving error 2018-01-10 14:25:09 +01:00
Jack Ha
686ac2292d CURA-4525 CURA-4772 fix gcode not overlapping thoughout build plates 2018-01-10 14:13:18 +01:00
Jack Ha
80aaad83e1 CURA-4525 fix manual slice slicing more than one build plate at a time 2018-01-10 14:12:21 +01:00
jack
4751de00ae
Merge pull request #3089 from fieldOfView/feature_support_mesh_enhancements
Support Mesh enhancements
2018-01-10 11:58:22 +01:00
Aleksei S
92e48795c9 Merge branch 'master' of github.com:Ultimaker/cura 2018-01-10 11:20:31 +01:00
Aleksei S
95361bbeb2 Refactoring: profile from Gcode
CURA-4776
2018-01-10 11:19:19 +01:00
ChrisTerBeke
c80c0d9e79 Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-01-10 11:17:34 +01:00
ChrisTerBeke
fd86cc84e2 check if parent exists before using width and height properties from it 2018-01-10 11:17:26 +01:00
Jack Ha
72c24c2b5b Merge branch 'master' of github.com:Ultimaker/Cura 2018-01-10 11:15:23 +01:00
Jack Ha
b295d915f8 Fix line support_infill_rate / support_line_distance for support meshes without generating any support. CURA-4777 2018-01-10 11:08:32 +01:00
Lipu Fei
4801ace546 Fix monoprice select mini v2 definition
CURA-4655
2018-01-10 08:58:51 +01:00
Lipu Fei
bd869291e0
Merge pull request #2874 from tylergibson/malyan_m200
Adding support for Malyan M200, Monoprice Select Mini V1 & V2
2018-01-10 08:58:22 +01:00
Lipu Fei
91cccedf75 Fix upgrading quality changes for single extrusion machines 2018-01-10 08:54:46 +01:00
Lipu Fei
3f341a34c6 Fix gcode job sending issue in gcode_dict refactoring 2018-01-10 08:15:03 +01:00
Lipu Fei
30870c5ef2 Refactor skip reset setting
CURA-4760
2018-01-09 17:35:10 +01:00
Lipu Fei
93599de642 Update current index in material dialog
CURA-4774

There is a delay so we update the current index when the model gets
changed.
2018-01-09 17:03:38 +01:00
ChrisTerBeke
3de4940d69 Simplify creating, duplicating materials in preferences, extract logic to python, code-style fixes 2018-01-09 16:19:29 +01:00
ChrisTerBeke
f9286d4bd5 Fix color swatch not being updated after color selection change - CURA-4774 2018-01-09 15:50:32 +01:00
Lipu Fei
33f0e8cb65 Use isinstance() to check if a node is a SceneNode
CURA-4780
2018-01-09 13:58:17 +01:00
ChrisTerBeke
8f26784377 Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-01-09 13:49:13 +01:00
ChrisTerBeke
5936ebaa80 Fix another case of scene node checking by subclass, related to CURA-4780 2018-01-09 13:48:20 +01:00
Aleksei S
3852b0d1c3 Merge branch 'master' of github.com:Ultimaker/cura 2018-01-09 13:39:32 +01:00
Aleksei S
d633a4c112 Fix: cura does not profile form G-code
CURA-4776
2018-01-09 13:38:41 +01:00
Lipu Fei
78b9a14007 Fix all possible quality changes containers for single extrusion
In the current fix, the quality changes that are applicable to the
machine may not have been fixed yet because they are not active at that
moment. This commit makes sure that for a single extrusion machine which
has just been updated to have an ExtruderStack, all the quality changes
containers that are applicable to this machine will be updated as well.
2018-01-09 13:30:01 +01:00
Lipu Fei
c91eb30de9 Skip loaded instance containers
When trying to apply the fix for single extrusion machines by creating a
new ExtruderStack, skip the quality changes container that has already
been loaded.
2018-01-09 13:30:01 +01:00
Lipu Fei
8e5167be76 Use the same machine def for extruder quality changes containers 2018-01-09 13:30:00 +01:00
Lipu Fei
59d7cc663a Fix creating ExtruderStack for single-extrusion machine at runtime
Move per-extruder settings from the machine's quality changes container
to the extruder's quality changes container.
2018-01-09 13:30:00 +01:00
Diego Prado Gesto
b11b2def3e Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-01-09 10:43:42 +01:00
Diego Prado Gesto
e3e6f301f9 CURA-4778 Add up to 8 different colors when loading a GCode, since we
support up to 8 extruders in CFP
2018-01-09 10:42:03 +01:00
ChrisTerBeke
bcd6f6c12c
Merge pull request #3109 from Ultimaker/feature_merge_post_processing_plugin
Feature merge post processing plugin
2018-01-09 10:33:09 +01:00
ChrisTerBeke
6c0fb110fe Add post processing source files 2018-01-09 10:31:12 +01:00
ChrisTerBeke
9c9c46aade Remove submodule 2018-01-09 10:30:02 +01:00
ChrisTerBeke
1f2007554d Add post processing source files to main repo 2018-01-09 10:27:28 +01:00
ChrisTerBeke
a85fd0c996 Stop ignoring post processing plugin 2018-01-09 10:26:13 +01:00
Aleksei S
117c467829 Fix: Per mesh setting combobox did not save selected option
CURA-4760
2018-01-09 09:39:15 +01:00