Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CURA-9331] Check if all paths are empty in supposedly non-empty wall-path. #1688

Merged
merged 2 commits into from
Jul 5, 2022
Merged

[CURA-9331] Check if all paths are empty in supposedly non-empty wall-path. #1688

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36bad69
Check if all paths are empty in supposedly non-empty wall-path.
rburema Jul 1, 2022
819d09e
Expand check for empty paths
Ghostkeeper Jul 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/FffGcodeWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1741,7 +1741,16 @@ bool FffGcodeWriter::processSingleLayerInfill(const SliceDataStorage& storage, L
}

wall_tool_paths.emplace_back(part.infill_wall_toolpaths); //The extra infill walls were generated separately. Add these too.
const bool walls_generated = std::any_of(wall_tool_paths.cbegin(), wall_tool_paths.cend(), [](const std::vector<VariableWidthLines>& tp){ return !tp.empty(); });
const bool walls_generated =
std::any_of
(
wall_tool_paths.cbegin(),
wall_tool_paths.cend(),
[](const std::vector<VariableWidthLines>& tp)
{
return ! (tp.empty() || std::all_of(tp.begin(), tp.end(), [](const VariableWidthLines& vwl) { return vwl.empty(); }));
}
);
if(!infill_lines.empty() || !infill_polygons.empty() || walls_generated)
{
added_something = true;
Expand All @@ -1763,7 +1772,7 @@ bool FffGcodeWriter::processSingleLayerInfill(const SliceDataStorage& storage, L
else //So walls_generated must be true.
{
std::vector<VariableWidthLines>* start_paths = &wall_tool_paths[rand() % wall_tool_paths.size()];
while(start_paths->empty()) //We know for sure (because walls_generated) that one of them is not empty. So randomise until we hit it. Should almost always be very quick.
while(start_paths->empty() || (*start_paths)[0].empty()) //We know for sure (because walls_generated) that one of them is not empty. So randomise until we hit it. Should almost always be very quick.
{
start_paths = &wall_tool_paths[rand() % wall_tool_paths.size()];
}
Expand Down