From 4abaad02449cbe0d1a72367ec7e5e471316645b1 Mon Sep 17 00:00:00 2001 From: wintergua Date: Wed, 22 Feb 2023 14:48:41 +0800 Subject: [PATCH] FIX: typos in the tooltip of brim tpye The tooltip of brim type contain messages of inner brim, which is not enabled in the current version Change-Id: I155a16cc4331cb0b5b54d29f6be1de6c82819e0c (cherry picked from commit 1fe773438e1697b8a0b9817a885b13e7e4fae097) --- src/libslic3r/Brim.cpp | 7 ++++--- src/libslic3r/PrintConfig.cpp | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/libslic3r/Brim.cpp b/src/libslic3r/Brim.cpp index b53b00147..7dfac2b36 100644 --- a/src/libslic3r/Brim.cpp +++ b/src/libslic3r/Brim.cpp @@ -868,7 +868,6 @@ static ExPolygons outer_inner_brim_area(const Print& print, double brimWidthRaw = configBrimWidthByVolumeGroups(adhension, maxSpeed, groupVolumePtrs, volumeGroup.slices, groupHeight); brim_width = scale_(floor(brimWidthRaw / flowWidth / 2) * flowWidth * 2); } - for (const ExPolygon& ex_poly : volumeGroup.slices) { // BBS: additional brim width will be added if part's adhension area is too small and brim is not generated float brim_width_mod; @@ -984,9 +983,11 @@ static ExPolygons outer_inner_brim_area(const Print& print, bedExPoly.front().translate(scale_(plateOffset.x()), scale_(plateOffset.y())); no_brim_area.push_back(bedExPoly.front()); } - for (const PrintObject* object : print.objects()) - if (brimAreaMap.find(object->id()) != brimAreaMap.end()) { + for (const PrintObject* object : print.objects()) { + if (brimAreaMap.find(object->id()) != brimAreaMap.end()) + { brimAreaMap[object->id()] = diff_ex(brimAreaMap[object->id()], no_brim_area); + } if (supportBrimAreaMap.find(object->id()) != supportBrimAreaMap.end()) supportBrimAreaMap[object->id()] = diff_ex(supportBrimAreaMap[object->id()], no_brim_area); diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 8d3afc05b..6513ebadf 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -763,8 +763,8 @@ void PrintConfigDef::init_fff_params() def = this->add("brim_type", coEnum); def->label = L("Brim type"); def->category = L("Support"); - def->tooltip = L("This controls brim position including outer side of models, inner side of holes or both. " - "Auto means both the brim position and brim width is analysed and calculated automatically"); + def->tooltip = L("This controls the generation of the brim at outer side of models. " + "Auto means the brim width is analysed and calculated automatically."); def->enum_keys_map = &ConfigOptionEnum::get_enum_values(); def->enum_values.emplace_back("auto_brim"); def->enum_values.emplace_back("outer_only");