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

Replace bed_center() with m_starting_point

Browse Source
This commit is contained in:
thewildmage
2023-06-28 12:58:29 -06:00
parent 719f9c27c4
commit ca04dea567
2 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/libslic3r/calib.cpp
View File

@@ -731,20 +731,6 @@ double CalibPressureAdvancePattern::get_distance(Vec2d from, Vec2d to)
return std::hypot((to.x() - from.x()), (to.y() - from.y())); return std::hypot((to.x() - from.x()), (to.y() - from.y()));
} }
Vec2d CalibPressureAdvancePattern::bed_center()
{
BoundingBoxf bed_ext = get_extents(m_config.printable_area.values);
if (is_delta()) {
delta_scale_bed_ext(bed_ext);
}
double center_x = bed_ext.size().x() / 2;
double center_y = bed_ext.size().y() / 2;
return Vec2d(center_x, center_y);
}
double CalibPressureAdvancePattern::object_size_x() double CalibPressureAdvancePattern::object_size_x()
{ {
return get_num_patterns() * ((m_wall_count - 1) * line_spacing_angle()) + return get_num_patterns() * ((m_wall_count - 1) * line_spacing_angle()) +
@@ -765,8 +751,7 @@ double CalibPressureAdvancePattern::object_size_y()
double CalibPressureAdvancePattern::glyph_start_x() double CalibPressureAdvancePattern::glyph_start_x()
{ {
return return
bed_center().x() - m_starting_point.x() +
object_size_x() / 2 +
(((m_wall_count - 1) / 2) * line_spacing_angle() - 2) (((m_wall_count - 1) / 2) * line_spacing_angle() - 2)
; ;
} }
@@ -774,8 +759,7 @@ double CalibPressureAdvancePattern::glyph_start_x()
double CalibPressureAdvancePattern::glyph_end_x() double CalibPressureAdvancePattern::glyph_end_x()
{ {
return return
bed_center().x() - m_starting_point.x() +
object_size_x() / 2 +
(get_num_patterns() - 1) * (m_pattern_spacing + line_width()) + (get_num_patterns() - 1) * (m_pattern_spacing + line_width()) +
(get_num_patterns() - 1) * ((m_wall_count - 1) * line_spacing_angle()) + (get_num_patterns() - 1) * ((m_wall_count - 1) * line_spacing_angle()) +
4 4
@@ -813,8 +797,7 @@ double CalibPressureAdvancePattern::max_numbering_height()
double CalibPressureAdvancePattern::pattern_shift() double CalibPressureAdvancePattern::pattern_shift()
{ {
auto shift = auto shift =
bed_center().x() - m_starting_point.x() -
object_size_x() / 2 -
glyph_start_x() + glyph_start_x() +
m_glyph_padding_horizontal m_glyph_padding_horizontal
; ;

1
src/libslic3r/calib.hpp
View File

@@ -228,7 +228,6 @@ private:
double line_spacing_anchor() { return line_width_anchor() - m_height_first_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 line_spacing_angle() { return line_spacing() / std::sin(to_radians(m_corner_angle) / 2); };
Vec2d bed_center();
double object_size_x(); double object_size_x();
double object_size_y(); double object_size_y();
double frame_size_y() { return std::sin(to_radians(double(m_corner_angle) / 2)) * m_wall_side_length * 2; }; double frame_size_y() { return std::sin(to_radians(double(m_corner_angle) / 2)) * m_wall_side_length * 2; };