juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-06-14 07:52:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rearrange and clean up

Browse Source
This commit is contained in:
thewildmage
2023-05-30 21:49:33 -06:00
parent 326e771c63
commit 35da0b67c7
2 changed files with 498 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

729
src/libslic3r/calib.cpp
View File

@@ -6,374 +6,436 @@
#include <map>
namespace Slic3r {
std::string calib_pressure_advance::move_to(Vec2d pt, std::string comment = std::string()) {
std::stringstream gcode;
Calib_Params::Calib_Params() : mode(CalibMode::Calib_None) { }
gcode << mp_gcodegen->retract();
if (comment.empty()) {
gcode << mp_gcodegen->writer().travel_to_xy(pt);
} else {
gcode << mp_gcodegen->writer().travel_to_xy(pt, comment);
}
gcode << mp_gcodegen->unretract();
std::string CalibPressureAdvance::move_to(Vec2d pt, std::string comment = std::string())
{
std::stringstream gcode;
return gcode.str();
gcode << mp_gcodegen->retract();
if (comment.empty()) {
gcode << mp_gcodegen->writer().travel_to_xy(pt);
} else {
gcode << mp_gcodegen->writer().travel_to_xy(pt, comment);
}
gcode << mp_gcodegen->unretract();
return gcode.str();
}
std::string CalibPressureAdvance::convert_number_to_string(double num)
{
auto sNumber = std::to_string(num);
sNumber.erase(sNumber.find_last_not_of('0') + 1, std::string::npos);
sNumber.erase(sNumber.find_last_not_of('.') + 1, std::string::npos);
return sNumber;
}
std::string CalibPressureAdvance::draw_digit(double startx, double starty, char c, CalibPressureAdvance::DrawDigitMode mode)
{
auto& writer = mp_gcodegen->writer();
std::stringstream gcode;
const double lw = 0.48;
Flow line_flow = Flow(lw, 0.2, m_nozzle_diameter);
const double len = m_digit_segment_len;
const double gap = lw / 2.0;
/*
filament diameter = 1.75
area of a circle = PI * radius^2
(1.75 / 2)^2 * PI = 2.40528
*/
const double e = line_flow.mm3_per_mm() / 2.40528; // filament_mm/extrusion_mm
const auto dE = e * len;
const auto two_dE = dE * 2;
Vec2d p0, p1, p2, p3, p4, p5;
Vec2d p0_5, p4_5;
Vec2d gap_p0_toward_p3, gap_p2_toward_p3;
Vec2d dot_direction;
if (mode == CalibPressureAdvance::DrawDigitMode::Vertical) {
// 1-------2-------5
// | | |
// | | |
// 0-------3-------4
p0 = Vec2d(startx, starty);
p0_5 = Vec2d(startx, starty - len / 2);
p1 = Vec2d(startx, starty - len);
p2 = Vec2d(startx + len, starty - len);
p3 = Vec2d(startx + len, starty);
p4 = Vec2d(startx + len * 2, starty);
p4_5 = Vec2d(startx + len * 2, starty - len / 2);
p5 = Vec2d(startx + len * 2, starty - len);
gap_p0_toward_p3 = p0 + Vec2d(gap, 0);
gap_p2_toward_p3 = p2 + Vec2d(0, gap);
dot_direction = Vec2d(-len / 2, 0);
} else {
// 0-------1
// | |
// 3-------2
// | |
// 4-------5
p0 = Vec2d(startx, starty);
p0_5 = Vec2d(startx + len / 2, starty);
p1 = Vec2d(startx + len, starty);
p2 = Vec2d(startx + len, starty - len);
p3 = Vec2d(startx, starty - len);
p4 = Vec2d(startx, starty - len * 2);
p4_5 = Vec2d(startx + len / 2, starty - len * 2);
p5 = Vec2d(startx + len, starty - len * 2);
gap_p0_toward_p3 = p0 - Vec2d(0, gap);
gap_p2_toward_p3 = p2 - Vec2d(gap, 0);
dot_direction = Vec2d(0, -len / 2);
}
std::string convert_number_to_string(double num) {
auto sNumber = std::to_string(num);
sNumber.erase(sNumber.find_last_not_of('0') + 1, std::string::npos);
sNumber.erase(sNumber.find_last_not_of('.') + 1, std::string::npos);
return sNumber;
switch (c) {
case '0':
gcode << move_to(p0);
gcode << writer.extrude_to_xy(p1, dE);
gcode << writer.extrude_to_xy(p5, two_dE);
gcode << writer.extrude_to_xy(p4, dE);
gcode << writer.extrude_to_xy(gap_p0_toward_p3, two_dE);
break;
case '1':
gcode << move_to(p0_5);
gcode << writer.extrude_to_xy(p4_5, two_dE);
break;
case '2':
gcode << move_to(p0);
gcode << writer.extrude_to_xy(p1, dE);
gcode << writer.extrude_to_xy(p2, dE);
gcode << writer.extrude_to_xy(p3, dE);
gcode << writer.extrude_to_xy(p4, dE);
gcode << writer.extrude_to_xy(p5, dE);
break;
case '3':
gcode << move_to(p0);
gcode << writer.extrude_to_xy(p1, dE);
gcode << writer.extrude_to_xy(p5, two_dE);
gcode << writer.extrude_to_xy(p4, dE);
gcode << move_to(gap_p2_toward_p3);
gcode << writer.extrude_to_xy(p3, dE);
break;
case '4':
gcode << move_to(p0);
gcode << writer.extrude_to_xy(p3, dE);
gcode << writer.extrude_to_xy(p2, dE);
gcode << move_to(p1);
gcode << writer.extrude_to_xy(p5, two_dE);
break;
case '5':
gcode << move_to(p1);
gcode << writer.extrude_to_xy(p0, dE);
gcode << writer.extrude_to_xy(p3, dE);
gcode << writer.extrude_to_xy(p2, dE);
gcode << writer.extrude_to_xy(p5, dE);
gcode << writer.extrude_to_xy(p4, dE);
break;
case '6':
gcode << move_to(p1);
gcode << writer.extrude_to_xy(p0, dE);
gcode << writer.extrude_to_xy(p4, two_dE);
gcode << writer.extrude_to_xy(p5, dE);
gcode << writer.extrude_to_xy(p2, dE);
gcode << writer.extrude_to_xy(p3, dE);
break;
case '7':
gcode << move_to(p0);
gcode << writer.extrude_to_xy(p1, dE);
gcode << writer.extrude_to_xy(p5, two_dE);
break;
case '8':
gcode << move_to(p2);
gcode << writer.extrude_to_xy(p3, dE);
gcode << writer.extrude_to_xy(p4, dE);
gcode << writer.extrude_to_xy(p5, dE);
gcode << writer.extrude_to_xy(p1, two_dE);
gcode << writer.extrude_to_xy(p0, dE);
gcode << writer.extrude_to_xy(p3, dE);
break;
case '9':
gcode << move_to(p5);
gcode << writer.extrude_to_xy(p1, two_dE);
gcode << writer.extrude_to_xy(p0, dE);
gcode << writer.extrude_to_xy(p3, dE);
gcode << writer.extrude_to_xy(p2, dE);
break;
case '.':
gcode << move_to(p4_5);
gcode << writer.extrude_to_xy(p4_5 + dot_direction, dE);
break;
default:
break;
}
std::string calib_pressure_advance::draw_digit(double startx, double starty, char c, calib_pressure_advance::DrawDigitMode mode) {
auto& writer = mp_gcodegen->writer();
std::stringstream gcode;
const double lw = 0.48;
Flow line_flow = Flow(lw, 0.2, m_nozzle_diameter);
const double len = m_digit_segment_len;
const double gap = lw / 2.0;
return gcode.str();
}
/*
filament diameter = 1.75
area of a circle = PI * radius^2
(1.75 / 2)^2 * PI = 2.40528
*/
const double e = line_flow.mm3_per_mm() / 2.40528; // filament_mm/extrusion_mm
const auto dE = e * len;
const auto two_dE = dE * 2;
std::string CalibPressureAdvance::draw_number(double startx, double starty, double value, calib_pressure_advance::DrawDigitMode mode)
{
auto sNumber = convert_number_to_string(value);
std::stringstream gcode;
gcode << mp_gcodegen->writer().set_speed(3600);
Vec2d p0, p1, p2, p3, p4, p5;
Vec2d p0_5, p4_5;
Vec2d gap_p0_toward_p3, gap_p2_toward_p3;
Vec2d dot_direction;
if (mode == calib_pressure_advance::DrawDigitMode::Vertical) {
// 1-------2-------5
// | | |
// | | |
// 0-------3-------4
p0 = Vec2d(startx, starty);
p0_5 = Vec2d(startx, starty - len / 2);
p1 = Vec2d(startx, starty - len);
p2 = Vec2d(startx + len, starty - len);
p3 = Vec2d(startx + len, starty);
p4 = Vec2d(startx + len * 2, starty);
p4_5 = Vec2d(startx + len * 2, starty - len / 2);
p5 = Vec2d(startx + len * 2, starty - len);
gap_p0_toward_p3 = p0 + Vec2d(gap, 0);
gap_p2_toward_p3 = p2 + Vec2d(0, gap);
dot_direction = Vec2d(-len / 2, 0);
} else {
// 0-------1
// | |
// 3-------2
// | |
// 4-------5
p0 = Vec2d(startx, starty);
p0_5 = Vec2d(startx + len / 2, starty);
p1 = Vec2d(startx + len, starty);
p2 = Vec2d(startx + len, starty - len);
p3 = Vec2d(startx, starty - len);
p4 = Vec2d(startx, starty - len * 2);
p4_5 = Vec2d(startx + len / 2, starty - len * 2);
p5 = Vec2d(startx + len, starty - len * 2);
gap_p0_toward_p3 = p0 - Vec2d(0, gap);
gap_p2_toward_p3 = p2 - Vec2d(gap, 0);
dot_direction = Vec2d(0, -len / 2);
}
switch (c) {
case '0':
gcode << move_to(p0);
gcode << writer.extrude_to_xy(p1, dE);
gcode << writer.extrude_to_xy(p5, two_dE);
gcode << writer.extrude_to_xy(p4, dE);
gcode << writer.extrude_to_xy(gap_p0_toward_p3, two_dE);
break;
case '1':
gcode << move_to(p0_5);
gcode << writer.extrude_to_xy(p4_5, two_dE);
break;
case '2':
gcode << move_to(p0);
gcode << writer.extrude_to_xy(p1, dE);
gcode << writer.extrude_to_xy(p2, dE);
gcode << writer.extrude_to_xy(p3, dE);
gcode << writer.extrude_to_xy(p4, dE);
gcode << writer.extrude_to_xy(p5, dE);
break;
case '3':
gcode << move_to(p0);
gcode << writer.extrude_to_xy(p1, dE);
gcode << writer.extrude_to_xy(p5, two_dE);
gcode << writer.extrude_to_xy(p4, dE);
gcode << move_to(gap_p2_toward_p3);
gcode << writer.extrude_to_xy(p3, dE);
break;
case '4':
gcode << move_to(p0);
gcode << writer.extrude_to_xy(p3, dE);
gcode << writer.extrude_to_xy(p2, dE);
gcode << move_to(p1);
gcode << writer.extrude_to_xy(p5, two_dE);
break;
case '5':
gcode << move_to(p1);
gcode << writer.extrude_to_xy(p0, dE);
gcode << writer.extrude_to_xy(p3, dE);
gcode << writer.extrude_to_xy(p2, dE);
gcode << writer.extrude_to_xy(p5, dE);
gcode << writer.extrude_to_xy(p4, dE);
break;
case '6':
gcode << move_to(p1);
gcode << writer.extrude_to_xy(p0, dE);
gcode << writer.extrude_to_xy(p4, two_dE);
gcode << writer.extrude_to_xy(p5, dE);
gcode << writer.extrude_to_xy(p2, dE);
gcode << writer.extrude_to_xy(p3, dE);
break;
case '7':
gcode << move_to(p0);
gcode << writer.extrude_to_xy(p1, dE);
gcode << writer.extrude_to_xy(p5, two_dE);
break;
case '8':
gcode << move_to(p2);
gcode << writer.extrude_to_xy(p3, dE);
gcode << writer.extrude_to_xy(p4, dE);
gcode << writer.extrude_to_xy(p5, dE);
gcode << writer.extrude_to_xy(p1, two_dE);
gcode << writer.extrude_to_xy(p0, dE);
gcode << writer.extrude_to_xy(p3, dE);
break;
case '9':
gcode << move_to(p5);
gcode << writer.extrude_to_xy(p1, two_dE);
gcode << writer.extrude_to_xy(p0, dE);
gcode << writer.extrude_to_xy(p3, dE);
gcode << writer.extrude_to_xy(p2, dE);
break;
case '.':
gcode << move_to(p4_5);
gcode << writer.extrude_to_xy(p4_5 + dot_direction, dE);
break;
default:
for (int i = 0; i < sNumber.length(); ++i) {
if (i > m_max_number_length)
break;
gcode << draw_digit(startx + i * m_number_spacing, starty, sNumber[i], mode);
}
return gcode.str();
}
return gcode.str();
}
std::string calib_pressure_advance::draw_number(double startx, double starty, double value, calib_pressure_advance::DrawDigitMode mode) {
auto sNumber = convert_number_to_string(value);
std::stringstream gcode;
gcode << mp_gcodegen->writer().set_speed(3600);
bool CalibPressureAdvance::is_delta()
{
return mp_gcodegen->config().printable_area.values.size() > 4;
}
for (int i = 0; i < sNumber.length(); ++i) {
if (i > m_max_number_length)
break;
gcode << draw_digit(startx + i * m_number_spacing, starty, sNumber[i], mode);
}
void CalibPressureAdvance::delta_scale_bed_ext(BoundingBoxf& bed_ext)
{
bed_ext.scale(1.0f / 1.41421f);
}
return gcode.str();
}
void CalibPressureAdvance::delta_modify_start(double& start_x, double& start_y, int count)
{
startx = -startx;
starty = -(count * m_space_y) / 2;
}
bool calib_pressure_advance::is_delta() {
return mp_gcodegen->config().printable_area.values.size() > 4;
}
void calib_pressure_advance::delta_scale_bed_ext(BoundingBoxf& bed_ext) {
bed_ext.scale(1.0f / 1.41421f);
}
void calib_pressure_advance::delta_modify_start(double& start_x, double& start_y, int count) {
startx = -startx;
starty = -(count * m_space_y) / 2;
}
calib_pressure_advance_line::calib_pressure_advance_line(GCode* gcodegen) :mp_gcodegen(gcodegen), m_length_short(20.0), m_length_long(40.0), m_space_y(3.5), m_line_width(0.6), m_draw_numbers(true) {}
std::string calib_pressure_advance_line::generate_test(double start_pa /*= 0*/, double step_pa /*= 0.002*/,
int count /*= 10*/) {
BoundingBoxf bed_ext = get_extents(mp_gcodegen->config().printable_area.values);
const bool is_delta = is_delta();
if (is_delta) {
std::string CalibPressureAdvanceLine::generate_test(double start_pa /*= 0*/, double step_pa /*= 0.002*/, int count /*= 10*/)
{
BoundingBoxf bed_ext = get_extents(mp_gcodegen->config().printable_area.values);
const bool is_delta = is_delta();
if (is_delta) {
delta_scale_bed_ext(bed_ext);
}
}
auto bed_sizes = mp_gcodegen->config().printable_area.values;
const auto &w = bed_ext.size().x();
const auto &h = bed_ext.size().y();
count = std::min(count, int((h - 10) / m_space_y));
auto bed_sizes = mp_gcodegen->config().printable_area.values;
const auto &w = bed_ext.size().x();
const auto &h = bed_ext.size().y();
count = std::min(count, int((h - 10) / m_space_y));
m_length_long = 40 + std::min(w - 120.0, 0.0);
m_length_long = 40 + std::min(w - 120.0, 0.0);
auto startx = (w - m_length_short * 2 - m_length_long - 20) / 2;
auto starty = (h - count * m_space_y) / 2;
if (is_delta) {
auto startx = (w - m_length_short * 2 - m_length_long - 20) / 2;
auto starty = (h - count * m_space_y) / 2;
if (is_delta) {
delta_modify_start(startx, starty, count);
}
return print_pa_lines(startx, starty, start_pa, step_pa, count);
}
std::string calib_pressure_advance_line::print_pa_lines(double start_x, double start_y, double start_pa, double step_pa, int num) {
auto& writer = mp_gcodegen->writer();
Flow line_flow = Flow(m_line_width, 0.2, m_nozzle_diameter);
Flow thin_line_flow = Flow(0.44, 0.2, m_nozzle_diameter);
const double e_calib = line_flow.mm3_per_mm() / 2.40528; // filament_mm/extrusion_mm
const double e = thin_line_flow.mm3_per_mm() / 2.40528; // filament_mm/extrusion_mm
return print_pa_lines(startx, starty, start_pa, step_pa, count);
}
std::string CalibPressureAdvanceLine::print_pa_lines(double start_x, double start_y, double start_pa, double step_pa, int num)
{
auto& writer = mp_gcodegen->writer();
Flow line_flow = Flow(m_line_width, 0.2, m_nozzle_diameter);
Flow thin_line_flow = Flow(0.44, 0.2, m_nozzle_diameter);
const double e_calib = line_flow.mm3_per_mm() / 2.40528; // filament_mm/extrusion_mm
const double e = thin_line_flow.mm3_per_mm() / 2.40528; // filament_mm/extrusion_mm
const double fast = m_fast_speed * 60.0;
const double slow = m_slow_speed * 60.0;
std::stringstream gcode;
gcode << mp_gcodegen->writer().travel_to_z(0.2);
double y_pos = start_y;
const double fast = m_fast_speed * 60.0;
const double slow = m_slow_speed * 60.0;
std::stringstream gcode;
gcode << mp_gcodegen->writer().travel_to_z(0.2);
double y_pos = start_y;
// prime line
auto prime_x = start_x - 2;
gcode << move_to(Vec2d(prime_x, y_pos + (num - 4) * m_space_y));
// prime line
auto prime_x = start_x - 2;
gcode << move_to(Vec2d(prime_x, y_pos + (num - 4) * m_space_y));
gcode << writer.set_speed(slow);
gcode << writer.extrude_to_xy(Vec2d(prime_x, y_pos + 3 * m_space_y), e_calib * m_space_y * num * 1.1);
for (int i = 0; i < num; ++i) {
gcode << writer.set_pressure_advance(start_pa + i * step_pa);
gcode << move_to(Vec2d(start_x, y_pos + i * m_space_y));
gcode << writer.set_speed(slow);
gcode << writer.extrude_to_xy(Vec2d(prime_x, y_pos + 3 * m_space_y), e_calib * m_space_y * num * 1.1);
gcode << writer.extrude_to_xy(Vec2d(start_x + m_length_short, y_pos + i * m_space_y), e_calib * m_length_short);
gcode << writer.set_speed(fast);
gcode << writer.extrude_to_xy(Vec2d(start_x + m_length_short + m_length_long, y_pos + i * m_space_y), e_calib * m_length_long);
gcode << writer.set_speed(slow);
gcode << writer.extrude_to_xy(Vec2d(start_x + m_length_short + m_length_long + m_length_short, y_pos + i * m_space_y), e_calib * m_length_short);
}
gcode << writer.set_pressure_advance(0.0);
for (int i = 0; i < num; ++i) {
gcode << writer.set_pressure_advance(start_pa + i * step_pa);
gcode << move_to(Vec2d(start_x, y_pos + i * m_space_y));
gcode << writer.set_speed(slow);
gcode << writer.extrude_to_xy(Vec2d(start_x + m_length_short, y_pos + i * m_space_y), e_calib * m_length_short);
gcode << writer.set_speed(fast);
gcode << writer.extrude_to_xy(Vec2d(start_x + m_length_short + m_length_long, y_pos + i * m_space_y), e_calib * m_length_long);
gcode << writer.set_speed(slow);
gcode << writer.extrude_to_xy(Vec2d(start_x + m_length_short + m_length_long + m_length_short, y_pos + i * m_space_y), e_calib * m_length_short);
if (m_draw_numbers) {
// draw indicator lines
gcode << writer.set_speed(fast);
gcode << move_to(Vec2d(start_x + m_length_short, y_pos + (num - 1) * m_space_y + 2));
gcode << writer.extrude_to_xy(Vec2d(start_x + m_length_short, y_pos + (num - 1) * m_space_y + 7), e * 7);
gcode << move_to(Vec2d(start_x + m_length_short + m_length_long, y_pos + (num - 1) * m_space_y + 7));
gcode << writer.extrude_to_xy(Vec2d(start_x + m_length_short + m_length_long, y_pos + (num - 1) * m_space_y + 2), e * 7);
for (int i = 0; i < num; i += 2) {
gcode << draw_number(start_x + m_length_short + m_length_long + m_length_short + 3, y_pos + i * m_space_y + m_space_y / 2, start_pa + i * step_pa);
}
gcode << writer.set_pressure_advance(0.0);
}
return gcode.str();
}
if (m_draw_numbers) {
// draw indicator lines
gcode << writer.set_speed(fast);
gcode << move_to(Vec2d(start_x + m_length_short, y_pos + (num - 1) * m_space_y + 2));
gcode << writer.extrude_to_xy(Vec2d(start_x + m_length_short, y_pos + (num - 1) * m_space_y + 7), e * 7);
gcode << move_to(Vec2d(start_x + m_length_short + m_length_long, y_pos + (num - 1) * m_space_y + 7));
gcode << writer.extrude_to_xy(Vec2d(start_x + m_length_short + m_length_long, y_pos + (num - 1) * m_space_y + 2), e * 7);
std::string CalibPressureAdvancePattern::generate_test(double start_pa, double end_pa, double step_pa)
{
BoundingBoxf bed_ext = get_extents(mp_gcodegen->config().printable_area.values);
if (is_delta()) {
delta_scale_bed_ext(bed_ext);
}
for (int i = 0; i < num; i += 2) {
gcode << draw_number(start_x + m_length_short + m_length_long + m_length_short + 3, y_pos + i * m_space_y + m_space_y / 2, start_pa + i * step_pa);
}
const auto &w = bed_ext.size().x();
const auto &h = bed_ext.size().y();
const auto center_x = w / 2;
const auto center_y = h / 2;
int num_patterns = std::ceil((end_pa - start_pa) / step_pa + 1);
num_patterns = std::min(num_patterns, int((h - 10) / m_space_y));
// TODO: fix m_space_y above
auto object_size_x = object_size_x(num_patterns);
auto object_size_y = object_size_y(start_pa, step_pa, num_patterns);
auto glyph_start_x =
center_x -
object_size_x / 2 +
(((m_wall_count - 1) / 2) * line_spacing_angle() - 2)
;
auto pattern_shift =
center_x -
object_size_x / 2 -
glyph_start_x +
m_glyph_padding_horizontal
;
if (pattern_shift > 0) {
pattern_shift += (line_width_anchor() / 2);
} else {
pattern_shift = 0;
}
auto start_x = center_x - (object_size_x + pattern_shift) / 2;
auto start_y = center_y - object_size_y / 2;
if (is_delta()) {
delta_modify_start(start_x, start_y, num_patterns);
}
return print_pa_pattern(start_x, start_y, start_pa, step_pa, num_patterns);
}
double CalibPressureAdvancePattern::get_distance(double cur_x, double cur_y, double to_x, double to_y)
{
return std::hypot((to_x - cur_x), (to_y - cur_y));
}
double CalibPressureAdvancePattern::max_numbering_height(double start_pa, double step_pa, int num_patterns)
{
int most_characters = 0;
// note: only every other number is printed
for (int i = 0; i < num_patterns; i += 2) {
std::string sNumber = convert_number_to_string(start_pa + (i * step_pa));
if (sNumber.length > most_characters) { most_characters = sNumber.length; }
}
most_characters = std::min(most_characters, m_max_number_length);
return (most_characters * m_digit_segment_len) + ((most_characters - 1) * m_number_spacing);
}
double CalibPressureAdvancePattern::object_size_x(int num_patterns)
{
return num_patterns * ((m_wall_count - 1) * line_spacing_angle()) +
(num_patterns - 1) * (m_pattern_spacing + line_width()) +
std::cos(to_radians(m_corner_angle) / 2) * m_wall_side_length +
line_spacing_anchor() * m_anchor_perimeters
;
}
double CalibPressureAdvancePattern::object_size_y(double start_pa, double step_pa, int num_patterns)
{
return 2 * std::sin(to_radians(m_corner_angle) / 2) * m_wall_side_length +
max_numbering_height(start_pa, step_pa, num_patterns) +
m_glyph_padding_vertical * 2 +
line_width_anchor()
}
std::string CalibPressureAdvancePattern::draw_line(double to_x, double to_y, std::string comment = std::string())
{
std::stringstream gcode;
auto& config = mp_gcodegen.config();
auto& writer = mp_gcodegen.writer();
Flow line_flow = Flow(line_width(), m_height_layer, m_nozzle_diameter);
const double filament_area = M_PI * std::pow(config.filament_diameter.value / 2, 2);
const double e_per_mm = line_flow.mm3_per_mm() / filament_area * m_extrusion_multiplier;
Point last_pos = mp_gcodegen.last_pos();
const double length = get_distance(last_pos.x(), last_pos.y(), to_x, to_y);
auto dE = e_per_mm * length;
if (comment.empty()) {
gcode << writer.extrude_to_xy(Vec2d(to_x, to_y), dE);
} else {
gcode << writer.extrude_to_xy(Vec2d(to_x, to_y), dE, comment);
}
return gcode.str();
}
std::string CalibPressureAdvancePattern::draw_box(double min_x, double min_y, double size_x, double size_y)
{
auto& config = mp_gcodegen->config();
auto& writer = mp_gcodegen->writer();
std::stringstream gcode;
double x = min_x;
double y = min_y;
double max_x = min_x + size_x;
double max_y = min_y + size_y;
double layer_height;
if (mp_gcodegen.m_layer_index <= 0) {
layer_height = config.initial_layer_print_height.value;
} else {
layer_height = config.layer_height.value;
}
double spacing = line_width_anchor() - layer_height * (1 - M_PI / 4);
// if number of perims exceeds size of box, reduce it to max
int max_perimeters =
std::min(
// this is the equivalent of number of perims for concentric fill
std::floor(size_x * std::sin(to_radians(45))) / (spacing / std::sin(to_radians(45))),
std::floor(size_y * std::sin(to_radians(45))) / (spacing / std::sin(to_radians(45)))
)
;
int num_perimeters = std::min(config.num_perimeters, max_perimeters);
gcode << move_to(Vec2d(min_x, min_y));
for (int i = 0; i < num_perimeters; ++i) {
if (i != 0) { // after first perimeter, step inwards to start next perimeter
x += spacing;
y += spacing;
gcode << move_to(Vec2d(x, y), "Step inwards to print next perimeter");
}
return gcode.str();
// draw line up
y += size_y - (i * spacing) * 2;
gcode << writer.extrude_to_xy(Vec2d(x, y), );
}
calib_pressure_advance_pattern::calib_pressure_advance_pattern(GCode* gcodegen) : mp_gcodegen(gcodegen) { }
return gcode.str();
}
std::string calib_pressure_advance_pattern::generate_test(double start_pa, double end_pa, double step_pa) {
BoundingBoxf bed_ext = get_extents(mp_gcodegen->config().printable_area.values);
if (is_delta()) {
delta_scale_bed_ext(bed_ext);
}
const auto &w = bed_ext.size().x();
const auto &h = bed_ext.size().y();
const auto center_x = w / 2;
const auto center_y = h / 2;
int num_patterns = std::ceil((end_pa - start_pa) / step_pa + 1);
num_patterns = std::min(num_patterns, int((h - 10) / m_space_y));
auto object_size_x = object_size_x(num_patterns);
auto object_size_y = object_size_y(start_pa, step_pa, num_patterns);
auto glyph_start_x =
center_x -
object_size_x / 2 +
(((m_wall_count - 1) / 2) * line_spacing_angle() - 2)
;
auto pattern_shift =
center_x -
object_size_x / 2 -
glyph_start_x +
m_glyph_padding_horizontal
;
if (pattern_shift > 0) {
pattern_shift += (line_width_anchor() / 2);
} else {
pattern_shift = 0;
}
auto start_x = center_x - (object_size_x + pattern_shift) / 2;
auto start_y = center_y - object_size_y / 2;
if (is_delta()) {
delta_modify_start(start_x, start_y, num_patterns);
}
return print_pa_pattern(start_x, start_y, start_pa, step_pa, num_patterns);
}
std::string calib_pressure_advance_pattern::print_pa_pattern(double start_x, double start_y, double start_pa, double step_pa, int num) {
auto& writer = mp_gcodegen->writer();
// TODO set test parameters
std::stringstream gcode;
gcode << move_to(Vec2d(start_x, start_y, mp_gcodegen->config().initial_layer_print_height.value));
}
double object_size_x(int num_patterns) {
return num_patterns * ((m_wall_count - 1) * line_spacing_angle()) +
(num_patterns - 1) * (m_pattern_spacing + line_width()) +
std::cos(to_radians(m_corner_angle) / 2) * m_wall_side_length +
line_spacing_anchor() * m_anchor_perimeters
;
}
double object_size_y(double start_pa, double step_pa, int num_patterns) {
return 2 * std::sin(to_radians(m_corner_angle) / 2) * m_wall_side_length +
max_numbering_height(start_pa, step_pa, num_patterns) +
m_glyph_padding_vertical * 2 +
line_width_anchor()
}
double max_numbering_height(double start_pa, double step_pa, int num_patterns) {
int most_characters = 0;
// note: only every other number is printed
for (int i = 0; i < num_patterns; i += 2) {
std::string sNumber = convert_number_to_string(start_pa + (i * step_pa));
if (sNumber.length > most_characters) { most_characters = sNumber.length; }
}
most_characters = std::min(most_characters, m_max_number_length);
return (most_characters * m_digit_segment_len) + ((most_characters - 1) * m_number_spacing);
}
double get_distance(double cur_x, double cur_y, double to_x, double to_y) {
return std::hypot((to_x - cur_x), (to_y - cur_y));
}
std::string draw_line(double to_x, double to_y, std::string comment = std::string()) {
std::stringstream gcode;
auto& config = mp_gcodegen.config();
auto& writer = mp_gcodegen.writer();
Flow line_flow = Flow(line_width(), m_height_layer, m_nozzle_diameter);
const double filament_area = M_PI * std::pow(config.filament_diameter.value / 2, 2);
const double e_per_mm = line_flow.mm3_per_mm() / filament_area * m_extrusion_multiplier;
Point last_pos = mp_gcodegen.last_pos();
const double length = get_distance(last_pos.x(), last_pos.y(), to_x, to_y);
@@ -388,5 +450,4 @@ namespace Slic3r {
return gcode.str();
}
Calib_Params::Calib_Params() : mode(CalibMode::Calib_None) {}
} // namespace Slic3r

158
src/libslic3r/calib.hpp
View File

@@ -26,50 +26,67 @@ struct Calib_Params
CalibMode mode;
};
class calib_pressure_advance
{
public:
class CalibPressureAdvance {
protected:
CalibPressureAdvance(GCode* gcodegen) :
mp_gcodegen(gcodegen),
m_digit_segment_len(2),
m_max_number_length(5),
m_number_spacing(3.0)
{
m_nozzle_diameter = gcodegen->config().nozzle_diameter.get_at(0);
}
;
~CalibPressureAdvance() { };
enum class DrawDigitMode {
Horizontal = 0,
Vertical
};
void set_nozzle_diameter() {
m_nozzle_diameter = mp_gcodegen->config().nozzle_diameter.get_at(0);
}
private:
std::string move_to(Vec2d pt, std::string comment = std::string());
std::string convert_number_to_string(double num);
std::string draw_digit(double startx, double starty, char c, calib_pressure_advance::DrawDigitMode mode);
std::string draw_number(double startx, double starty, double value, calib_pressure_advance::DrawDigitMode mode);
std::string draw_digit(double startx, double starty, char c, CalibPressureAdvance::DrawDigitMode mode);
std::string draw_number(double startx, double starty, double value, CalibPressureAdvance::DrawDigitMode mode);
bool is_delta();
void delta_scale_bed_ext(BoundingBoxf& bed_ext);
void delta_modify_start(double start_x, double start_y, int count);
private:
GCode* mp_gcodegen;
double m_digit_segment_len {2};
double m_nozzle_diameter;
int m_max_number_length {5};
double m_number_spacing {3.0};
}
class calib_pressure_advance_line: public calib_pressure_advance
{
GCode* mp_gcodegen;
double m_nozzle_diameter;
double m_digit_segment_len;
int m_max_number_length;
double m_number_spacing;
};
class CalibPressureAdvanceLine : public CalibPressureAdvance {
public:
calib_pressure_advance_line(GCode* gcodegen);
~calib_pressure_advance_line() {}
CalibPressureAdvanceLine(GCode* gcodegen) :
CalibPressureAdvance(gcodegen),
m_length_short(20.0),
m_length_long(40.0),
m_space_y(3.5),
m_line_width(0.6),
m_draw_numbers(true)
{ }
;
~CalibPressureAdvanceLine() { };
std::string generate_test(double start_pa = 0, double step_pa = 0.002, int count = 50);
void set_speed(double fast = 100.0,double slow = 20.0) {
void set_speed(double fast = 100.0, double slow = 20.0) {
m_slow_speed = slow;
m_fast_speed = fast;
}
double& line_width() { return m_line_width; };
bool& draw_numbers() { return m_draw_numbers; }
bool& draw_numbers() { return m_draw_numbers; }
private:
std::string print_pa_lines(double start_x, double start_y, double start_pa, double step_pa, int num);
private:
double m_length_short, m_length_long;
double m_space_y;
double m_slow_speed, m_fast_speed;
@@ -77,43 +94,74 @@ private:
bool m_draw_numbers;
};
class calib_pressure_advance_pattern: public calib_pressure_advance
{
public:
calib_pressure_advance_pattern(GCode* gcodegen);
~calib_pressure_advance_pattern() {}
class CalibPressureAdvancePattern : public CalibPressureAdvance {
public:
CalibPressureAdvancePattern(GCode* gcodegen) :
CalibPressureAdvance(gcodegen),
std::string generate_test(double start_pa = 0, double end_pa = 0.08, double step_pa = 0.005);
m_line_ratio(112.5),
m_extrusion_multiplier(0.98),
m_height_layer(0.2),
m_height_first_layer(0.25),
double to_radians(double degrees) { return degrees * M_PI / 180; }
m_anchor_perimeters(4),
m_anchor_layer_line_ratio(140),
m_wall_count(3),
m_wall_side_length(30.0),
m_corner_angle(90),
m_pattern_spacing(2),
double line_width() { return m_nozzle_diameter * m_line_ratio / 100; };
double line_width_anchor() { return m_nozzle_diameter * m_anchor_layer_line_ratio / 100; };
// from slic3r documentation: spacing = extrusion_width - layer_height * (1 - PI/4)
double line_spacing() { return line_width() - m_height_layer * (1 - M_PI / 4); };
double line_spacing_anchor() { return line_width_anchor() - m_height_first_layer * (1 - M_PI / 4); };
double line_spacing_angle() { return line_spacing() / std::sin(to_radians(m_corner_angle) / 2); };
m_glyph_padding_horizontal(1),
m_glyph_padding_vertical(1)
{ }
;
~CalibPressureAdvancePattern() { };
double object_size_x(int num_patterns);
double object_size_y(double start_pa, double step_pa, int num_patterns);
std::string generate_test(
double start_pa = 0,
double end_pa = 0.08,
double step_pa = 0.005
);
double max_numbering_height(double start_pa, double step_pa, int num_patterns);
private:
double to_radians(double degrees) { return degrees * M_PI / 180; }
double get_distance(double cur_x, double cur_y, double to_x, double to_y);
double line_width() { return m_nozzle_diameter * m_line_ratio / 100; };
double line_width_anchor() { return m_nozzle_diameter * m_anchor_layer_line_ratio / 100; };
// from slic3r documentation: spacing = extrusion_width - layer_height * (1 - PI/4)
double line_spacing() { return line_width() - m_height_layer * (1 - M_PI / 4); };
double line_spacing_anchor() { return line_width_anchor() - m_height_first_layer * (1 - M_PI / 4); };
double line_spacing_angle() { return line_spacing() / std::sin(to_radians(m_corner_angle) / 2); };
double get_distance(double cur_x, double cur_y, double to_x, double to_y);
std::string draw_line(double to_x, double to_y, std::string comment = std::string());
private:
int m_anchor_layer_line_ratio {140};
int m_anchor_perimeters {4};
int m_corner_angle {90};
double m_extrusion_multiplier {0.98};
double m_height_first_layer {0.25};
double m_height_layer {0.2};
double m_glyph_padding_horizontal {1};
double m_glyph_padding_vertical {1};
double m_line_ratio {112.5};
int m_pattern_spacing {2};
int m_wall_count {3};
double m_wall_side_length {30.0};
double max_numbering_height(double start_pa, double step_pa, int num_patterns);
double object_size_x(int num_patterns);
double object_size_y(double start_pa, double step_pa, int num_patterns);
std::string draw_line(double to_x, double to_y, std::string comment = std::string());
std::string draw_box(double min_x, double min_y, double size_x, double size_y);
std::string print_pa_pattern(double start_x, double start_y, double start_pa, double step_pa, int num_patterns);
double m_line_ratio;
double m_extrusion_multiplier;
double m_height_layer;
double m_height_first_layer;
int m_anchor_perimeters;
int m_anchor_layer_line_ratio;
int m_wall_count;
double m_wall_side_length;
int m_corner_angle;
int m_pattern_spacing;
double m_glyph_padding_horizontal;
double m_glyph_padding_vertical;
};
} // namespace Slic3r