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

Inner brim only and Outer and inner brim

Browse source 
Signed-off-by: SoftFever <softfeverever@gmail.com>
This commit is contained in:
SoftFever 2023-01-22 01:18:15 +08:00
parent 5ea57c1406
commit 05c8b57ade
3 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libslic3r/Brim.cpp
View file

@ -952,8 +952,6 @@ static ExPolygons outer_inner_brim_area(const Print& print,
// BBS: inner and outer boundary are offset from the same polygon incase of round off error. // BBS: inner and outer boundary are offset from the same polygon incase of round off error.
auto innerExpoly = offset_ex(ex_poly.contour, brim_offset, jtRound, SCALED_RESOLUTION); auto innerExpoly = offset_ex(ex_poly.contour, brim_offset, jtRound, SCALED_RESOLUTION);
append(brim_area_object, diff_ex(offset_ex(innerExpoly, brim_width_mod, jtRound, SCALED_RESOLUTION), innerExpoly)); append(brim_area_object, diff_ex(offset_ex(innerExpoly, brim_width_mod, jtRound, SCALED_RESOLUTION), innerExpoly));
// BBS: brim should be apart from holes
append(no_brim_area_object, diff_ex(ex_poly_holes_reversed, offset_ex(ex_poly_holes_reversed, -scale_(5.))));
} }
if (brim_type == BrimType::btInnerOnly || brim_type == BrimType::btOuterAndInner) { if (brim_type == BrimType::btInnerOnly || brim_type == BrimType::btOuterAndInner) {
append(brim_area_object, diff_ex(offset_ex(ex_poly_holes_reversed, -brim_offset), offset_ex(ex_poly_holes_reversed, -brim_width - brim_offset))); append(brim_area_object, diff_ex(offset_ex(ex_poly_holes_reversed, -brim_offset), offset_ex(ex_poly_holes_reversed, -brim_width - brim_offset)));

11
src/libslic3r/PrintConfig.cpp
View file

@ -795,15 +795,14 @@ void PrintConfigDef::init_fff_params()
def->enum_keys_map = &ConfigOptionEnum<BrimType>::get_enum_values(); def->enum_keys_map = &ConfigOptionEnum<BrimType>::get_enum_values();
def->enum_values.emplace_back("auto_brim"); def->enum_values.emplace_back("auto_brim");
def->enum_values.emplace_back("outer_only"); def->enum_values.emplace_back("outer_only");
def->enum_values.emplace_back("inner_only");
def->enum_values.emplace_back("outer_and_inner");
def->enum_values.emplace_back("no_brim"); def->enum_values.emplace_back("no_brim");
//def->enum_values.emplace_back("inner_only");
//def->enum_values.emplace_back("outer_and_inner");
def->enum_labels.emplace_back(L("Auto")); def->enum_labels.emplace_back(L("Auto"));
def->enum_labels.emplace_back(L("Manual")); def->enum_labels.emplace_back(L("outer_only"));
def->enum_labels.emplace_back(L("Inner brim only"));
def->enum_labels.emplace_back(L("Outer and inner brim"));
def->enum_labels.emplace_back(L("No-brim")); def->enum_labels.emplace_back(L("No-brim"));
// BBS: The following two types are disabled
//def->enum_labels.emplace_back(L("Inner brim only"));
//def->enum_labels.emplace_back(L("Outer and inner brim"));
def->mode = comSimple; def->mode = comSimple;
def->set_default_value(new ConfigOptionEnum<BrimType>(btAutoBrim)); def->set_default_value(new ConfigOptionEnum<BrimType>(btAutoBrim));

2
src/libslic3r/PrintConfig.hpp
View file

@ -155,9 +155,9 @@ enum SLAPillarConnectionMode {
enum BrimType { enum BrimType {
btAutoBrim, // BBS btAutoBrim, // BBS
btOuterOnly, btOuterOnly,
btNoBrim,
btInnerOnly, btInnerOnly,
btOuterAndInner, btOuterAndInner,
btNoBrim,
}; };
enum TimelapseType { enum TimelapseType {