viewit/OrcaSlicer-KX
5
3
Fork 1
Code Issues 1 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

ENH: Add extruder_printable_height

Browse Source 
to support different printable height of multi_extruder
jira:none

Change-Id: I265c65e15fc8f598c3456556557bb6977b5de820
(cherry picked from commit 933adbaaf0eaf361e39f131dd5536dca91214d43)
This commit is contained in:
zhimin.zeng
2024-11-16 19:48:31 +08:00
committed by Noisyfox
parent 55d8d77430
commit 5935b75fe5
13 changed files with 163 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -168,6 +168,18 @@ static int get_object_label_id(const std::string_view comment_1)
return id;
}
static float get_z_height(const std::string_view comment_1)
{
std::string comment(comment_1);
auto pos = comment.find(":");
std::string num_str = comment.substr(pos + 1);
float print_z = 0.0f;
try {
print_z = stof(num_str);
} catch (const std::exception &) {}
return print_z;
}
void GCodeProcessor::CachedPosition::reset()
{
std::fill(position.begin(), position.end(), FLT_MAX);
@@ -1517,7 +1529,7 @@ GCodeProcessor::GCodeProcessor()
m_time_processor.machines[static_cast<size_t>(PrintEstimatedStatistics::ETimeMode::Stealth)].line_m73_stop_mask = "M73 D%s\n";
}
bool GCodeProcessor::check_multi_extruder_gcode_valid(const std::vector<Polygons> &unprintable_areas, 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)
{
m_result.limit_filament_maps.clear();
m_result.gcode_check_result.reset();
@@ -1529,18 +1541,23 @@ bool GCodeProcessor::check_multi_extruder_gcode_valid(const std::vector<Polygons
return ps;
};
std::map<int, std::map<int, Points>> gcode_path_pos; // object_id, filament_id, pos
struct GCodePosInfo
{
Points pos;
float max_print_z;
};
std::map<int, std::map<int, GCodePosInfo>> gcode_path_pos; // object_id, filament_id, pos
for (const GCodeProcessorResult::MoveVertex &move : m_result.moves) {
if (move.type == EMoveType::Extrude/* || move.type == EMoveType::Travel*/) {
if (move.is_arc_move_with_interpolation_points()) {
for (int i = 0; i < move.interpolation_points.size(); i++) {
gcode_path_pos[move.object_label_id][int(move.extruder_id)].emplace_back(to_2d(move.interpolation_points[i].cast<double>()));
gcode_path_pos[move.object_label_id][int(move.extruder_id)].pos.emplace_back(to_2d(move.interpolation_points[i].cast<double>()));
}
}
else {
gcode_path_pos[move.object_label_id][int(move.extruder_id)].emplace_back(to_2d(move.position.cast<double>()));
gcode_path_pos[move.object_label_id][int(move.extruder_id)].pos.emplace_back(to_2d(move.position.cast<double>()));
}
gcode_path_pos[move.object_label_id][int(move.extruder_id)].max_print_z = std::max(gcode_path_pos[move.object_label_id][int(move.extruder_id)].max_print_z, move.print_z);
}
}
@@ -1548,12 +1565,13 @@ bool GCodeProcessor::check_multi_extruder_gcode_valid(const std::vector<Polygons
Point plate_offset = Point(scale_(m_x_offset), scale_(m_y_offset));
for (auto obj_iter = gcode_path_pos.begin(); obj_iter != gcode_path_pos.end(); ++obj_iter) {
int object_label_id = obj_iter->first;
const std::map<int, Points>& path_pos = obj_iter->second;
const std::map<int, GCodePosInfo> &path_pos = obj_iter->second;
for (auto iter = path_pos.begin(); iter != path_pos.end(); ++iter) {
int extruder_id = filament_map[iter->first] - 1;
Polygon path_poly(iter->second);
int extruder_id = filament_map[iter->first] - 1;
Polygon path_poly(iter->second.pos);
BoundingBox bbox = path_poly.bounding_box();
// check printable area
// Simplified use bounding_box, Accurate calculation is not efficient
for (Polygon poly : unprintable_areas[extruder_id]) {
poly.translate(plate_offset);
@@ -1562,11 +1580,22 @@ bool GCodeProcessor::check_multi_extruder_gcode_valid(const std::vector<Polygons
std::pair<int, int> filament_to_object_id;
filament_to_object_id.first = iter->first;
filament_to_object_id.second = object_label_id;
m_result.gcode_check_result.error_infos[extruder_id].push_back(filament_to_object_id);
m_result.gcode_check_result.print_area_error_infos[extruder_id].push_back(filament_to_object_id);
valid = false;
}
}
// check printable height
if (iter->second.max_print_z > printable_heights[extruder_id]) {
m_result.gcode_check_result.error_code |= (1 << 1);
std::pair<int, int> filament_to_object_id;
filament_to_object_id.first = iter->first;
filament_to_object_id.second = object_label_id;
m_result.gcode_check_result.print_height_error_infos[extruder_id].push_back(filament_to_object_id);
m_result.limit_filament_maps[iter->first] |= (1 << extruder_id);
valid = false;
}
for (int i = 0; i < unprintable_areas.size(); ++i) {
for (Polygon poly : unprintable_areas[i]) {
poly.translate(plate_offset);
@@ -2836,6 +2865,12 @@ void GCodeProcessor::process_tags(const std::string_view comment, bool producers
return;
}
// ; Z_HEIGHT:
if (boost::starts_with(comment, " Z_HEIGHT:")) {
m_print_z = get_z_height(comment);
return;
}
// wipe start tag
if (boost::starts_with(comment, reserved_tag(ETags::Wipe_Start))) {
m_wiping = true;
@@ -5386,7 +5421,8 @@ void GCodeProcessor::store_move_vertex(EMoveType type, EMovePathType path_type)
path_type,
Vec3f(m_arc_center(0, 0) + m_x_offset, m_arc_center(1, 0) + m_y_offset, m_arc_center(2, 0)) + m_extruder_offsets[filament_id],
m_interpolation_points,
m_object_label_id
m_object_label_id,
m_print_z
});
if (type == EMoveType::Seam) {

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

@@ -122,6 +122,18 @@ class Print;
using ConflictResultOpt = std::optional<ConflictResult>;
struct GCodeCheckResult
{
int error_code = 0; // 0 means succeed, 0001 printable area error, 0010 printable height error
std::map<int, std::vector<std::pair<int, int>>> print_area_error_infos; // printable_area extruder_id to <filament_id - object_label_id> which cannot printed in this extruder
std::map<int, std::vector<std::pair<int, int>>> print_height_error_infos; // printable_height extruder_id to <filament_id - object_label_id> which cannot printed in this extruder
void reset() {
error_code = 0;
print_area_error_infos.clear();
print_height_error_infos.clear();
}
};
struct FilamentPrintableResult
{
std::vector<int> conflict_filament;
@@ -133,16 +145,6 @@ class Print;
};
};
struct GCodeCheckResult
{
int error_code = 0; // 0 means succeed
std::map<int, std::vector<std::pair<int, int>>> error_infos; // extruder_id to <filament_id - object_label_id> which cannot printed in this extruder
void reset() {
error_code = 0;
error_infos.clear();
}
};
struct GCodeProcessorResult
{
struct FilamentSequenceHash
@@ -196,6 +198,7 @@ class Print;
Vec3f arc_center_position{ Vec3f::Zero() }; // mm
std::vector<Vec3f> interpolation_points; // interpolation points of arc for drawing
int object_label_id{-1};
float print_z{0.0f};
float volumetric_rate() const { return feedrate * mm3_per_mm; }
//BBS: new function to support arc move
@@ -720,6 +723,7 @@ class Print;
bool m_virtual_flushing; // mark a section with virtual flush, only for statistics
bool m_wipe_tower;
int m_object_label_id{-1};
float m_print_z{0.0f};
std::vector<float> m_remaining_volume;
ExtruderTemps m_filament_nozzle_temp;
ExtruderTemps m_filament_nozzle_temp_first_layer;
@@ -809,7 +813,7 @@ 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<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);
void apply_config(const PrintConfig& config);
void set_print(Print* print) { m_print = print; }
void enable_stealth_time_estimator(bool enabled);