3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-07 06:57:36 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

FIX: unify cli and GUI auto-arrange

Browse source 
Make sure cli uses same params as GUI's auto-arrange.
Previously cli uses wrong skirt_distance.

Jira: BLPIOT-255
Change-Id: Iaccfb76acf7413ec614fff006feb770dcd6783cf
This commit is contained in:
Arthur 2023-08-09 14:34:28 +08:00 • committed by Lane.Wei
parent f6ac8b60b7
commit 064f3ee0aa
8 changed files with 136 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/libslic3r/PrintConfig.cpp
View file

@ -5293,6 +5293,17 @@ Polygon get_bed_shape_with_excluded_area(const PrintConfig& cfg)
if (!tmp.empty()) bed_poly = tmp[0];
return bed_poly;
}
bool has_skirt(const DynamicPrintConfig& cfg)
{
auto opt_skirt_height = cfg.option("skirt_height");
auto opt_skirt_loops = cfg.option("skirt_loops");
auto opt_draft_shield = cfg.option("draft_shield");
return (opt_skirt_height && opt_skirt_height->getInt() > 0 && opt_skirt_loops && opt_skirt_loops->getInt() > 0)
|| (opt_draft_shield && opt_draft_shield->getInt() != dsDisabled);
}
float get_real_skirt_dist(const DynamicPrintConfig& cfg) {
return has_skirt(cfg) ? cfg.opt_float("skirt_distance") : 0;
}
} // namespace Slic3r
#include <cereal/types/polymorphic.hpp>