6455 Commits

Author SHA1 Message Date
Kostas Karmas
726175a01d Merge branch '4.8' of https://github.com/Ultimaker/Cura into 4.8 2020-11-04 09:22:42 +01:00
Kostas Karmas
881e4406a4 Ensure the organization_id is None 2020-11-04 09:21:28 +01:00
Jaime van Kessel
526eb8dacd
Gracefully handle exceptions in arrange
CURA-7785
2020-11-03 09:48:54 +01:00
Jaime van Kessel
d35d6b087a
Reset the entire transformation when merging
This fixes the issue when the packing algorithm rotated an object

CURA-7796
2020-10-27 13:44:33 +01:00
Kostas Karmas
03dc8d00fe Up the SDK version to 7.4.0
In preparation for release of the 4.8.

CURA-7795
2020-10-22 11:29:25 +02:00
Konstantinos Karmas
1e005260b4
Merge pull request #8582 from Ultimaker/CURA-7643_fix_prime_tower_overlap
Fix prime tower overlap
2020-10-22 11:02:20 +02:00
Jaime van Kessel
5109bd3684
Fix crash when duplicating node with support blocker
Suggested & reported by smartavonics.

Fixes #8581
2020-10-20 14:19:33 +02:00
Jaime van Kessel
e13ffb597d
Increase resolution of prime tower shadow and use doulbe brim size
It needs to use the double brim size, as it needs to ensure that
it has enough room for it's own brim and any object brim.

The resolution of the circle is increased so that the shadow matches
more with what is actually being printed

CURA-7643
2020-10-20 13:41:35 +02:00
Konstantinos Karmas
a2cd21ac49
Merge pull request #8549 from Ultimaker/CURA-7770_Update_setting_after_disable_extruder
Force an re-evaluation of a setting when extruder has been disabled
2020-10-19 11:33:10 +02:00
Jaime van Kessel
02605f00e5
Merge branch 'CURA-7780_Fix_arrange_message_not_closing_when_arrange_crashes' of github.com:Ultimaker/Cura into 4.8 2020-10-19 10:58:47 +02:00
Jelle Spijker
3c7422f172
Merge pull request #8536 from Ultimaker/CURA-7717_Add_Essentials_subscription_information_in_slice_data
CURA-7717: Add subscription information in slice data
2020-10-16 13:42:51 +02:00
Kostas Karmas
8c1cf89d45 Skip arranging objects that have no convex hull
CURA-7780
2020-10-16 11:31:00 +02:00
Kostas Karmas
148dd26b67 Close "Finding Location" message if arrange crashes
CURA-7780
2020-10-16 11:10:02 +02:00
Jaime van Kessel
50ae33c42d
Force an re-evaluation of a setting when extruder has been disabled
CURA-7770
2020-10-16 10:50:05 +02:00
Kostas Karmas
21b9c0639d Exclude objects outside buildplate from OneAtATimeIterator
CURA-7776
2020-10-14 17:14:38 +02:00
Kostas Karmas
1521430d42 Include all subscription information in the slice data
CURA-7717
2020-10-14 11:43:22 +02:00
Kostas Karmas
095e34fe8d Merge branch 'master' into CURA-7717_Add_Essentials_subscription_information_in_slice_data 2020-10-14 11:34:42 +02:00
Kostas Karmas
c54605a134 Transfer deprecated decorator on __init__ of Arrange
As it cannot decorate a class.

Also, the deprecated decorator has to be applied before the @classmethod.

CURA-7440
2020-10-13 18:06:44 +02:00
Kostas Karmas
ceda3e70bd Include organization id and type of enterprise plan in slice data
CURA-7717
2020-10-13 16:30:29 +02:00
Remco Burema
534b8f74a9
Merge pull request #8503 from Ultimaker/CURA-7440-pynest2d_for_arrange
Swap out arrange for PyNest2d
2020-10-13 11:54:00 +02:00
Kostas Karmas
a0e4e4325d Add missing documentation
CURA-7440
2020-10-12 17:57:00 +02:00
Kostas Karmas
972e2f6716 Fix crash when arranging objects in one-at-a-time mode
Crashing was occuring because node.getPoints() can return None.

CURA-7440
2020-10-12 16:28:28 +02:00
Remco Burema
9f929298d7
Merge pull request #8510 from Ultimaker/CURA-7754_add_disallowed_areas
Mark disallowed areas as disallowed areas
2020-10-09 19:27:26 +02:00
Kostas Karmas
7e77910d10 Make the code of the locked_nodes more readable
CURA-7440
2020-10-09 18:17:10 +02:00
Kostas Karmas
a94ebc6261 Don't arrange locked objects when arrangeAll is called
CURA-7440
2020-10-09 18:09:40 +02:00
Kostas Karmas
d47623d58a Remove duplicate addition of items in the node_items list
CURA-7440
2020-10-09 17:19:53 +02:00
Kostas Karmas
f9bd5e3dcd Modify arrange() to optionally create AddSceneNodeOperations
Then the MultiplyObjectsJob can use the arrange function instead of duplicating the code

CURA-7440
2020-10-09 17:12:59 +02:00
Kostas Karmas
518003f027 Remove unused variables
CURA-7440
2020-10-09 16:03:31 +02:00
Kostas Karmas
eedbcb6a2d Fix z position of objects that end outside the buildplate
When multiplying objects or inserting objects in the scene that do not fit in the buildplate, those
objects would correctly end up outside the buildplate, but their Z position would be aligned at the
absolute Z=0 of the buildplate.

This commit fixes that by compensating in the z-axis, properly moving the object outside the
buildplate in the correct z-position so that it's bottom is aligned with the original object.

CURA-7440
2020-10-09 15:59:50 +02:00
Kostas Karmas
0922f03ca5 Merge branch 'CURA-7440-pynest2d_for_arrange' of https://github.com/Ultimaker/Cura into CURA-7440-pynest2d_for_arrange 2020-10-09 13:52:07 +02:00
Remco Burema
d3ec1d7d28
Cache wasn't valid due to a reference being stored, not a copy.
paer of CURA-7440
2020-10-09 13:39:53 +02:00
Kostas Karmas
8678682d94 Reformat file and remove unused import
CURA-7440
2020-10-08 16:27:36 +02:00
Ghostkeeper
6bfa24686f
Mark disallowed areas as disallowed areas
Also improve the filtering a bit so that it's no longer dependent on the order. Doesn't really matter in this case but it should be more robust.

Contributes to issue CURA-7754.
2020-10-08 11:10:24 +02:00
Jaime van Kessel
a46bf8d6fa
Apply suggestions from code review
CURA-7440

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
2020-10-08 09:43:22 +02:00
Kostas Karmas
f25bfd717e Recalculate the number of user settings after setting the quality group
So that the dialog ensures actually knows that there are no changed settings and will not show up.

CURA-7728
2020-10-06 09:55:11 +02:00
Jaime van Kessel
d801f9838a
Fix mypy issues
It doesn't seem to like blanket imports

CURA-7440
2020-10-05 14:52:50 +02:00
Jaime van Kessel
59b9639d87
Don't let arranger place all objects on the same spot if they don't fit
CURA-7440
2020-10-05 14:31:42 +02:00
Jaime van Kessel
a14135be5e
Add some documentation to the arrange nest algorithm
CURA-7440
2020-10-05 14:24:34 +02:00
Jaime van Kessel
9312dc5c07
Add deprecated tag to arranger
CURA-7440
2020-10-05 14:15:49 +02:00
Jaime van Kessel
a1f43e7bcf
Also use the new arranger when multiplying objects 2020-10-05 14:09:50 +02:00
Jaime van Kessel
5823140b21
Always add multiplied nodes to the root.
No idea why it was using the parent of the current node. It's
technically the same, but this is much more explicit

CURA-7440
2020-10-05 13:45:24 +02:00
Jaime van Kessel
30966beed2
Let autoplacement also take the existing nodes into account
CURA-7440
2020-10-05 13:37:57 +02:00
Jaime van Kessel
a34f1a6504
Arrange newly placed models
CURA-7440
2020-10-05 13:14:21 +02:00
Jaime van Kessel
2d084c9e2b
Remove the old arrange from mesh placement on load
For some reaso it was also handling the move up to the buildplate (which it
really shouldn't do)

CURA-7440
2020-10-05 13:08:28 +02:00
Jaime van Kessel
274dc8d06c
Split up arrange
This splits up the finding of new positions with the actual move. This is needed
for when we want to place new nodes on model load.

CURA-7440
2020-10-02 11:21:57 +02:00
Jaime van Kessel
c25351c98a
Remove unused imports
CURA-7440
2020-10-02 10:06:41 +02:00
Jaime van Kessel
8c1985cdb3
Move nest2darrange to it's own function
This makes it a lot easier to re-use it

CURA-7440
2020-10-02 10:06:09 +02:00
Jaime van Kessel
c33c025a6c
Add getters for Width/height/depth to build volume
CURA-7440
2020-10-02 10:04:46 +02:00
Jaime van Kessel
e0e65b91b5
Take disallowed areas into account when arranging
CURA-7440
2020-09-30 10:34:35 +02:00
Jaime van Kessel
73289b2a77
Place objects that we couldn't fit next to the buildplate
CURA-7440
2020-09-28 16:21:47 +02:00