372 Commits

Author SHA1 Message Date
Ghostkeeper
cfc9a7b6cf
Move prime tower area generation to separate function
This function is named as if it could later include other printed pieces, but it is meant to only include pieces that have normal bed adhesion, so not the prime locations.

Contributes to issue CURA-2625.
2016-11-11 13:03:34 +01:00
Ghostkeeper
a37ab8f4b1
Use approximated circle for the prime polygons
It's much easier to create, more obvious code, and better approximates the area that we seek to use for our prime location.

Contributes to issue CURA-2625.
2016-11-11 12:46:53 +01:00
Ghostkeeper
3d9eb4f2be
Move prime tower creation code closer to where it's used
The check for collisions is only at the end, and after that it adds the polygon itself. We should keep the code closer together to make it more readable.

Contributes to issue CURA-2625.
2016-11-11 12:01:08 +01:00
Ghostkeeper
42ee87c88f
Rename areas to result_areas
Because we have 'areas', 'disallowed_areas', 'self._disallowed_areas', 'disallowed_polygons', and so on. This should reduce the confusion a bit.

Contributes to issue CURA-2625.
2016-11-11 11:54:50 +01:00
Ghostkeeper
77a6c459d8
Move initialisation of areas closer to where it's used
Makes the code more easy to follow.

Contributes to issue CURA-2625.
2016-11-11 11:53:13 +01:00
Ghostkeeper
b6611b66f8
Remove unused intermediary value
This is not used, unless you take multi-threading into account. In that case though, the actual disallowed areas are only updated at the end of this function, and the _has_errors variable is updated right before then as well, so this way the variable is in an invalid state for a smaller amount of time.

Contributes to issue CURA-2625.
2016-11-11 11:51:32 +01:00
Ghostkeeper
49c5a90d29
Remove unused variable
This one is now moved to the _computeDisallowedAreasStatic function.

Contributes to issue CURA-2625.
2016-11-11 11:48:03 +01:00
Ghostkeeper
1603930c5c
Extract computing static disallowed areas to different function
These disallowed areas will have to move or get duplicated according to which nozzles are used. Eventually we'll want to compute these with their Minkowski additions only when needed (the skirt size changes), not when the used extruders change. This is also part of an effort to make this disallowed area computation a bit better structured. The behaviour should be the same.

Contributes to issue CURA-2625.
2016-11-11 11:41:55 +01:00
Ghostkeeper
6999a14821
Merge branch '2.3' 2016-10-31 10:55:54 +01:00
Ghostkeeper
2760055e89
Use settings from all extruders for radius of moves from walls
It computes the maximum move distance from the outer walls for all extruders, not just the platform adhesion extruder.

Contributes to issue CURA-2823.
2016-10-28 15:20:13 +02:00
Jaime van Kessel
999380cf1b Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-27 17:15:58 +02:00
Jaime van Kessel
e27be7fc4b Travel_avoid_distance and support_offset are only taken into account if respecive feature is active
We used to always add them, but now we check if support_enable and travel_avoid_other_parts are enabled
CURA-2823
2016-10-27 09:59:29 +02:00
fieldOfView
55191b722a Codestyle & documentation 2016-10-25 23:06:23 +02:00
fieldOfView
fef15c706f Render an indication of the origin of the machine 2016-10-25 22:51:44 +02:00
Jaime van Kessel
bac0ea94a1 Removed nozzle offset from prime area
CURA-2520
2016-10-04 13:40:31 +02:00
Jack Ha
4cc5b6d9eb Added activeStackChanged to BuildVolume, it is semantically more correct. Contributes to CURA-2232 2016-10-03 10:27:31 +02:00
Ghostkeeper
9c4c4ebce2
Apply support expansion to platform adhesion and shields
Platform adhesion and shields all go around the support, the expanded support. Support expansion is almost like an expansion of the mesh itself, except that infill wipe distance and such don't apply to it.

Contributes to issue CURA-2407.
2016-09-30 11:04:22 +02:00
Ghostkeeper
4ab7ea5c0f
Account for support offset in disallowed border
It is similar to travel avoid distance.

Contributes to issue CURA-2407.
2016-09-29 12:47:10 +02:00
Ghostkeeper
47b9fbc447
Add helper function for getting setting from support extruder
This splits up the helper function we already had, to prevent code duplication.

Contributes to issue CURA-2407.
2016-09-29 12:47:10 +02:00
Ghostkeeper
d8fe9462dd
Remove property-parameter from calls where it is 'value'
That is the default value for the argument anyway. Makes the code more legible.

Contributes to issue CURA-2407.
2016-09-29 12:47:10 +02:00
Ghostkeeper
2e3937dd56
Rename _getSettingProperty to _getSettingFromAdhesionExtruder
This opens up the way for other methods to get settings from different extruders.

Contributes to issue CURA-2407.
2016-09-29 12:47:10 +02:00
Jaime van Kessel
b0c20eafbd Prime colission now blocks slicing
CURA-2375
2016-09-28 16:50:13 +02:00
Jaime van Kessel
78b052f66c Only start change timer if there is a global stack 2016-09-28 16:41:04 +02:00
Jaime van Kessel
3de4d4987c Prime positions now also intersect with oneother
CURA-2375
2016-09-28 15:14:38 +02:00
Ghostkeeper
608c442bb9
Fix remaining merge conflict
Must've done something wrong? No, it's they who are wrong!

Contributes to issue CURA-2407.
2016-09-28 11:53:03 +02:00
Ghostkeeper
4fc30615ab
Remove forgotten unused function
This function is now in the Polygon class in Uranium.

Contributes to issue CURA-2407.
2016-09-28 11:50:38 +02:00
Ghostkeeper
777a89ce46
Don't offset border with Horizontal Expansion any more
This is now done in the convex hull of the mesh itself.

Contributes to issue CURA-2407.
2016-09-28 11:50:38 +02:00
Ghostkeeper
18d67dc552
Move generating approximated circle to Polygon class
This is not specific to the build volume. It's more of a Polygon thing. Moved to Uranium.

Contributes to issue CURA-2407.
2016-09-28 11:48:06 +02:00
Jaime van Kessel
01d479e521 Updated documentation
CURA-2375
2016-09-28 09:42:00 +02:00
Jaime van Kessel
9f1dd325bb Prime tower area is now also drawn in error mesh
CURA-2375
2016-09-28 09:36:43 +02:00
Jaime van Kessel
799cb51c2e Prime area's can now also be blocked by disallowed area's
CURA-2375
2016-09-28 09:22:14 +02:00
Ghostkeeper
ec26a45eb9
Spelling in documentation
This must be the Latin form.

Contributes to issue CURA-2407.
2016-09-27 16:36:07 +02:00
Ghostkeeper
b1c49d0a91
Infill Wipe Distance belongs to moves from the wall
Was a copy-paste mistake, I think.

Contributes to issue CURA-2407.
2016-09-27 16:36:06 +02:00
Ghostkeeper
433f7ce53f
Separate out pieces that contribute to the disallowed border
This makes it much more clear which settings contribute to the border in what way.

Also fixes the border size definitely.

Contributes to issue CURA-2407.
2016-09-27 16:36:06 +02:00
Ghostkeeper
1daa71c0ec
Raise exception when encountering unknown bed adhesion
This fails explicitly when the bed adhesion is unknown, so that any programmer who adds bed adhesion or changes existing bed adhesion enum values will get notified as quickly as possible that this build volume calculation should be updated as well.

Contributes to issue CURA-2407.
2016-09-27 16:36:06 +02:00
Ghostkeeper
c4d3fa7fc7
Rename skirt_size to border_size
It is not only about the skirt, but about other things like travel avoid distance as well.

Contributes to issue CURA-2407.
2016-09-27 16:36:06 +02:00
Ghostkeeper
f7e8340235
Rename bed_adhesion_size to disallowed_border_size
It is the size of the border around the build volume that is disallowed, which is more generic than just the size of the bed adhesion. This edge is not only for bed adhesion.

Contributes to issue CURA-2407.
2016-09-27 16:36:06 +02:00
Ghostkeeper
743ac85b99
Rename _getBedAdhesionSize to _getEdgeDisallowedSize
This function is not only about the bed adhesion, but also about the other things that require space around meshes but are not part of the collision box.

Contributes to issue CURA-2407.
2016-09-27 16:36:06 +02:00
Jaime van Kessel
a43713e27f Offset distances are now not added, but used if they are larger
CURA-2407
2016-09-27 11:09:14 +02:00
Jaime van Kessel
5ac609edc9 Settings are now obtained from right extruder
CURA-2407
2016-09-27 09:36:04 +02:00
Jaime van Kessel
dccf18c4e7 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-26 17:23:20 +02:00
Jaime van Kessel
8e07a94d68 Use the right settings for wipe & avoid distances
CURA-2407
2016-09-26 17:22:49 +02:00
Jack Ha
962381be59 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-26 16:06:47 +02:00
Jack Ha
e038016ead Comment. CURA-2232, CURA-2274 2016-09-26 16:06:36 +02:00
Jaime van Kessel
87b0063266 Ooze & draft shield distances are now only used if greater than brim / skirt
CURA-2407
2016-09-26 13:51:42 +02:00
Jack Ha
1cc5d699c4 Update build volume (including prime tower visualization) after quality change. CURA-2274 and CURA-2232 2016-09-26 11:26:03 +02:00
Jaime van Kessel
0b6c196659 Moved getAllExtruderValues to extruder manager
CURA-2407
2016-09-22 16:36:27 +02:00
Jaime van Kessel
e0109a1857 Infill wipe distance and travel avoid distance are now also taken into account
CURA-2407
2016-09-22 16:00:18 +02:00
Jaime van Kessel
4141a87887 BuildVolume now takes the extra line by extra extruders into account
CURA-2407
2016-09-22 15:42:04 +02:00
fieldOfView
dea7192000 Hide build volume message when it no longer applies
CURA-2312
2016-09-21 15:21:16 +02:00