2845 Commits

Author SHA1 Message Date
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
6262003069 CURA-4525 reset the print information for build plates that are marked for slicing 2018-01-10 16:01:26 +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
Lipu Fei
91cccedf75 Fix upgrading quality changes for single extrusion machines 2018-01-10 08:54:46 +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
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
0722465fb9 Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-01-09 09:17:51 +01:00
Diego Prado Gesto
4c8c4c78da CURA-4772 Create a CuraSceneNode instead of a SceneNode when reading a
GCode. Avoid creating an empty CuraSceneNode if the node is already an
instance of it.
2018-01-09 09:16:21 +01:00
Jack Ha
584f477b54 CURA-4525 fix deleting last item 2018-01-08 14:28:09 +01:00
Jack Ha
164e5fdc8e CURA-4525 change active build plate if that build plate does not exist anymore; disable context menu items for build plates when no selection 2018-01-08 13:55:42 +01:00
Jack Ha
e638c21acb CURA-4525 fix selected object will select correct build plate (not only visualization) 2018-01-08 11:30:57 +01:00
Jack Ha
733d6234e6 CURA-4525 moved experimental preferences to bottom with its own label; all settings are by default off 2018-01-08 11:13:16 +01:00
Diego Prado Gesto
ab24506307 Add string to cura I18N catalog. Contributes to CURA-4525 2018-01-05 17:05:11 +01:00
Diego Prado Gesto
eda781ce7b Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-01-05 16:54:55 +01:00
Diego Prado Gesto
c839bc1759 Groups of objects are taken into account and are shown in the object
list instead of each model separatelly. Contributes to CURA-4525
2018-01-05 16:53:18 +01:00
Diego Prado Gesto
1a520a041b CURA-4768 Allow groups of models to be included in the select all and
arrange tools.
2018-01-05 16:27:57 +01:00
Ghostkeeper
b20c6c6ac7
Use isinstance instead of type checking for SceneNode
isinstance also checks for subclasses. In our case, SceneNode was just extended to CuraSceneNode so this test was failing.

Contributes to issue CURA-4766.
2018-01-05 13:02:30 +01:00
Ghostkeeper
502332ee3e
Revert "Account for getConvexHullTransformedVertices returning None"
This reverts commit 564a97d5a80545f5eebdc63de7c48a1a435ad2ea.
2018-01-05 09:17:02 +01:00
Ghostkeeper
63f7902fca
Revert "Simplify code flow a bit"
This reverts commit 2c45efb70de003b431707aadfc2a3cb37e4dc39c.
2018-01-05 09:16:03 +01:00
Ghostkeeper
2c45efb70d
Simplify code flow a bit
Use if branches for the unhappy flow, so that it's clear that this behaves as an early-out. This also prevents the need for declaring variables out of scope, which is not an issue with Python anyway.
2018-01-04 17:23:43 +01:00
Ghostkeeper
564a97d5a8
Account for getConvexHullTransformedVertices returning None
It returns None if there are no vertices.
2018-01-04 17:20:57 +01:00
Jack Ha
5e26ecb458 CURA-4672 now unbreak arrange for large objects as well :-) 2018-01-04 14:59:40 +01:00
Jack Ha
abdc33a0b9 CURA-4672 fix auto arrange for small models, they are now rounded up to 1 pixel rasterized 2018-01-04 14:23:22 +01:00
Lipu Fei
7b8f951682 Simplify temp_scale_factor assignment
CURA-4672
2018-01-04 13:02:10 +01:00
Lipu Fei
3a4445b656 Fix code style
CURA-4672
2018-01-04 12:56:24 +01:00
Lipu Fei
9cb7050681 Remove unused code
CURA-4672
2018-01-04 12:56:23 +01:00
ChrisTerBeke
4685230d8d Add missing super init call - CURA-4525 2018-01-04 10:59:44 +01:00
ChrisTerBeke
11a4845931 Move CuraSceneController together with rest of scene related code 2018-01-04 10:41:25 +01:00
Jack Ha
8854a28d56 CURA-4525 solved merge conflict 2018-01-04 10:24:30 +01:00
Jack Ha
840eedbb3d CURA-4525 switch back to build plate 0 when deleting all objects 2018-01-04 09:35:23 +01:00
Jack Ha
8c7a0d4a8e CURA-4525 created CuraSceneController and took out logic from ObjectsModel and BuildPlateModel 2018-01-04 09:26:15 +01:00
Jack Ha
9e5f0e10b9 CURA-4525 add comment and type hint 2018-01-03 15:49:31 +01:00
Jack Ha
62487e8ea2 CURA-4525 cleanups and change comment and added new-lines 2018-01-03 15:41:08 +01:00
Jack Ha
3991dee14c Merge branch 'CURA-4525-multi-build-plate-merge' of github.com:Ultimaker/Cura into CURA-4525-multi-build-plate-merge 2018-01-03 15:22:09 +01:00
Jack Ha
e7e5729006 CURA-4525 deselect after move to build plate and build plate change 2018-01-03 15:21:56 +01:00
Ian
e0c2a9e4c7 Fix for CURA-4111
When centering a scene node, TranslateOperation is used in lieu of SetTransformOperation, to avoid combinations of mirror operations behaving like rotation operations. Instead, any given node is simply translated to 0,0,0.
2018-01-03 15:13:56 +01:00