GitHub-Proxy/BambuStudio
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/bambulab/BambuStudio.git synced 2025-08-19 16:39:12 +08:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

FIX: the brim cannot generated on left/right only printable area

Browse Source 
jira: none
Change-Id: If1a46773cdbd66ea3ab8484dc5d58ce5bbd3ded2
This commit is contained in:
zhimin.zeng 2024-12-21 21:55:38 +08:00 committed by lane.wei
parent c6e117fef0
commit f127f95335
4 changed files with 57 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/libslic3r/Brim.cpp
View File

@ -863,9 +863,6 @@ static ExPolygons outer_inner_brim_area(const Print& print,
brimToWrite.insert({ objectWithExtruder.first, {true,true} }); brimToWrite.insert({ objectWithExtruder.first, {true,true} });
ExPolygons objectIslands; ExPolygons objectIslands;
auto bedPoly = Model::getBedPolygon();
auto bedExPoly = diff_ex((offset(bedPoly, scale_(30.), jtRound, SCALED_RESOLUTION)), { bedPoly });
auto save_polygon_if_is_inner_island = [](const Polygons& holes_area, const Polygon& contour, int& hole_index) { auto save_polygon_if_is_inner_island = [](const Polygons& holes_area, const Polygon& contour, int& hole_index) {
for (size_t i = 0; i < holes_area.size(); i++) { for (size_t i = 0; i < holes_area.size(); i++) {
Polygons contour_polys; Polygons contour_polys;
@ -1050,18 +1047,39 @@ static ExPolygons outer_inner_brim_area(const Print& print,
} }
} }
} }
if (!bedExPoly.empty()){
no_brim_area.push_back(bedExPoly.front()); int extruder_nums = print.config().nozzle_diameter.values.size();
std::vector<Polygons> extruder_unprintable_area;
if (extruder_nums == 1)
extruder_unprintable_area.emplace_back(Polygons{Model::getBedPolygon()});
else {
extruder_unprintable_area = print.get_extruder_printable_polygons();
} }
no_brim_area = offset2_ex(no_brim_area, scaled_flow_width, -scaled_flow_width); // connect scattered small areas to prevent generating very small brims std::vector<int> filament_map = print.get_filament_maps();
for (const PrintObject* object : print.objects()) { for (const PrintObject* object : print.objects()) {
if (brimAreaMap.find(object->id()) != brimAreaMap.end()) ExPolygons extruder_no_brim_area = no_brim_area;
{ auto iter = std::find_if(objPrintVec.begin(), objPrintVec.end(), [object](const std::pair<ObjectID, unsigned int>& item) {
brimAreaMap[object->id()] = diff_ex(brimAreaMap[object->id()], no_brim_area); return item.first == object->id();
});
if (iter != objPrintVec.end()) {
int extruder_id = filament_map[iter->second - 1] - 1;
auto bedPoly = extruder_unprintable_area[extruder_id];
auto bedExPoly = diff_ex((offset(bedPoly, scale_(30.), jtRound, SCALED_RESOLUTION)), {bedPoly});
if (!bedExPoly.empty()) {
extruder_no_brim_area.push_back(bedExPoly.front());
}
extruder_no_brim_area = offset2_ex(extruder_no_brim_area, scaled_flow_width, -scaled_flow_width); // connect scattered small areas to prevent generating very small brims
}
if (brimAreaMap.find(object->id()) != brimAreaMap.end()) {
brimAreaMap[object->id()] = diff_ex(brimAreaMap[object->id()], extruder_no_brim_area);
} }
if (supportBrimAreaMap.find(object->id()) != supportBrimAreaMap.end()) if (supportBrimAreaMap.find(object->id()) != supportBrimAreaMap.end())
supportBrimAreaMap[object->id()] = diff_ex(supportBrimAreaMap[object->id()], no_brim_area); supportBrimAreaMap[object->id()] = diff_ex(supportBrimAreaMap[object->id()], extruder_no_brim_area);
} }
brim_area.clear(); brim_area.clear();

10
src/libslic3r/GCode.cpp
View File

@ -1344,15 +1344,7 @@ void GCode::do_export(Print* print, const char* path, GCodeProcessorResult* resu
// check gcode is valid in multi_extruder printabele area // check gcode is valid in multi_extruder printabele area
int extruder_size = m_print->config().nozzle_diameter.values.size(); int extruder_size = m_print->config().nozzle_diameter.values.size();
if (extruder_size > 1) { if (extruder_size > 1) {
std::vector<Vec2d> printable_area = m_print->get_printable_area(); std::vector<Polygons> extruder_unprintable_polys = m_print->get_extruder_unprintable_polygons();
Polygon printable_poly = Polygon::new_scale(printable_area);
std::vector<std::vector<Vec2d>> extruder_printable_areas = m_print->get_extruder_printable_area();
std::vector<Polygons> extruder_unprintable_polys;
for (const auto &e_printable_area : extruder_printable_areas) {
Polygons ploys = diff(printable_poly, Polygon::new_scale(e_printable_area));
extruder_unprintable_polys.emplace_back(ploys);
}
m_processor.check_multi_extruder_gcode_valid(extruder_unprintable_polys, m_print->get_extruder_printable_height(), m_print->get_filament_maps()); m_processor.check_multi_extruder_gcode_valid(extruder_unprintable_polys, m_print->get_extruder_printable_height(), m_print->get_filament_maps());
} }

36
src/libslic3r/Print.cpp
View File

@ -2411,21 +2411,35 @@ FilamentMapMode Print::get_filament_map_mode() const
return m_config.filament_map_mode; return m_config.filament_map_mode;
} }
std::vector<Vec2d> Print::get_printable_area() std::vector<double> Print::get_extruder_printable_height() const
{
return m_config.printable_area.values;
}
std::vector<std::vector<Vec2d>> Print::get_extruder_printable_area()
{
return m_config.extruder_printable_area.values;
}
std::vector<double> Print::get_extruder_printable_height()
{ {
return m_config.extruder_printable_height.values; return m_config.extruder_printable_height.values;
} }
std::vector<Polygons> Print::get_extruder_printable_polygons() const
{
std::vector<Polygons> extruder_printable_polys;
std::vector<std::vector<Vec2d>> extruder_printable_areas = m_config.extruder_printable_area.values;
for (const auto &e_printable_area : extruder_printable_areas) {
Polygons ploys = {Polygon::new_scale(e_printable_area)};
extruder_printable_polys.emplace_back(ploys);
}
return std::move(extruder_printable_polys);
}
std::vector<Polygons> Print::get_extruder_unprintable_polygons() const
{
std::vector<Vec2d> printable_area = m_config.printable_area.values;
Polygon printable_poly = Polygon::new_scale(printable_area);
std::vector<std::vector<Vec2d>> extruder_printable_areas = m_config.extruder_printable_area.values;
std::vector<Polygons> extruder_unprintable_polys;
for (const auto &e_printable_area : extruder_printable_areas) {
Polygons ploys = diff(printable_poly, Polygon::new_scale(e_printable_area));
extruder_unprintable_polys.emplace_back(ploys);
}
return std::move(extruder_unprintable_polys);
}
size_t Print::get_extruder_id(unsigned int filament_id) const size_t Print::get_extruder_id(unsigned int filament_id) const
{ {
std::vector<int> filament_map = get_filament_maps(); std::vector<int> filament_map = get_filament_maps();

6
src/libslic3r/Print.hpp
View File

@ -834,9 +834,9 @@ public:
// 1 based ids // 1 based ids
const std::vector<std::vector<int>> &get_unprintable_filament_ids() const; const std::vector<std::vector<int>> &get_unprintable_filament_ids() const;
std::vector<Vec2d> get_printable_area(); std::vector<double> get_extruder_printable_height() const;
std::vector<std::vector<Vec2d>> get_extruder_printable_area(); std::vector<Polygons> get_extruder_printable_polygons() const;
std::vector<double> get_extruder_printable_height(); std::vector<Polygons> get_extruder_unprintable_polygons() const;
bool enable_timelapse_print() const; bool enable_timelapse_print() const;