Commit graph

3049 commits

Author SHA1 Message Date
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
ChrisTerBeke
7a7b4d2b63 Merge branch 'master' into feature_headless_docker 2018-01-05 14:27:58 +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 564a97d5a8.
2018-01-05 09:17:02 +01:00
Ghostkeeper
63f7902fca
Revert "Simplify code flow a bit"
This reverts commit 2c45efb70d.
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
Simon Edwards
b20e35714f Factor out the code for adding a function for run after a HTTP request
CL-541
2018-01-04 13:36:29 +01:00
Simon Edwards
695c7d8267 Rename the _live_multiparts to the even better _kept_alive_multiparts name
CL-541
2018-01-04 13:27:24 +01:00
ChrisTerBeke
c47a0a17a5 Merge branch 'master' into feature_headless_docker 2018-01-04 13:23:50 +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
c7c989f2a0 Fix merge conflicts after multi-buildplate refactor 2018-01-04 10:52:01 +01:00
Simon Edwards
2588e11364 Improve and simplify how we hold on to form part objects
CL-541
2018-01-04 10:43:50 +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
Simon Edwards
3173eb6740 Avoid mega-tons of object copying when building compressed gcode
CL-541
2018-01-03 16:15:12 +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
ChrisTerBeke
08322d0a5e Move all decorators in the scene subfolder 2018-01-03 15:09:19 +01:00
ChrisTerBeke
62b06b063b Also move other operations into operations subfolder 2018-01-03 15:06:20 +01:00
ChrisTerBeke
a5630e5c54 Move all arranging related code into a subfolder 2018-01-03 15:05:06 +01:00
ChrisTerBeke
182e7de07d
Merge branch 'master' into network_rewrite 2018-01-03 14:17:48 +01:00
Jaime van Kessel
e12a2fbd6a Fixed typing
CL-541
2018-01-03 14:07:34 +01:00
Jaime van Kessel
c1bf87bd8f Removed commented out code
CL-541
2018-01-03 13:54:15 +01:00
Jack Ha
bfa33c721c CURA-4525 solved merge conflicts 2018-01-03 13:52:55 +01:00
Jaime van Kessel
ef46f51497 Camera delete now triggers the correct function
CL-541
2018-01-03 13:44:38 +01:00
Jack Ha
dd989a1a51 CURA-4525 refresh objects list of all items after changing build plate 2018-01-03 13:43:09 +01:00
Jack Ha
c8243a0ddd CURA-4525 fix convex hull, changed size of object list 2018-01-03 12:47:09 +01:00
Simon Edwards
5e3666f073 Fill out the type hints in NetworkedPrinterOutputDevice.py
CL-541
2018-01-02 17:21:51 +01:00
Lipu Fei
70d5d4415f
Merge branch 'master' into CURA-4708_fix_definition_changes_extruder_stacks 2018-01-02 10:41:44 +01:00
Ghostkeeper
2e197f0f34
Move all per-extruder settings
Also move things that we didn't think of previously, such as extruder offsets. You can't enter them as a user in the interface if it was single-extrusion, but you could've edited the files.

Contributes to issue CURA-4708.
2018-01-02 08:36:46 +01:00
Ghostkeeper
a87465186e
Fix off-by-one bug when importing profiles with extruder stacks
Since machine_extruders contains only the extruder stacks (not the global stack) but profile_index counts through all stacks including the global stack, we need to increase the length of machine_extruders by 1 when comparing.
I also swapped the comparison around since I think it's more logical this way around.

Contributes to issue CURA-4738.
2018-01-02 08:19:31 +01:00
Ruben D
689a18ee57
Rename sidebar_collapsed and code style
sidebar_collapsed is more consistent with other options and setting names we use. Better change it before the next release rolls out otherwise we'd have to do a version upgrade.
Also changed some code style things to be in line with our guidelines.

Contributes to issue CURA-4234.
2017-12-30 19:35:46 +01:00
Ghostkeeper
4a3109c885
Don't crash when loading model before a printer is loaded
The model won't load successfully and you get a message that it failed to load, but Cura won't crash at least.

Contributes to issue CURA-4736.
2017-12-29 14:47:55 +01:00
Ghostkeeper
a4d83331ad
Code style: Space around binary operator
Contributes to issue CURA-4672.
2017-12-28 14:30:47 +01:00
Ghostkeeper
4b9ddc186a
Code style: Space after binary operator
Contributes to issue CURA-4672.
2017-12-28 14:28:12 +01:00
ChrisTerBeke
727da34bd3 Merge branch 'master' into feature_headless_docker 2017-12-22 14:21:36 +01:00
ChrisTerBeke
07ad74d7f9 Always construct scene and build platë node tree 2017-12-22 14:20:54 +01:00
Lipu Fei
0c28c61e05 Create new SettingInstances when moving user changes settings
CURA-4708
2017-12-22 14:09:13 +01:00
Lipu Fei
0cd392fbd2 Create new SettingInstance when moving extruder DC settings
CURA-4708
2017-12-22 14:08:22 +01:00