QIDITECH/QIDISlicer
1
0
Fork 0
mirror of https://github.com/QIDITECH/QIDISlicer.git synced 2026-01-30 23:48:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/QIDITECH/QIDISlicer

Browse Source
This commit is contained in:
QIDI TECH
2023-11-09 10:56:41 +08:00
parent edb08f521d 5d9f6cd345
commit 578400753e
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libslic3r/Fill/FillEnsuring.cpp
View File

@@ -292,9 +292,18 @@ ThickPolylines make_fill_polylines(
// svg.draw(to_lines(gaps_for_additional_filling), "green", scale_(0.2)); // svg.draw(to_lines(gaps_for_additional_filling), "green", scale_(0.2));
// svg.draw(vertical_lines, "black", scale_(0.1)); // svg.draw(vertical_lines, "black", scale_(0.1));
// svg.Close(); // svg.Close();
//w11
const coord_t threshold = scaled_spacing * 4.5;
for (ExPolygon &ex_poly : gaps_for_additional_filling) { for (ExPolygon &ex_poly : gaps_for_additional_filling) {
//w11
if (ex_poly.contour.length() < threshold) {
continue;
}
BoundingBox ex_bb = ex_poly.contour.bounding_box(); BoundingBox ex_bb = ex_poly.contour.bounding_box();
//w11
if (ex_bb.size().x() < threshold || ex_bb.size().y() < threshold) {
continue;
}
coord_t loops_count = (std::max(ex_bb.size().x(), ex_bb.size().y()) + scaled_spacing - 1) / scaled_spacing; coord_t loops_count = (std::max(ex_bb.size().x(), ex_bb.size().y()) + scaled_spacing - 1) / scaled_spacing;
Polygons polygons = to_polygons(ex_poly); Polygons polygons = to_polygons(ex_poly);
Arachne::WallToolPaths wall_tool_paths(polygons, scaled_spacing, scaled_spacing, loops_count, 0, params.layer_height, Arachne::WallToolPaths wall_tool_paths(polygons, scaled_spacing, scaled_spacing, loops_count, 0, params.layer_height,

5
src/libslic3r/GCode.cpp
View File

@@ -3501,7 +3501,7 @@ std::string GCode::set_extruder(unsigned int extruder_id, double print_z)
return gcode; return gcode;
} }
//B41
std::string GCode::set_object_range(Print &print) std::string GCode::set_object_range(Print &print)
{ {
std::string gcode; std::string gcode;
@@ -3558,6 +3558,9 @@ std::string GCode::set_object_range(Print &print)
Point center = contour.centroid(); Point center = contour.centroid();
char buffer[64]; char buffer[64];
std::replace(name.begin(), name.end(), ' ', '_'); std::replace(name.begin(), name.end(), ' ', '_');
std::replace(name.begin(), name.end(), '#', '_');
std::replace(name.begin(), name.end(), '*', '_');
std::replace(name.begin(), name.end(), ':', '_');
gcode += (std::string("EXCLUDE_OBJECT_DEFINE NAME=") + name); gcode += (std::string("EXCLUDE_OBJECT_DEFINE NAME=") + name);
std::snprintf(buffer, sizeof(buffer) - 1, " CENTER=%.3f,%.3f", unscale<float>(center[0]), unscale<float>(center[1])); std::snprintf(buffer, sizeof(buffer) - 1, " CENTER=%.3f,%.3f", unscale<float>(center[0]), unscale<float>(center[1]));
gcode += buffer + std::string(" POLYGON=["); gcode += buffer + std::string(" POLYGON=[");

4
src/slic3r/GUI/Plater.cpp
View File

@@ -5521,7 +5521,7 @@ void Plater::calib_pa_line(const double StartPA, double EndPA, double PAStep)
add_num_text(num_str, Vec2d(plate_center.x() - 50, plate_center.y() - step_spacing / 2)); add_num_text(num_str, Vec2d(plate_center.x() - 50, plate_center.y() - step_spacing / 2));
std::stringstream gcode; std::stringstream gcode;
gcode << "\n;WIDTH:" << pa_line_width; // gcode << "\n;WIDTH:" << pa_line_width;
gcode << set_pa_acceleration(external_perimeter_acceleration); gcode << set_pa_acceleration(external_perimeter_acceleration);
gcode << move_to(Vec2d(start_x + 80, start_y), pa_travel_speed, retract_length, retract_speed); gcode << move_to(Vec2d(start_x + 80, start_y), pa_travel_speed, retract_length, retract_speed);
gcode << move_to(pa_layer_height); gcode << move_to(pa_layer_height);
@@ -5637,7 +5637,7 @@ void Plater::calib_pa_pattern(const double StartPA, double EndPA, double PAStep)
//B34 Generate Gcode //B34 Generate Gcode
std::stringstream gcode; std::stringstream gcode;
gcode << "\n;WIDTH:" << pa_line_width; // gcode << "\n;WIDTH:" << pa_line_width;
gcode << set_pa_acceleration(external_perimeter_acceleration); gcode << set_pa_acceleration(external_perimeter_acceleration);
gcode << move_to(Vec2d(start_x + 2 * line_spacing, start_y - 2 * line_spacing), pa_travel_speed, retract_length, retract_speed); gcode << move_to(Vec2d(start_x + 2 * line_spacing, start_y - 2 * line_spacing), pa_travel_speed, retract_length, retract_speed);