diff --git a/resources/calib/PressureAdvance/pa_line.stl b/resources/calib/PressureAdvance/pa_line.stl index 0df26de..a17a948 100644 Binary files a/resources/calib/PressureAdvance/pa_line.stl and b/resources/calib/PressureAdvance/pa_line.stl differ diff --git a/resources/calib/PressureAdvance/pa_pattern.stl b/resources/calib/PressureAdvance/pa_pattern.stl index 0df26de..a17a948 100644 Binary files a/resources/calib/PressureAdvance/pa_pattern.stl and b/resources/calib/PressureAdvance/pa_pattern.stl differ diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt index 3f432ae..0de0b4e 100644 --- a/src/libslic3r/CMakeLists.txt +++ b/src/libslic3r/CMakeLists.txt @@ -35,8 +35,6 @@ set(SLIC3R_SOURCES BuildVolume.cpp BuildVolume.hpp BoostAdapter.hpp - calib.cpp - calib.hpp clipper.cpp clipper.hpp ClipperUtils.cpp diff --git a/src/libslic3r/calib.cpp b/src/libslic3r/calib.cpp deleted file mode 100644 index 24435df..0000000 --- a/src/libslic3r/calib.cpp +++ /dev/null @@ -1,919 +0,0 @@ -#include "calib.hpp" -#include "BoundingBox.hpp" -#include "Config.hpp" -#include "Model.hpp" -#include - -namespace Slic3r { - -// Calculate the optimal Pressure Advance speed -float CalibPressureAdvance::find_optimal_PA_speed(const DynamicPrintConfig &config, double line_width, double layer_height, - int filament_idx) { - const double general_suggested_min_speed = 100.0; - double filament_max_volumetric_speed = config.option("filament_max_volumetric_speed")->get_at(0); - Flow pattern_line = Flow(line_width, layer_height, config.option("nozzle_diameter")->get_at(0)); - auto pa_speed = std::min(std::max(general_suggested_min_speed,config.option("outer_wall_speed")->value), filament_max_volumetric_speed / pattern_line.mm3_per_mm()); - - return std::floor(pa_speed); -} - -std::string CalibPressureAdvance::move_to(Vec2d pt, GCodeWriter& writer, std::string comment) -{ - std::stringstream gcode; - - gcode << writer.retract(); - gcode << writer.travel_to_xy(pt, comment); - gcode << writer.unretract(); - - m_last_pos = Vec3d(pt.x(), pt.y(), 0); - - return gcode.str(); -} - -double CalibPressureAdvance::e_per_mm( - double line_width, - double layer_height, - float nozzle_diameter, - float filament_diameter, - float print_flow_ratio -) const -{ - const Flow line_flow = Flow(line_width, layer_height, nozzle_diameter); - const double filament_area = M_PI * std::pow(filament_diameter / 2, 2); - - return line_flow.mm3_per_mm() / filament_area * print_flow_ratio; -} - -std::string CalibPressureAdvance::convert_number_to_string(double num) const -{ - 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, - double line_width, - double e_per_mm, - GCodeWriter& writer -) -{ - const double len = m_digit_segment_len; - const double gap = line_width / 2.0; - - const auto dE = e_per_mm * 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::Bottom_To_Top) { - // 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::stringstream gcode; - - switch (c) { - case '0': - gcode << move_to(p0, writer, "Glyph: 0"); - 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, writer, "Glyph: 1"); - gcode << writer.extrude_to_xy(p4_5, two_dE); - break; - case '2': - gcode << move_to(p0, writer, "Glyph: 2"); - 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, writer, "Glyph: 3"); - 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, writer); - gcode << writer.extrude_to_xy(p3, dE); - break; - case '4': - gcode << move_to(p0, writer, "Glyph: 4"); - gcode << writer.extrude_to_xy(p3, dE); - gcode << writer.extrude_to_xy(p2, dE); - gcode << move_to(p1, writer); - gcode << writer.extrude_to_xy(p5, two_dE); - break; - case '5': - gcode << move_to(p1, writer, "Glyph: 5"); - 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, writer, "Glyph: 6"); - 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, writer, "Glyph: 7"); - gcode << writer.extrude_to_xy(p1, dE); - gcode << writer.extrude_to_xy(p5, two_dE); - break; - case '8': - gcode << move_to(p2, writer, "Glyph: 8"); - 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, writer, "Glyph: 9"); - 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, writer, "Glyph: ."); - gcode << writer.extrude_to_xy(p4_5 + dot_direction, dE); - break; - default: - break; - } - - return gcode.str(); -} - -std::string CalibPressureAdvance::draw_number( - double startx, - double starty, - double value, - CalibPressureAdvance::DrawDigitMode mode, - double line_width, - double e_per_mm, - double speed, - GCodeWriter& writer -) -{ - auto sNumber = convert_number_to_string(value); - std::stringstream gcode; - gcode << writer.set_speed(speed); - - for (std::string::size_type i = 0; i < sNumber.length(); ++i) { - if (i > m_max_number_len) { - break; - } - switch (mode) { - case DrawDigitMode::Bottom_To_Top: - gcode << draw_digit( - startx, - starty + i * number_spacing(), - sNumber[i], - mode, - line_width, - e_per_mm, - writer - ); - break; - default: - gcode << draw_digit( - startx + i * number_spacing(), - starty, - sNumber[i], - mode, - line_width, - e_per_mm, - writer - ); - } - } - - return gcode.str(); -} - -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().bed_shape.values); - if (is_delta()) { - CalibPressureAdvanceLine::delta_scale_bed_ext(bed_ext); - } - - auto bed_sizes = mp_gcodegen->config().bed_shape.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); - - auto startx = (w - m_length_short * 2 - m_length_long - 20) / 2; - auto starty = (h - count * m_space_y) / 2; - if (is_delta()) { - CalibPressureAdvanceLine::delta_modify_start(startx, starty, count); - } - - return print_pa_lines(startx, starty, start_pa, step_pa, count); -} - -bool CalibPressureAdvanceLine::is_delta() const -{ - return mp_gcodegen->config().bed_shape.values.size() > 4; -} - -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(); - const auto& config = mp_gcodegen->config(); - - const auto filament_diameter = config.filament_diameter.get_at(0); - const auto print_flow_ratio = 1; - - const double e_per_mm = CalibPressureAdvance::e_per_mm( - m_line_width, - m_height_layer, - m_nozzle_diameter, - filament_diameter, - print_flow_ratio - ); - const double thin_e_per_mm = CalibPressureAdvance::e_per_mm( - m_thin_line_width, - m_height_layer, - m_nozzle_diameter, - filament_diameter, - print_flow_ratio - ); - const double number_e_per_mm = CalibPressureAdvance::e_per_mm( - m_number_line_width, - m_height_layer, - m_nozzle_diameter, - filament_diameter, - print_flow_ratio - ); - - const double fast = CalibPressureAdvance::speed_adjust(m_fast_speed); - const double slow = CalibPressureAdvance::speed_adjust(m_slow_speed); - std::stringstream gcode; - gcode << mp_gcodegen->writer().travel_to_z(m_height_layer); - 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), writer); - gcode << writer.set_speed(slow); - gcode << writer.extrude_to_xy(Vec2d(prime_x, y_pos + 3 * m_space_y), e_per_mm * 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), writer); - gcode << writer.set_speed(slow); - gcode << writer.extrude_to_xy(Vec2d(start_x + m_length_short, y_pos + i * m_space_y), e_per_mm * 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_per_mm * 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_per_mm * m_length_short); - } - gcode << writer.set_pressure_advance(0.0); - - 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), writer); - gcode << writer.extrude_to_xy(Vec2d(start_x + m_length_short, y_pos + (num - 1) * m_space_y + 7), thin_e_per_mm * 7); - gcode << move_to(Vec2d(start_x + m_length_short + m_length_long, y_pos + (num - 1) * m_space_y + 7), writer); - gcode << writer.extrude_to_xy(Vec2d(start_x + m_length_short + m_length_long, y_pos + (num - 1) * m_space_y + 2), thin_e_per_mm * 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, - m_draw_digit_mode, - m_number_line_width, - number_e_per_mm, - 3600, - writer - ); - } - } - return gcode.str(); -} - -void CalibPressureAdvanceLine::delta_modify_start(double& startx, double& starty, int count) -{ - startx = -startx; - starty = -(count * m_space_y) / 2; -} - -CalibPressureAdvancePattern::CalibPressureAdvancePattern( - const Calib_Params& params, - const DynamicPrintConfig& config, - bool is_bbl_machine, - Model& model, - const Vec3d& origin -) : - m_params(params) -{ - this->m_draw_digit_mode = DrawDigitMode::Bottom_To_Top; - - refresh_setup(config, is_bbl_machine, model, origin); -}; - -void CalibPressureAdvancePattern::generate_custom_gcodes( - const DynamicPrintConfig& config, - bool is_bbl_machine, - Model& model, - const Vec3d& origin -) -{ - std::stringstream gcode; - gcode << "; start pressure advance pattern for layer\n"; - - refresh_setup(config, is_bbl_machine, model, origin); - - gcode << move_to(Vec2d(m_starting_point.x(), m_starting_point.y()), m_writer, "Move to start XY position"); - gcode << m_writer.travel_to_z(height_first_layer(), "Move to start Z position"); - gcode << m_writer.set_pressure_advance(m_params.start); - - const DrawBoxOptArgs default_box_opt_args(*this); - - // create anchoring frame - gcode << draw_box( - m_starting_point.x(), - m_starting_point.y(), - print_size_x(), - frame_size_y(), - default_box_opt_args - ); - - // create tab for numbers - DrawBoxOptArgs draw_box_opt_args = default_box_opt_args; - draw_box_opt_args.is_filled = true; - draw_box_opt_args.num_perimeters = wall_count(); - gcode << draw_box( - m_starting_point.x(), - m_starting_point.y() + frame_size_y() + line_spacing_first_layer(), - glyph_tab_max_x() - m_starting_point.x(), - max_numbering_height() + line_spacing_first_layer() + m_glyph_padding_vertical * 2, - draw_box_opt_args - ); - - std::vector gcode_items; - const DrawLineOptArgs default_line_opt_args(*this); - const int num_patterns = get_num_patterns(); // "cache" for use in loops - - // draw pressure advance pattern - for (int i = 0; i < m_num_layers; ++i) { - if (i > 0) { - gcode << "; end pressure advance pattern for layer\n"; - CustomGCode::Item item; - item.print_z = height_first_layer() + (i - 1) * height_layer(); - item.type = CustomGCode::Type::Custom; - item.extra = gcode.str(); - gcode_items.push_back(item); - - gcode = std::stringstream(); // reset for next layer contents - gcode << "; start pressure advance pattern for layer\n"; - - const double layer_height = height_first_layer() + (i * height_layer()); - gcode << m_writer.travel_to_z(layer_height, "Move to layer height"); - } - - // line numbering - if (i == 1) { - gcode << m_writer.set_pressure_advance(m_params.start); - - double number_e_per_mm = e_per_mm( - line_width(), - height_layer(), - m_config.option("nozzle_diameter")->get_at(0), - m_config.option("filament_diameter")->get_at(0), - m_config.option("filament_flow_ratio")->get_at(0) - ); - - // glyph on every other line - for (int j = 0; j < num_patterns; j += 2) { - gcode << draw_number( - glyph_start_x(j), - m_starting_point.y() + frame_size_y() + m_glyph_padding_vertical + line_width(), - m_params.start + (j * m_params.step), - m_draw_digit_mode, - line_width(), - number_e_per_mm, - speed_first_layer(), - m_writer - ); - } - } - - DrawLineOptArgs draw_line_opt_args = default_line_opt_args; - - double to_x = m_starting_point.x() + pattern_shift(); - double to_y = m_starting_point.y(); - double side_length = m_wall_side_length; - - // shrink first layer to fit inside frame - if (i == 0) { - double shrink = - ( - line_spacing_first_layer() * (wall_count() - 1) + - (line_width_first_layer() * (1 - m_encroachment)) - ) / std::sin(to_radians(m_corner_angle) / 2) - ; - side_length = m_wall_side_length - shrink; - to_x += shrink * std::sin(to_radians(90) - to_radians(m_corner_angle) / 2); - to_y += - line_spacing_first_layer() * (wall_count() - 1) + - (line_width_first_layer() * (1 - m_encroachment)) - ; - } - - double initial_x = to_x; - double initial_y = to_y; - - gcode << move_to(Vec2d(to_x, to_y), m_writer, "Move to pattern start"); - - for (int j = 0; j < num_patterns; ++j) { - // increment pressure advance - gcode << m_writer.set_pressure_advance(m_params.start + (j * m_params.step)); - - for (int k = 0; k < wall_count(); ++k) { - to_x += std::cos(to_radians(m_corner_angle) / 2) * side_length; - to_y += std::sin(to_radians(m_corner_angle) / 2) * side_length; - - draw_line_opt_args = default_line_opt_args; - draw_line_opt_args.height = i == 0 ? height_first_layer() : height_layer(); - draw_line_opt_args.line_width = line_width(); // don't use line_width_first_layer so results are consistent across all layers - draw_line_opt_args.speed = i == 0 ? speed_adjust(speed_first_layer()) : speed_adjust(speed_perimeter()); - draw_line_opt_args.comment = "Print pattern wall"; - gcode << draw_line(Vec2d(to_x, to_y), draw_line_opt_args); - - to_x -= std::cos(to_radians(m_corner_angle) / 2) * side_length; - to_y += std::sin(to_radians(m_corner_angle) / 2) * side_length; - - gcode << draw_line(Vec2d(to_x, to_y), draw_line_opt_args); - - to_y = initial_y; - if (k != wall_count() - 1) { - // perimeters not done yet. move to next perimeter - to_x += line_spacing_angle(); - gcode << move_to(Vec2d(to_x, to_y), m_writer, "Move to start next pattern wall"); - } else if (j != num_patterns - 1) { - // patterns not done yet. move to next pattern - to_x += m_pattern_spacing + line_width(); - gcode << move_to(Vec2d(to_x, to_y), m_writer, "Move to next pattern"); - } else if (i != m_num_layers - 1) { - // layers not done yet. move back to start - to_x = initial_x; - gcode << move_to(Vec2d(to_x, to_y), m_writer, "Move back to start position"); - } else { - // everything done - } - } - } - } - - gcode << m_writer.set_pressure_advance(m_params.start); - gcode << "; end pressure advance pattern for layer\n"; - - CustomGCode::Item item; - item.print_z = max_layer_z(); - item.type = CustomGCode::Type::Custom; - item.extra = gcode.str(); - gcode_items.push_back(item); - - CustomGCode::Info info; - info.mode = CustomGCode::Mode::SingleExtruder; - info.gcodes = gcode_items; - - //model.plates_custom_gcodes[model.curr_plate_index] = info; -} - -void CalibPressureAdvancePattern::refresh_setup( - const DynamicPrintConfig& config, - bool is_bbl_machine, - const Model& model, - const Vec3d& origin -) -{ - m_config = config; - m_config.apply(model.objects.front()->config.get(), true); - m_config.apply(model.objects.front()->volumes.front()->config.get(), true); - - m_is_delta = (m_config.option("bed_shape")->values.size() > 4); - - _refresh_starting_point(model); - _refresh_writer(is_bbl_machine, model, origin); -} - -void CalibPressureAdvancePattern::_refresh_starting_point(const Model& model) -{ - ModelObject* obj = model.objects.front(); - //BoundingBoxf3 bbox = - // obj->instance_bounding_box( - // *obj->instances.front(), - // false - // ) - //; - - m_starting_point = Vec3d(0, 0, 0); - m_starting_point.y() += m_handle_spacing; - - if (m_is_delta) { - m_starting_point.x() *= -1; - m_starting_point.y() -= (frame_size_y() / 2); - } -} - -void CalibPressureAdvancePattern::_refresh_writer( - bool is_bbl_machine, - const Model& model, - const Vec3d& origin -) -{ - PrintConfig print_config; - print_config.apply(m_config, true); - - m_writer.apply_print_config(print_config); - //m_writer.set_xy_offset(origin(0), origin(1)); - - const unsigned int extruder_id = model.objects.front()->volumes.front()->extruder_id(); - m_writer.set_extruders({ extruder_id }); - m_writer.set_extruder(extruder_id); -} - -std::string CalibPressureAdvancePattern::draw_line( - Vec2d to_pt, - DrawLineOptArgs opt_args -) -{ - const double e_per_mm = CalibPressureAdvance::e_per_mm( - opt_args.line_width, - opt_args.height, - m_config.option("nozzle_diameter")->get_at(0), - m_config.option("filament_diameter")->get_at(0), - m_config.option("filament_flow_ratio")->get_at(0) - ); - - const double length = get_distance(Vec2d(m_last_pos.x(), m_last_pos.y()), to_pt); - auto dE = e_per_mm * length; - - std::stringstream gcode; - - gcode << m_writer.set_speed(opt_args.speed); - gcode << m_writer.extrude_to_xy(to_pt, dE, opt_args.comment); - - m_last_pos = Vec3d(to_pt.x(), to_pt.y(), 0); - - return gcode.str(); -} - -std::string CalibPressureAdvancePattern::draw_box( - double min_x, - double min_y, - double size_x, - double size_y, - DrawBoxOptArgs opt_args -) -{ - std::stringstream gcode; - - double x = min_x; - double y = min_y; - const double max_x = min_x + size_x; - const double max_y = min_y + size_y; - - const double spacing = opt_args.line_width - opt_args.height * (1 - M_PI / 4); - - // if number of perims exceeds size of box, reduce it to max - const 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))) - ) - ; - - opt_args.num_perimeters = std::min(opt_args.num_perimeters, max_perimeters); - - gcode << move_to(Vec2d(min_x, min_y), m_writer, "Move to box start"); - - DrawLineOptArgs line_opt_args(*this); - line_opt_args.height = opt_args.height; - line_opt_args.line_width = opt_args.line_width; - line_opt_args.speed = opt_args.speed; - - for (int i = 0; i < opt_args.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), m_writer, "Step inwards to print next perimeter"); - } - - y += size_y - i * spacing * 2; - line_opt_args.comment = "Draw perimeter (up)"; - gcode << draw_line(Vec2d(x, y), line_opt_args); - - x += size_x - i * spacing * 2; - line_opt_args.comment = "Draw perimeter (right)"; - gcode << draw_line(Vec2d(x, y), line_opt_args); - - y -= size_y - i * spacing * 2; - line_opt_args.comment = "Draw perimeter (down)"; - gcode << draw_line(Vec2d(x, y), line_opt_args); - - x -= size_x - i * spacing * 2; - line_opt_args.comment = "Draw perimeter (left)"; - gcode << draw_line(Vec2d(x, y), line_opt_args); - } - - if (!opt_args.is_filled) { - return gcode.str(); - } - - // create box infill - const double spacing_45 = spacing / std::sin(to_radians(45)); - - const double bound_modifier = - (spacing * (opt_args.num_perimeters - 1)) + - (opt_args.line_width * (1 - m_encroachment)) - ; - const double x_min_bound = min_x + bound_modifier; - const double x_max_bound = max_x - bound_modifier; - const double y_min_bound = min_y + bound_modifier; - const double y_max_bound = max_y - bound_modifier; - const int x_count = std::floor((x_max_bound - x_min_bound) / spacing_45); - const int y_count = std::floor((y_max_bound - y_min_bound) / spacing_45); - - double x_remainder = std::fmod((x_max_bound - x_min_bound), spacing_45); - double y_remainder = std::fmod((y_max_bound - y_min_bound), spacing_45); - - x = x_min_bound; - y = y_min_bound; - - gcode << move_to(Vec2d(x, y), m_writer, "Move to fill start"); - - for (int i = 0; i < x_count + y_count + (x_remainder + y_remainder >= spacing_45 ? 1 : 0); ++i) { // this isn't the most robust way, but less expensive than finding line intersections - if (i < std::min(x_count, y_count)) { - if (i % 2 == 0) { - x += spacing_45; - y = y_min_bound; - gcode << move_to(Vec2d(x, y), m_writer, "Fill: Step right"); - - y += x - x_min_bound; - x = x_min_bound; - line_opt_args.comment = "Fill: Print up/left"; - gcode << draw_line(Vec2d(x, y), line_opt_args); - } else { - y += spacing_45; - x = x_min_bound; - gcode << move_to(Vec2d(x, y), m_writer, "Fill: Step up"); - - x += y - y_min_bound; - y = y_min_bound; - line_opt_args.comment = "Fill: Print down/right"; - gcode << draw_line(Vec2d(x, y), line_opt_args); - } - } else if (i < std::max(x_count, y_count)) { - if (x_count > y_count) { - // box is wider than tall - if (i % 2 == 0) { - x += spacing_45; - y = y_min_bound; - gcode << move_to(Vec2d(x, y), m_writer, "Fill: Step right"); - - x -= y_max_bound - y_min_bound; - y = y_max_bound; - line_opt_args.comment = "Fill: Print up/left"; - gcode << draw_line(Vec2d(x, y), line_opt_args); - } else { - if (i == y_count) { - x += spacing_45 - y_remainder; - y_remainder = 0; - } else { - x += spacing_45; - } - y = y_max_bound; - gcode << move_to(Vec2d(x, y), m_writer, "Fill: Step right"); - - x += y_max_bound - y_min_bound; - y = y_min_bound; - line_opt_args.comment = "Fill: Print down/right"; - gcode << draw_line(Vec2d(x, y), line_opt_args); - } - } else { - // box is taller than wide - if (i % 2 == 0) { - x = x_max_bound; - if (i == x_count) { - y += spacing_45 - x_remainder; - x_remainder = 0; - } else { - y += spacing_45; - } - gcode << move_to(Vec2d(x, y), m_writer, "Fill: Step up"); - - x = x_min_bound; - y += x_max_bound - x_min_bound; - line_opt_args.comment = "Fill: Print up/left"; - gcode << draw_line(Vec2d(x, y), line_opt_args); - } else { - x = x_min_bound; - y += spacing_45; - gcode << move_to(Vec2d(x, y), m_writer, "Fill: Step up"); - - x = x_max_bound; - y -= x_max_bound - x_min_bound; - line_opt_args.comment = "Fill: Print down/right"; - gcode << draw_line(Vec2d(x, y), line_opt_args); - } - } - } else { - if (i % 2 == 0) { - x = x_max_bound; - if (i == x_count) { - y += spacing_45 - x_remainder; - } else { - y += spacing_45; - } - gcode << move_to(Vec2d(x, y), m_writer, "Fill: Step up"); - - x -= y_max_bound - y; - y = y_max_bound; - line_opt_args.comment = "Fill: Print up/left"; - gcode << draw_line(Vec2d(x, y), line_opt_args); - } else { - if (i == y_count) { - x += spacing_45 - y_remainder; - } else { - x += spacing_45; - } - y = y_max_bound; - gcode << move_to(Vec2d(x, y), m_writer, "Fill: Step right"); - - y -= x_max_bound - x; - x = x_max_bound; - line_opt_args.comment = "Fill: Print down/right"; - gcode << draw_line(Vec2d(x, y), line_opt_args); - } - } - } - - return gcode.str(); -} - -double CalibPressureAdvancePattern::get_distance(Vec2d from, Vec2d to) const -{ - return std::hypot((to.x() - from.x()), (to.y() - from.y())); -} - -double CalibPressureAdvancePattern::object_size_x() const -{ - return get_num_patterns() * ((wall_count() - 1) * line_spacing_angle()) + - (get_num_patterns() - 1) * (m_pattern_spacing + line_width()) + - std::cos(to_radians(m_corner_angle) / 2) * m_wall_side_length + - line_spacing_first_layer() * wall_count() - ; -} - -double CalibPressureAdvancePattern::object_size_y() const -{ - return 2 * (std::sin(to_radians(m_corner_angle) / 2) * m_wall_side_length) + - max_numbering_height() + - m_glyph_padding_vertical * 2 + - line_width_first_layer(); -} - -double CalibPressureAdvancePattern::glyph_start_x(int pattern_i) const -{ - // note that pattern_i is zero-based! - // align glyph's start with first perimeter of specified pattern - double x = - // starting offset - m_starting_point.x() + - pattern_shift() + - - // width of pattern extrusions - pattern_i * (wall_count() - 1) * line_spacing_angle() + // center to center distance of extrusions - pattern_i * line_width() + // endcaps. center to end on either side = 1 line width - - // space between each pattern - pattern_i * m_pattern_spacing - ; - - // align to middle of pattern walls - x += wall_count() * line_spacing_angle() / 2; - - // shift so glyph is centered on pattern - // m_digit_segment_len = half of X length of glyph - x -= (glyph_length_x() / 2); - - return x; -} - -double CalibPressureAdvancePattern::glyph_length_x() const -{ - // half of line_width sticks out on each side - return line_width() + (2 * m_digit_segment_len); -} - -double CalibPressureAdvancePattern::glyph_tab_max_x() const -{ - // only every other glyph is shown, starting with 1 - int num = get_num_patterns(); - int max_num = - (num % 2 == 0) - ? num - 1 - : num - ; - - // padding at end should be same as padding at start - double padding = glyph_start_x(0) - m_starting_point.x(); - - return - glyph_start_x(max_num - 1) + // glyph_start_x is zero-based - (glyph_length_x() - line_width() / 2) + - padding - ; -} - -double CalibPressureAdvancePattern::max_numbering_height() const -{ - std::string::size_type most_characters = 0; - const int num_patterns = get_num_patterns(); - - // note: only every other number is printed - for (std::string::size_type i = 0; i < num_patterns; i += 2) { - std::string sNumber = convert_number_to_string(m_params.start + (i * m_params.step)); - - if (sNumber.length() > most_characters) { - most_characters = sNumber.length(); - } - } - - most_characters = std::min(most_characters, m_max_number_len); - - return (most_characters * m_digit_segment_len) + ((most_characters - 1) * m_digit_gap_len); -} - -double CalibPressureAdvancePattern::pattern_shift() const -{ - return - (wall_count() - 1) * line_spacing_first_layer() + - line_width_first_layer() + - m_glyph_padding_horizontal - ; -} -} // namespace Slic3r diff --git a/src/libslic3r/calib.hpp b/src/libslic3r/calib.hpp deleted file mode 100644 index 56d32bc..0000000 --- a/src/libslic3r/calib.hpp +++ /dev/null @@ -1,281 +0,0 @@ -#pragma once -#define calib_pressure_advance_dd - -#include "GCode.hpp" -#include "GCodeWriter.hpp" -#include "PrintConfig.hpp" - -namespace Slic3r { - -enum class CalibMode : int { - Calib_None = 0, - Calib_PA_Line, - Calib_PA_Pattern, - Calib_PA_Tower, - Calib_Temp_Tower, - Calib_Vol_speed_Tower, - Calib_VFA_Tower, - Calib_Retraction_tower, - Calib_FRF -}; - -struct Calib_Params { - Calib_Params() : mode(CalibMode::Calib_None) { }; - double start, end, step; - bool print_numbers; - CalibMode mode; -}; - -class CalibPressureAdvance { - public: - static float find_optimal_PA_speed(const DynamicPrintConfig &config, double line_width, double layer_height, - int filament_idx = 0); - - protected: - CalibPressureAdvance() =default; - ~CalibPressureAdvance() =default; - - enum class DrawDigitMode { - Left_To_Right, - Bottom_To_Top - }; - - void delta_scale_bed_ext(BoundingBoxf& bed_ext) const { bed_ext.scale(1.0f / 1.41421f); } - - std::string move_to(Vec2d pt, GCodeWriter& writer, std::string comment = std::string()); - double e_per_mm( - double line_width, - double layer_height, - float nozzle_diameter, - float filament_diameter, - float print_flow_ratio - ) const; - double speed_adjust(int speed) const { return speed * 60; }; - - std::string convert_number_to_string(double num) const; - double number_spacing() const { return m_digit_segment_len + m_digit_gap_len; }; - std::string draw_digit( - double startx, - double starty, - char c, - CalibPressureAdvance::DrawDigitMode mode, - double line_width, - double e_per_mm, - GCodeWriter& writer - ); - std::string draw_number( - double startx, - double starty, - double value, - CalibPressureAdvance::DrawDigitMode mode, - double line_width, - double e_per_mm, - double speed, - GCodeWriter& writer - ); - - Vec3d m_last_pos; - - DrawDigitMode m_draw_digit_mode {DrawDigitMode::Left_To_Right}; - const double m_digit_segment_len {2}; - const double m_digit_gap_len {1}; - const std::string::size_type m_max_number_len {5}; -}; - -class CalibPressureAdvanceLine : public CalibPressureAdvance { -public: - CalibPressureAdvanceLine(GCode* gcodegen) : - mp_gcodegen(gcodegen), - m_nozzle_diameter(gcodegen->config().nozzle_diameter.get_at(0)) - { }; - ~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) { - m_slow_speed = slow; - m_fast_speed = fast; - } - - const double& line_width() { return m_line_width; }; - bool is_delta() const; - 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); - - void delta_modify_start(double& startx, double& starty, int count); - - GCode* mp_gcodegen; - - double m_nozzle_diameter; - double m_slow_speed, m_fast_speed; - - const double m_height_layer {0.2}; - const double m_line_width {0.6}; - const double m_thin_line_width {0.44}; - const double m_number_line_width {0.48}; - const double m_space_y {3.5}; - - double m_length_short {20.0}, m_length_long {40.0}; - bool m_draw_numbers {true}; -}; - -struct SuggestedConfigCalibPAPattern { - const std::vector> float_pairs { - {"initial_layer_print_height", 0.25}, - {"layer_height", 0.2}, - {"initial_layer_speed", 30} - }; - - const std::vector> nozzle_ratio_pairs { - {"line_width", 112.5}, - {"initial_layer_line_width", 140} - }; - - const std::vector> int_pairs { - {"skirt_loops", 0}, - {"wall_loops", 3} - }; - - const std::pair brim_pair {"brim_type", BrimType::btNoBrim}; -}; - -class CalibPressureAdvancePattern : public CalibPressureAdvance { -friend struct DrawLineOptArgs; -friend struct DrawBoxOptArgs; - -public: - CalibPressureAdvancePattern( - const Calib_Params& params, - const DynamicPrintConfig& config, - bool is_bbl_machine, - Model& model, - const Vec3d& origin - ); - - double handle_xy_size() const { return m_handle_xy_size; }; - double handle_spacing() const { return m_handle_spacing; }; - double print_size_x() const { return object_size_x() + pattern_shift(); }; - double print_size_y() const { return object_size_y(); }; - double max_layer_z() const { return height_first_layer() + ((m_num_layers - 1) * height_layer()); }; - - void generate_custom_gcodes( - const DynamicPrintConfig& config, - bool is_bbl_machine, - Model& model, - const Vec3d& origin - ); - -protected: - double speed_first_layer() const { return m_config.option("initial_layer_speed")->value; }; - double speed_perimeter() const { return m_config.option("outer_wall_speed")->value; }; - double line_width_first_layer() const { return m_config.get_abs_value("initial_layer_line_width"); }; - double line_width() const { return m_config.get_abs_value("line_width"); }; - int wall_count() const { return m_config.option("wall_loops")->value; }; - -private: - struct DrawLineOptArgs { - DrawLineOptArgs(const CalibPressureAdvancePattern& p) : - height {p.height_layer()}, - line_width {p.line_width()}, - speed {p.speed_adjust(p.speed_perimeter())} - { }; - - double height; - double line_width; - double speed; - std::string comment {"Print line"}; - }; - - struct DrawBoxOptArgs { - DrawBoxOptArgs(const CalibPressureAdvancePattern& p) : - num_perimeters {p.wall_count()}, - height {p.height_first_layer()}, - line_width {p.line_width_first_layer()}, - speed {p.speed_adjust(p.speed_first_layer())} - { }; - - bool is_filled {false}; - int num_perimeters; - double height; - double line_width; - double speed; - }; - - void refresh_setup( - const DynamicPrintConfig& config, - bool is_bbl_machine, - const Model& model, - const Vec3d& origin - ); - void _refresh_starting_point(const Model& model); - void _refresh_writer( - bool is_bbl_machine, - const Model& model, - const Vec3d& origin - ); - - double height_first_layer() const { return m_config.option("initial_layer_print_height")->value; }; - double height_layer() const { return m_config.option("layer_height")->value; }; - const int get_num_patterns() const - { - return std::ceil((m_params.end - m_params.start) / m_params.step + 1); - } - - std::string draw_line( - Vec2d to_pt, - DrawLineOptArgs opt_args - ); - std::string draw_box( - double min_x, - double min_y, - double size_x, - double size_y, - DrawBoxOptArgs opt_args - ); - - double to_radians(double degrees) const { return degrees * M_PI / 180; }; - double get_distance(Vec2d from, Vec2d to) const; - - /* - from slic3r documentation: spacing = extrusion_width - layer_height * (1 - PI/4) - "spacing" = center-to-center distance of adjacent extrusions, which partially overlap - https://manual.slic3r.org/advanced/flow-math - https://ellis3dp.com/Print-Tuning-Guide/articles/misconceptions.html#two-04mm-perimeters--08mm - */ - double line_spacing() const { return line_width() - height_layer() * (1 - M_PI / 4); }; - double line_spacing_first_layer() const { return line_width_first_layer() - height_first_layer() * (1 - M_PI / 4); }; - double line_spacing_angle() const { return line_spacing() / std::sin(to_radians(m_corner_angle) / 2); }; - - double object_size_x() const; - double object_size_y() const; - double frame_size_y() const { return std::sin(to_radians(double(m_corner_angle) / 2)) * m_wall_side_length * 2; }; - - double glyph_start_x(int pattern_i = 0) const; - double glyph_length_x() const; - double glyph_tab_max_x() const; - double max_numbering_height() const; - - double pattern_shift() const; - - const Calib_Params& m_params; - - DynamicPrintConfig m_config; - GCodeWriter m_writer; - bool m_is_delta; - Vec3d m_starting_point; - - const double m_handle_xy_size {5}; - const double m_handle_spacing {2}; - const int m_num_layers {4}; - - const double m_wall_side_length {30.0}; - const int m_corner_angle {90}; - const int m_pattern_spacing {2}; - const double m_encroachment {1. / 3.}; - - const double m_glyph_padding_horizontal {1}; - const double m_glyph_padding_vertical {1}; -}; -} // namespace Slic3r diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 3b33bbe..ee58490 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -1579,8 +1579,7 @@ void MainFrame::init_menubar_as_editor() append_menu_item(flowrateMenu, wxID_ANY, _L("Fine"), _L("Flow Rate Fine"), [this](wxCommandEvent &) { - if (!m_frf_calib_dlg) - m_frf_calib_dlg = new FRF_Calibration_Dlg((wxWindow *) this, wxID_ANY, m_plater); + m_frf_calib_dlg = new FRF_Calibration_Dlg((wxWindow *) this, wxID_ANY, m_plater); m_frf_calib_dlg->ShowModal(); }, "", nullptr, [this]() { return m_plater->is_view3D_shown(); }, this); @@ -1590,8 +1589,7 @@ void MainFrame::init_menubar_as_editor() append_menu_item(calibrationMenu, wxID_ANY, _L("Pressure advance"), _L("Pressure advance"), [this](wxCommandEvent &) { - if (!m_pa_calib_dlg) - m_pa_calib_dlg = new PA_Calibration_Dlg((wxWindow *) this, wxID_ANY, m_plater); + m_pa_calib_dlg = new PA_Calibration_Dlg((wxWindow *) this, wxID_ANY, m_plater); m_pa_calib_dlg->ShowModal(); }, "", nullptr, [this]() { return m_plater->is_view3D_shown(); }, this); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 0e56f7f..ee029c4 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -3,6 +3,7 @@ #include #include +#include #include #include #include @@ -5369,14 +5370,11 @@ void Plater::calib_flowrate_coarse() { new_project(); wxGetApp().mainframe->select_tab(size_t(0)); - Tab *tab_print = wxGetApp().get_tab(Preset::TYPE_PRINT); - Tab *tab_filament = wxGetApp().get_tab(Preset::TYPE_FILAMENT); - Tab *tab_printer = wxGetApp().get_tab(Preset::TYPE_PRINTER); - DynamicPrintConfig new_config; + DynamicPrintConfig new_config; new_config.set_key_value("complete_objects", new ConfigOptionBool(true)); new_config.set_key_value("extruder_clearance_radius", new ConfigOptionFloat(1)); - new_config.set_key_value("extrusion_multiplier", new ConfigOptionFloats{1.}); + new_config.set_key_value("extrusion_multiplier", new ConfigOptionFloats{1}); new_config.set_key_value("between_objects_gcode", new ConfigOptionString("{if current_object_idx==1}M221 S105{endif}" "{if current_object_idx==2}M221 S110{endif}" @@ -5386,6 +5384,10 @@ void Plater::calib_flowrate_coarse() "{if current_object_idx==6}M221 S90{endif}" "{if current_object_idx==7}M221 S85{endif}" "{if current_object_idx==8}M221 S80{endif}")); + + Tab *tab_print = wxGetApp().get_tab(Preset::TYPE_PRINT); + Tab *tab_filament = wxGetApp().get_tab(Preset::TYPE_FILAMENT); + Tab *tab_printer = wxGetApp().get_tab(Preset::TYPE_PRINTER); tab_print->load_config(new_config); tab_filament->load_config(new_config); tab_printer->load_config(new_config); @@ -5398,33 +5400,33 @@ void Plater::calib_flowrate_coarse() get_notification_manager()->push_notification(NotificationType::CustomNotification, NotificationManager::NotificationLevel::PrintInfoNotificationLevel, message); } -void Plater::calib_flowrate_fine(const Calib_Params ¶ms) +void Plater::calib_flowrate_fine(const double target_extrusion_multiplier) { new_project(); wxGetApp().mainframe->select_tab(size_t(0)); - if (params.mode != CalibMode::Calib_FRF) - return; + + auto printerConfig = &wxGetApp().preset_bundle->printers.get_edited_preset().config; + int em = target_extrusion_multiplier * 100; + auto start_gcode = printerConfig->opt_string("start_gcode"); + + DynamicPrintConfig new_config; + new_config.set_key_value("complete_objects", new ConfigOptionBool(true)); + new_config.set_key_value("extruder_clearance_radius", new ConfigOptionFloat(1)); + new_config.set_key_value("extrusion_multiplier", new ConfigOptionFloats{1}); + new_config.set_key_value("start_gcode", new ConfigOptionString(start_gcode + "\nM221 S"+std::to_string(em))); + new_config.set_key_value("between_objects_gcode", + new ConfigOptionString("{if current_object_idx==1}M221 S"+std::to_string(em+1)+"{endif}" + "{if current_object_idx==2}M221 S"+std::to_string(em+2)+"{endif}" + "{if current_object_idx==3}M221 S"+std::to_string(em+3)+"{endif}" + "{if current_object_idx==4}M221 S"+std::to_string(em+4)+"{endif}" + "{if current_object_idx==5}M221 S"+std::to_string(em-1)+"{endif}" + "{if current_object_idx==6}M221 S"+std::to_string(em-2)+"{endif}" + "{if current_object_idx==7}M221 S"+std::to_string(em-3)+"{endif}" + "{if current_object_idx==8}M221 S"+std::to_string(em-4)+"{endif}")); Tab *tab_print = wxGetApp().get_tab(Preset::TYPE_PRINT); Tab *tab_filament = wxGetApp().get_tab(Preset::TYPE_FILAMENT); Tab *tab_printer = wxGetApp().get_tab(Preset::TYPE_PRINTER); - DynamicPrintConfig new_config; - auto printerConfig = &wxGetApp().preset_bundle->printers.get_edited_preset().config; - int extru_multip = params.start * 100; - auto start_gcode = printerConfig->opt_string("start_gcode"); - new_config.set_key_value("complete_objects", new ConfigOptionBool(true)); - new_config.set_key_value("extruder_clearance_radius", new ConfigOptionFloat(1)); - new_config.set_key_value("extrusion_multiplier", new ConfigOptionFloats{1.}); - new_config.set_key_value("start_gcode", new ConfigOptionString(start_gcode + "\nM221 S"+std::to_string(extru_multip))); - new_config.set_key_value("between_objects_gcode", - new ConfigOptionString("{if current_object_idx==1}M221 S"+std::to_string(extru_multip+1)+"{endif}" - "{if current_object_idx==2}M221 S"+std::to_string(extru_multip+2)+"{endif}" - "{if current_object_idx==3}M221 S"+std::to_string(extru_multip+3)+"{endif}" - "{if current_object_idx==4}M221 S"+std::to_string(extru_multip+4)+"{endif}" - "{if current_object_idx==5}M221 S"+std::to_string(extru_multip-1)+"{endif}" - "{if current_object_idx==6}M221 S"+std::to_string(extru_multip-2)+"{endif}" - "{if current_object_idx==7}M221 S"+std::to_string(extru_multip-3)+"{endif}" - "{if current_object_idx==8}M221 S"+std::to_string(extru_multip-4)+"{endif}")); tab_print->load_config(new_config); tab_filament->load_config(new_config); tab_printer->load_config(new_config); @@ -5438,46 +5440,95 @@ void Plater::calib_flowrate_fine(const Calib_Params ¶ms) } //B34 -void Plater::calib_pa(const int pa_method, wxString StartPA, wxString EndPA, wxString PAStep) +void Plater::calib_pa_line(const double StartPA, double EndPA, double PAStep) { new_project(); wxGetApp().mainframe->select_tab(size_t(0)); +//Load model std::vector model_path; - //double pa = StartPA; - - switch (pa_method) { - case 0: - { - Tab *tab_printer = wxGetApp().get_tab(Preset::TYPE_PRINTER); - DynamicPrintConfig new_config; - auto printerConfig = &wxGetApp().preset_bundle->printers.get_edited_preset().config; - - auto end_gcode = printerConfig->opt_string("end_gcode"); - std::string set_pa_gcode = "M900 K"; - end_gcode = set_pa_gcode + end_gcode; - new_config.set_key_value("end_gcode", new ConfigOptionString(end_gcode)); - tab_printer->load_config(new_config); - - model_path.emplace_back(Slic3r::resources_dir() + "/calib/PressureAdvance/pa_line.stl"); - load_files(model_path, true, false, false); - break; - } - - case 1: - { - model_path.emplace_back(Slic3r::resources_dir() + "/calib/PressureAdvance/pa_pattern.stl"); - load_files(model_path, true, false, false); - break; - } - - case 2: - { - model_path.emplace_back(Slic3r::resources_dir() + "/calib/PressureAdvance/pa_tower.stl"); - load_files(model_path, true, false, false); - break; - } - default: break; + model_path.emplace_back(Slic3r::resources_dir() + "/calib/PressureAdvance/pa_line.stl"); + load_files(model_path, true, false, false); +//Check step count + const Vec2d plate_center = build_volume().bed_center(); + double count = floor((EndPA - StartPA) / PAStep); + double max_count = floor(plate_center.y() / 2.5) - 2; + if (count > max_count) + { + count = max_count; } + + auto printerConfig = &wxGetApp().preset_bundle->printers.get_edited_preset().config; +//Position aided model + sidebar().obj_manipul()->on_change("position", 0, plate_center.x() - 50); + sidebar().obj_manipul()->set_uniform_scaling(false); + sidebar().obj_manipul()->on_change("size", 1, count * 5); + auto first_layer_height = printerConfig->opt_float("first_layer_height"); + sidebar().obj_manipul()->on_change("size", 2, first_layer_height); + sidebar().obj_manipul()->set_uniform_scaling(true); + +//Generate line gcode + double start_x = plate_center.x() - 40; + double end_x = plate_center.x() + 40; + double start_y = plate_center.y() - count *2.5; + double end_y = plate_center.y() + count *2.5; + std::string pa_line_gcode = "M900 K"; + + +//Generate number gcode + std::string pa_number_gcode = "M900 K"; + + +//Set and load end gcode + auto end_gcode = printerConfig->opt_string("end_gcode"); + end_gcode = pa_line_gcode + pa_number_gcode + end_gcode; + + DynamicPrintConfig new_config; + new_config.set_key_value("end_gcode", new ConfigOptionString(end_gcode)); + + Tab *tab_printer = wxGetApp().get_tab(Preset::TYPE_PRINTER); + tab_printer->load_config(new_config); + + std::string message = _u8L("NOTICE: The calibration function modifies some parameters. After calibration, record the best value and restore the other parameters."); + get_notification_manager()->push_notification(NotificationType::CustomNotification, NotificationManager::NotificationLevel::PrintInfoNotificationLevel, message); +} + +void Plater::calib_pa_pattern(const double StartPA, double EndPA, double PAStep) +{ + new_project(); + wxGetApp().mainframe->select_tab(size_t(0)); + + std::vector model_path; + model_path.emplace_back(Slic3r::resources_dir() + "/calib/PressureAdvance/pa_pattern.stl"); + load_files(model_path, true, false, false); + + const Vec2d plate_center = build_volume().bed_center(); + sidebar().obj_manipul()->on_change("position", 0, plate_center.x() - 50); + + Tab *tab_printer = wxGetApp().get_tab(Preset::TYPE_PRINTER); + DynamicPrintConfig new_config; + auto printerConfig = &wxGetApp().preset_bundle->printers.get_edited_preset().config; + + auto end_gcode = printerConfig->opt_string("end_gcode"); + std::string set_pa_gcode = "M900 K"; + end_gcode = set_pa_gcode + end_gcode; + new_config.set_key_value("end_gcode", new ConfigOptionString(end_gcode)); + tab_printer->load_config(new_config); + + std::string message = _u8L("NOTICE: The calibration function modifies some parameters. After calibration, record the best value and restore the other parameters."); + get_notification_manager()->push_notification(NotificationType::CustomNotification, NotificationManager::NotificationLevel::PrintInfoNotificationLevel, message); +} + +void Plater::calib_pa_tower(const double StartPA, double EndPA, double PAStep) +{ + new_project(); + wxGetApp().mainframe->select_tab(size_t(0)); + + std::vector model_path; + model_path.emplace_back(Slic3r::resources_dir() + "/calib/PressureAdvance/pa_tower.stl"); + load_files(model_path, true, false, false); + + std::string message = _u8L("NOTICE: The calibration function modifies some parameters. After calibration, record the best value and restore the other parameters."); + get_notification_manager()->push_notification(NotificationType::CustomNotification, NotificationManager::NotificationLevel::PrintInfoNotificationLevel, message); } void Plater::import_zip_archive() diff --git a/src/slic3r/GUI/Plater.hpp b/src/slic3r/GUI/Plater.hpp index ce271d2..cded433 100644 --- a/src/slic3r/GUI/Plater.hpp +++ b/src/slic3r/GUI/Plater.hpp @@ -16,8 +16,6 @@ #include "Jobs/Job.hpp" #include "Jobs/Worker.hpp" #include "Search.hpp" -//B34 - #include "libslic3r/Calib.hpp" class wxButton; class ScalableButton; @@ -167,9 +165,11 @@ public: SLAPrint& sla_print(); //B34 - void calib_pa(const int pa_method, wxString StartPA, wxString EndPA, wxString PAStep); + void calib_pa_line(const double StartPA, double EndPA, double PAStep); + void calib_pa_pattern(const double StartPA, double EndPA, double PAStep); + void calib_pa_tower(const double StartPA, double EndPA, double PAStep); void calib_flowrate_coarse(); - void calib_flowrate_fine(const Calib_Params ¶ms); + void calib_flowrate_fine(const double target_extrusion_multiplier); void new_project(); diff --git a/src/slic3r/GUI/calib_dlg.cpp b/src/slic3r/GUI/calib_dlg.cpp index f2504d5..fd75fe6 100644 --- a/src/slic3r/GUI/calib_dlg.cpp +++ b/src/slic3r/GUI/calib_dlg.cpp @@ -5,91 +5,45 @@ #include #include "MainFrame.hpp" #include +#include +#include namespace Slic3r { namespace GUI { - -wxBoxSizer *create_item_checkbox(wxString title, wxWindow *parent, bool *value, CheckBoxInWT *&checkbox) -{ - wxBoxSizer* m_sizer_checkbox = new wxBoxSizer(wxHORIZONTAL); - - m_sizer_checkbox->Add(0, 0, 0, wxEXPAND | wxLEFT, 5); - - checkbox = new ::CheckBoxInWT(parent); - m_sizer_checkbox->Add(checkbox, 0, wxALIGN_CENTER, 0); - m_sizer_checkbox->Add(0, 0, 0, wxEXPAND | wxLEFT, 8); - - auto checkbox_title = new wxStaticText(parent, wxID_ANY, title, wxDefaultPosition, wxSize(-1, -1), 0); - checkbox_title->SetForegroundColour(wxColour(144, 144, 144)); - checkbox_title->SetFont(::Label::Body_13); - checkbox_title->Wrap(-1); - m_sizer_checkbox->Add(checkbox_title, 0, wxALIGN_CENTER | wxALL, 3); - - checkbox->SetValue(true); - - checkbox->Bind(wxEVT_TOGGLEBUTTON, [parent, checkbox, value](wxCommandEvent& e) { - (*value) = (*value) ? false : true; - e.Skip(); - }); - - return m_sizer_checkbox; -} FRF_Calibration_Dlg::FRF_Calibration_Dlg(wxWindow* parent, wxWindowID id, Plater* plater) - : DPIDialog(parent, id, _L("Flowrate Fine Calibration"), wxDefaultPosition, parent->FromDIP(wxSize(-1, 280)), wxDEFAULT_DIALOG_STYLE | wxNO_BORDER), m_plater(plater) + : DPIDialog(parent, id, _L("Flowrate Fine Calibration"), wxDefaultPosition, wxSize(-1, 280), wxDEFAULT_DIALOG_STYLE | wxNO_BORDER), m_plater(plater) { wxBoxSizer* v_sizer = new wxBoxSizer(wxVERTICAL); SetSizer(v_sizer); - // Settings - auto filament_config = &wxGetApp().preset_bundle->filaments.get_edited_preset().config; - wxString start_length_str = _L("Extrusion Multiplier: "); - auto text_size = wxWindow::GetTextExtent(start_length_str); - text_size.x = text_size.x * 1.5; - wxStaticBoxSizer *settings_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _L("Settings")); + // desc + std::string setting_desc_message = _u8L("Please input the best value from the coarse calibration to further determine a more accurate extrusion multiplier."); + auto setting_desc = new wxStaticText(this, wxID_ANY, setting_desc_message, wxDefaultPosition, wxSize(340, -1), wxALIGN_LEFT); + setting_desc->Wrap(setting_desc->GetClientSize().x); + v_sizer->Add(setting_desc, 0, wxTOP | wxRIGHT | wxLEFT | wxALIGN_CENTER_VERTICAL, 15); - auto st_size = FromDIP(wxSize(text_size.x, -1)); - auto ti_size = FromDIP(wxSize(90, -1)); - auto desc_size = FromDIP(wxSize(307, -1)); + // Settings + wxStaticBoxSizer *settings_sizer = new wxStaticBoxSizer(wxHORIZONTAL, this, _L("Settings")); + + auto extrusion_multiplier_text = new wxStaticText(this, wxID_ANY, _L("Extrusion Multiplier: "), wxDefaultPosition, wxSize(230, -1), wxALIGN_LEFT); + settings_sizer->Add(extrusion_multiplier_text, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2); // extru - auto multip = filament_config->opt_float("extrusion_multiplier",0); - std::string multip_str = std::to_string(multip); - if (multip_str.find(".") > 0) { - size_t fp = multip_str.rfind("."); - size_t f = multip_str.rfind("0"); - while (f > fp) { - if (f != -1) { - multip_str = multip_str.erase(f); - } - f = multip_str.rfind("0"); - } - fp = multip_str.rfind("."); - if (fp == multip_str.size() - 1) { - multip_str = multip_str.erase(fp); - } - } - auto start_length_sizer = new wxBoxSizer(wxHORIZONTAL); - auto start_length_text = new wxStaticText(this, wxID_ANY, start_length_str, wxDefaultPosition, st_size, wxALIGN_LEFT); - m_tiExtru = new wxTextCtrl(this, wxID_ANY, multip_str, wxDefaultPosition, wxDefaultSize, wxBORDER_SIMPLE); - m_tiExtru->SetValidator(wxTextValidator(wxFILTER_NUMERIC)); + auto filament_config = &wxGetApp().preset_bundle->filaments.get_edited_preset().config; + auto read_extrusion_multiplier = filament_config->opt_float("extrusion_multiplier", 0); + std::stringstream ss; + ss << std::setprecision(2) << read_extrusion_multiplier; + m_tc_extrusion_multiplier = new wxTextCtrl(this, wxID_ANY, ss.str(), wxDefaultPosition, wxSize(100, -1), wxBORDER_SIMPLE); + m_tc_extrusion_multiplier->SetValidator(wxTextValidator(wxFILTER_NUMERIC)); + settings_sizer->Add(m_tc_extrusion_multiplier, 0, wxRIGHT | wxALIGN_RIGHT, 0); - // desc - auto setting_desc = new wxStaticText(this, wxID_ANY, _u8L("Please input the best value from the coarse calibration to further determine a more accurate extrusion multiplier."), - wxDefaultPosition, desc_size, wxALIGN_LEFT); - setting_desc->Wrap(setting_desc->GetClientSize().x); - - // delay - start_length_sizer->Add(start_length_text, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2); - start_length_sizer->Add(m_tiExtru, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2); - settings_sizer->Add(start_length_sizer); - v_sizer->Add(setting_desc, 0, wxTOP | wxRIGHT | wxLEFT | wxALIGN_CENTER_VERTICAL, 15); - //v_sizer->Add(0, FromDIP(10), 0, wxEXPAND, 5); v_sizer->Add(settings_sizer, 0, wxTOP | wxRIGHT | wxLEFT | wxALIGN_CENTER_VERTICAL, 15); - v_sizer->Add(0, FromDIP(5), 0, wxEXPAND, 5); - m_btnStart = new wxButton(this, wxID_OK, _L("OK")); + v_sizer->Add(0, 5, 0, wxEXPAND, 5); + + m_btnStart = new wxButton(this, wxID_ANY, _L("OK")); m_btnStart->Bind(wxEVT_BUTTON, &FRF_Calibration_Dlg::on_start, this); v_sizer->Add(m_btnStart, 0, wxRIGHT | wxALIGN_RIGHT, 15); - v_sizer->Add(0, FromDIP(8), 0, wxEXPAND, 5); + v_sizer->Add(0, 8, 0, wxEXPAND, 5); m_btnStart->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FRF_Calibration_Dlg::on_start), NULL, this); @@ -106,22 +60,22 @@ FRF_Calibration_Dlg::~FRF_Calibration_Dlg() { void FRF_Calibration_Dlg::on_start(wxCommandEvent& event) { bool read_double = false; - read_double = m_tiExtru->GetValue().ToDouble(&m_params.start); + double target_extrusion_multiplier; + read_double = m_tc_extrusion_multiplier->GetValue().ToDouble(&target_extrusion_multiplier); - if (!read_double || m_params.start < 0.9) { - MessageDialog msg_dlg(nullptr, _L("Please input valid values:\n 0.9 <= Extrusion Multiplier <= 1.1\n"), wxEmptyString, wxICON_WARNING | wxOK); + if (!read_double || target_extrusion_multiplier < 0.5) { + MessageDialog msg_dlg(nullptr, _L("Please input valid values:\n 0.5 <= Extrusion Multiplier <= 1.5\n"), wxEmptyString, wxICON_WARNING | wxOK); msg_dlg.ShowModal(); - m_tiExtru->SetValue("0.9"); + m_tc_extrusion_multiplier->SetValue("0.5"); return; - } else if (!read_double || m_params.start > 1.1) { - MessageDialog msg_dlg(nullptr, _L("Please input valid values:\n 0.9 <= Extrusion Multiplier <= 1.1\n"), wxEmptyString, wxICON_WARNING | wxOK); + } else if (!read_double || target_extrusion_multiplier > 1.5) { + MessageDialog msg_dlg(nullptr, _L("Please input valid values:\n 0.5 <= Extrusion Multiplier <= 1.5\n"), wxEmptyString, wxICON_WARNING | wxOK); msg_dlg.ShowModal(); - m_tiExtru->SetValue("1.1"); + m_tc_extrusion_multiplier->SetValue("1.5"); return; } - m_params.mode = CalibMode::Calib_FRF; - m_plater->calib_flowrate_fine(m_params); + m_plater->calib_flowrate_fine(target_extrusion_multiplier); EndModal(wxID_OK); } @@ -131,83 +85,62 @@ void FRF_Calibration_Dlg::on_dpi_changed(const wxRect& suggested_rect) { } PA_Calibration_Dlg::PA_Calibration_Dlg(wxWindow* parent, wxWindowID id, Plater* plater) - : DPIDialog(parent, id, _L("Pressure Advance Calibration"), wxDefaultPosition, parent->FromDIP(wxSize(-1, 280)), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER), m_plater(plater) + : DPIDialog(parent, id, _L("Pressure Advance Calibration"), wxDefaultPosition, wxSize(-1, 280), wxDEFAULT_DIALOG_STYLE | wxNO_BORDER), m_plater(plater) { wxBoxSizer* v_sizer = new wxBoxSizer(wxVERTICAL); SetSizer(v_sizer); - wxBoxSizer* choice_sizer = new wxBoxSizer(wxHORIZONTAL); - choice_sizer->Add(FromDIP(5), 0, 0, wxEXPAND, 5); - wxString m_rbMethodChoices[] = { _L("PA Line"), _L("PA Pattern"), _L("PA Tower") }; - int m_rbMethodNChoices = sizeof(m_rbMethodChoices) / sizeof(wxString); - m_rbMethod = new wxRadioBox(this, wxID_ANY, _L("Method"), wxDefaultPosition, wxDefaultSize, m_rbMethodNChoices, m_rbMethodChoices, 1, wxRA_SPECIFY_COLS); - m_rbMethod->SetSelection(0); - choice_sizer->Add(m_rbMethod, 0, wxALL, 5); - - v_sizer->Add(choice_sizer); + wxString m_rbMethodChoices[] = { _L("PA Line"), _L("PA Pattern"), _L("PA Tower") }; + int m_rbMethodNChoices = sizeof(m_rbMethodChoices) / sizeof(wxString); + m_rbMethod = new wxRadioBox(this, wxID_ANY, _L("Method"), wxDefaultPosition, wxDefaultSize, m_rbMethodNChoices, m_rbMethodChoices, 1, wxRA_SPECIFY_COLS); + m_rbMethod->SetSelection(0); + v_sizer->Add(m_rbMethod, 0, wxRIGHT | wxLEFT | wxALIGN_CENTER_VERTICAL, 15); // Settings - // - wxString start_pa_str = _L("Start PA: "); - wxString end_pa_str = _L("End PA: "); - wxString PA_step_str = _L("PA step: "); - auto text_size = wxWindow::GetTextExtent(start_pa_str); - text_size.IncTo(wxWindow::GetTextExtent(end_pa_str)); - text_size.IncTo(wxWindow::GetTextExtent(PA_step_str)); - text_size.x = text_size.x * 1.5; - wxStaticBoxSizer* settings_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _L("Settings")); + wxStaticBoxSizer* settings_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _L("Settings")); - auto st_size = FromDIP(wxSize(text_size.x, -1)); - auto ti_size = FromDIP(wxSize(90, -1)); // start PA auto start_PA_sizer = new wxBoxSizer(wxHORIZONTAL); - auto start_pa_text = new wxStaticText(this, wxID_ANY, start_pa_str, wxDefaultPosition, st_size, wxALIGN_LEFT); - m_tiStartPA = new TextInput(this, "", "", "", wxDefaultPosition, ti_size, wxTE_CENTRE | wxTE_PROCESS_ENTER); - m_tiStartPA->GetTextCtrl()->SetValidator(wxTextValidator(wxFILTER_NUMERIC)); + auto start_pa_text = new wxStaticText(this, wxID_ANY, _L("Start PA: "), wxDefaultPosition, wxSize(80, -1), wxALIGN_LEFT); + start_PA_sizer->Add(start_pa_text, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2); - start_PA_sizer->Add(start_pa_text, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2); - start_PA_sizer->Add(m_tiStartPA, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2); + m_tcStartPA = new wxTextCtrl(this, wxID_ANY, "0", wxDefaultPosition, wxSize(100, -1), wxBORDER_SIMPLE); + m_tcStartPA->SetValidator(wxTextValidator(wxFILTER_NUMERIC)); + start_PA_sizer->Add(m_tcStartPA, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2); settings_sizer->Add(start_PA_sizer); // end PA auto end_PA_sizer = new wxBoxSizer(wxHORIZONTAL); - auto end_pa_text = new wxStaticText(this, wxID_ANY, end_pa_str, wxDefaultPosition, st_size, wxALIGN_LEFT); - m_tiEndPA = new TextInput(this, "", "", "", wxDefaultPosition, ti_size, wxTE_CENTRE | wxTE_PROCESS_ENTER); - m_tiStartPA->GetTextCtrl()->SetValidator(wxTextValidator(wxFILTER_NUMERIC)); + auto end_pa_text = new wxStaticText(this, wxID_ANY, _L("End PA: "), wxDefaultPosition, wxSize(80, -1), wxALIGN_LEFT); end_PA_sizer->Add(end_pa_text, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2); - end_PA_sizer->Add(m_tiEndPA, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2); + + m_tcEndPA = new wxTextCtrl(this, wxID_ANY, "0.04", wxDefaultPosition, wxSize(100, -1), wxBORDER_SIMPLE); + m_tcStartPA->SetValidator(wxTextValidator(wxFILTER_NUMERIC)); + end_PA_sizer->Add(m_tcEndPA, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2); settings_sizer->Add(end_PA_sizer); // PA step auto PA_step_sizer = new wxBoxSizer(wxHORIZONTAL); - auto PA_step_text = new wxStaticText(this, wxID_ANY, PA_step_str, wxDefaultPosition, st_size, wxALIGN_LEFT); - m_tiPAStep = new TextInput(this, "", "", "", wxDefaultPosition, ti_size, wxTE_CENTRE | wxTE_PROCESS_ENTER); - m_tiStartPA->GetTextCtrl()->SetValidator(wxTextValidator(wxFILTER_NUMERIC)); + auto PA_step_text = new wxStaticText(this, wxID_ANY, _L("PA step: "), wxDefaultPosition, wxSize(80, -1), wxALIGN_LEFT); PA_step_sizer->Add(PA_step_text, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2); - PA_step_sizer->Add(m_tiPAStep, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2); + + m_tcPAStep = new wxTextCtrl(this, wxID_ANY, "0.002", wxDefaultPosition, wxSize(100, -1), wxBORDER_SIMPLE); + m_tcStartPA->SetValidator(wxTextValidator(wxFILTER_NUMERIC)); + PA_step_sizer->Add(m_tcPAStep, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2); settings_sizer->Add(PA_step_sizer); - v_sizer->Add(settings_sizer); - v_sizer->Add(0, FromDIP(10), 0, wxEXPAND, 5); - m_btnStart = new Button(this, _L("OK")); - StateColor btn_bg_green(std::pair(wxColour(51, 91, 188), StateColor::Pressed), - std::pair(wxColour(51, 109, 251), StateColor::Hovered), - std::pair(wxColour(68, 121, 251), StateColor::Normal)); + v_sizer->Add(0, 5, 0, wxEXPAND, 5); + v_sizer->Add(settings_sizer, 0, wxRIGHT | wxLEFT | wxALIGN_CENTER_VERTICAL, 15); + v_sizer->Add(0, 5, 0, wxEXPAND, 5); - m_btnStart->SetBackgroundColor(btn_bg_green); - m_btnStart->SetBorderColor(wxColour(0, 150, 136)); - m_btnStart->SetTextColor(wxColour("#FFFFFE")); - m_btnStart->SetSize(wxSize(FromDIP(48), FromDIP(24))); - m_btnStart->SetMinSize(wxSize(FromDIP(48), FromDIP(24))); - m_btnStart->SetCornerRadius(FromDIP(3)); - m_btnStart->Bind(wxEVT_BUTTON, &PA_Calibration_Dlg::on_start, this); - v_sizer->Add(m_btnStart, 0, wxALL | wxALIGN_RIGHT, FromDIP(5)); + m_btnStart = new wxButton(this, wxID_ANY, _L("OK")); + m_btnStart->Bind(wxEVT_BUTTON, &PA_Calibration_Dlg::on_start, this); + v_sizer->Add(m_btnStart, 0, wxRIGHT | wxALIGN_RIGHT, 15); + v_sizer->Add(0, 8, 0, wxEXPAND, 5); - PA_Calibration_Dlg::reset_params(); - - // Connect Events m_rbMethod->Connect(wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler(PA_Calibration_Dlg::on_method_changed), NULL, this); - this->Connect(wxEVT_SHOW, wxShowEventHandler(PA_Calibration_Dlg::on_show)); + m_btnStart->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PA_Calibration_Dlg::on_start), NULL, this); + wxGetApp().UpdateDlgDarkUI(this); Layout(); Fit(); @@ -219,58 +152,40 @@ PA_Calibration_Dlg::~PA_Calibration_Dlg() { m_btnStart->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PA_Calibration_Dlg::on_start), NULL, this); } -void PA_Calibration_Dlg::reset_params() { - int method = m_rbMethod->GetSelection(); - - m_tiStartPA->GetTextCtrl()->SetValue(wxString::FromDouble(0.0)); - - switch (method) { - case 1: - m_params.mode = CalibMode::Calib_PA_Pattern; - m_tiEndPA->GetTextCtrl()->SetValue(wxString::FromDouble(0.08)); - m_tiPAStep->GetTextCtrl()->SetValue(wxString::FromDouble(0.005)); - break; - case 2: - m_params.mode = CalibMode::Calib_PA_Tower; - m_tiEndPA->GetTextCtrl()->SetValue(wxString::FromDouble(0.1)); - m_tiPAStep->GetTextCtrl()->SetValue(wxString::FromDouble(0.002)); - break; - default: - m_params.mode = CalibMode::Calib_PA_Line; - m_tiEndPA->GetTextCtrl()->SetValue(wxString::FromDouble(0.1)); - m_tiPAStep->GetTextCtrl()->SetValue(wxString::FromDouble(0.002)); - break; - } -} - void PA_Calibration_Dlg::on_start(wxCommandEvent& event) { bool read_double = false; - read_double = m_tiStartPA->GetTextCtrl()->GetValue().ToDouble(&m_params.start); - read_double = read_double && m_tiEndPA->GetTextCtrl()->GetValue().ToDouble(&m_params.end); - read_double = read_double && m_tiPAStep->GetTextCtrl()->GetValue().ToDouble(&m_params.step); - if (!read_double || m_params.start < 0 || m_params.step < EPSILON || m_params.end < m_params.start + m_params.step) { - MessageDialog msg_dlg(nullptr, _L("Please input valid values:\nStart PA: >= 0.0\nEnd PA: > Start PA\nPA step: >= 0.001)"), wxEmptyString, wxICON_WARNING | wxOK); + double start_pa; + double end_pa; + double pa_step; + read_double = m_tcStartPA->GetValue().ToDouble(&start_pa); + read_double = read_double && m_tcEndPA->GetValue().ToDouble(&end_pa); + read_double = read_double && m_tcPAStep->GetValue().ToDouble(&pa_step); + if (!read_double || start_pa < 0 || pa_step < EPSILON || end_pa < start_pa + pa_step) { + MessageDialog msg_dlg(nullptr, _L("Please input valid values:\nStart PA: >= 0.0\nEnd PA: > Start PA + PA step\nPA step: >= 0.001)"), wxEmptyString, wxICON_WARNING | wxOK); msg_dlg.ShowModal(); return; } switch (m_rbMethod->GetSelection()) { - case 1: - m_params.mode = CalibMode::Calib_PA_Pattern; + case 0:{ + m_plater->calib_pa_line( start_pa, end_pa, pa_step); break; - case 2: - m_params.mode = CalibMode::Calib_PA_Tower; + } + case 1:{ + m_plater->calib_pa_pattern( start_pa, end_pa, pa_step); break; - default: - m_params.mode = CalibMode::Calib_PA_Line; + } + case 2:{ + m_plater->calib_pa_tower( start_pa, end_pa, pa_step); + break; + } + default: break; } - m_plater->calib_pa(m_rbMethod->GetSelection(), m_tiStartPA->GetTextCtrl()->GetValue(), m_tiEndPA->GetTextCtrl()->GetValue(), m_tiPAStep->GetTextCtrl()->GetValue()); EndModal(wxID_OK); } void PA_Calibration_Dlg::on_method_changed(wxCommandEvent& event) { - PA_Calibration_Dlg::reset_params(); event.Skip(); } @@ -279,8 +194,4 @@ void PA_Calibration_Dlg::on_dpi_changed(const wxRect& suggested_rect) { Fit(); } -void PA_Calibration_Dlg::on_show(wxShowEvent& event) { - PA_Calibration_Dlg::reset_params(); -} - }} // namespace Slic3r::GUI diff --git a/src/slic3r/GUI/calib_dlg.hpp b/src/slic3r/GUI/calib_dlg.hpp index 3f31340..9eb9a36 100644 --- a/src/slic3r/GUI/calib_dlg.hpp +++ b/src/slic3r/GUI/calib_dlg.hpp @@ -13,7 +13,6 @@ #include "GUI_App.hpp" #include "wx/hyperlink.h" #include -#include "libslic3r/calib.hpp" #include "Plater.hpp" namespace Slic3r { namespace GUI { @@ -27,11 +26,10 @@ public: protected: virtual void on_start(wxCommandEvent &event); - Calib_Params m_params; - wxTextCtrl *m_tiExtru; - wxButton * m_btnStart; - Plater * m_plater; + wxTextCtrl* m_tc_extrusion_multiplier; + wxButton* m_btnStart; + Plater* m_plater; }; class PA_Calibration_Dlg : public DPIDialog @@ -40,20 +38,17 @@ public: PA_Calibration_Dlg(wxWindow* parent, wxWindowID id, Plater* plater); ~PA_Calibration_Dlg(); void on_dpi_changed(const wxRect& suggested_rect) override; - void on_show(wxShowEvent& event); -protected: - void reset_params(); - virtual void on_start(wxCommandEvent& event); - virtual void on_method_changed(wxCommandEvent& event); protected: - Calib_Params m_params; - wxRadioBox* m_rbMethod; - TextInput* m_tiStartPA; - TextInput* m_tiEndPA; - TextInput* m_tiPAStep; - Button* m_btnStart; - Plater* m_plater; + virtual void on_start(wxCommandEvent& event); + virtual void on_method_changed(wxCommandEvent& event); + + wxRadioBox* m_rbMethod; + wxTextCtrl* m_tcStartPA; + wxTextCtrl* m_tcEndPA; + wxTextCtrl* m_tcPAStep; + wxButton* m_btnStart; + Plater* m_plater; }; }} // namespace Slic3r::GUI