juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-16 18:12:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: apply unprintable filament type to limit filament map

Browse Source 
jira: none
Change-Id: I81e22dc28bc416a1b26c242fab4e054f597b064e
(cherry picked from commit 9b81b9e2d4c6b39329e94efe3e433564c66f6ffe)
This commit is contained in:
zhimin.zeng
2025-03-18 21:50:18 +08:00
committed by Noisyfox
parent 453d1e806d
commit bf0f98b0eb
3 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libslic3r/GCode.cpp
View File

@@ -1845,7 +1845,10 @@ void GCode::do_export(Print* print, const char* path, GCodeProcessorResult* resu
int extruder_size = m_print->config().nozzle_diameter.values.size();
if (extruder_size > 1) {
std::vector<Polygons> extruder_unprintable_polys = m_print->get_extruder_unprintable_polygons();
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(),
m_print->get_physical_unprintable_filaments(m_print->get_slice_used_filaments(false)));
}
m_processor.finalize(true);

13
src/libslic3r/GCode/GCodeProcessor.cpp
View File

@@ -1664,7 +1664,10 @@ void GCodeProcessor::register_commands()
}
}
bool GCodeProcessor::check_multi_extruder_gcode_valid(const std::vector<Polygons> &unprintable_areas, const std::vector<double>& printable_heights, const std::vector<int> &filament_map)
bool GCodeProcessor::check_multi_extruder_gcode_valid(const std::vector<Polygons> &unprintable_areas,
const std::vector<double> &printable_heights,
const std::vector<int> &filament_map,
const std::vector<std::set<int>> &unprintable_filament_types)
{
m_result.limit_filament_maps.clear();
m_result.gcode_check_result.reset();
@@ -1743,6 +1746,14 @@ bool GCodeProcessor::check_multi_extruder_gcode_valid(const std::vector<Polygons
}
}
// apply unprintable filament type result
for (int extruder_id = 0; extruder_id < unprintable_filament_types.size(); ++extruder_id) {
const std::set<int> &filament_ids = unprintable_filament_types[extruder_id];
for (int filament_id : filament_ids) {
m_result.limit_filament_maps[filament_id] |= (1 << extruder_id);
}
};
return valid;
}

5
src/libslic3r/GCode/GCodeProcessor.hpp
View File

@@ -840,7 +840,10 @@ class Print;
GCodeProcessor();
// check whether the gcode path meets the filament_map grouping requirements
bool check_multi_extruder_gcode_valid(const std::vector<Polygons> &unprintable_areas, const std::vector<double>& printable_heights, const std::vector<int>& filament_map);
bool check_multi_extruder_gcode_valid(const std::vector<Polygons> &unprintable_areas,
const std::vector<double> &printable_heights,
const std::vector<int> &filament_map,
const std::vector<std::set<int>>& unprintable_filament_types );
void apply_config(const PrintConfig& config);
void set_print(Print* print) { m_print = print; }
void enable_stealth_time_estimator(bool enabled);