3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small refactoring in Camera::calc_zoom_to_bounding_box_factor

Browse Source
This commit is contained in:
Enrico Turri 2019-11-28 12:14:31 +01:00
parent 0de3704287
commit bd1ee8ee4a
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/slic3r/GUI/Camera.cpp
View File

@ -440,8 +440,10 @@ double Camera::calc_zoom_to_bounding_box_factor(const BoundingBoxf3& box, int ca
vertices.push_back(box.max); vertices.push_back(box.max);
vertices.emplace_back(box.min(0), box.max(1), box.max(2)); vertices.emplace_back(box.min(0), box.max(1), box.max(2));
double max_x = 0.0; double min_x = DBL_MAX;
double max_y = 0.0; double min_y = DBL_MAX;
double max_x = -DBL_MAX;
double max_y = -DBL_MAX;
#if !ENABLE_THUMBNAIL_GENERATOR #if !ENABLE_THUMBNAIL_GENERATOR
// margin factor to give some empty space around the box // margin factor to give some empty space around the box
@ -458,17 +460,24 @@ double Camera::calc_zoom_to_bounding_box_factor(const BoundingBoxf3& box, int ca
double x_on_plane = proj_on_plane.dot(right); double x_on_plane = proj_on_plane.dot(right);
double y_on_plane = proj_on_plane.dot(up); double y_on_plane = proj_on_plane.dot(up);
max_x = std::max(max_x, std::abs(x_on_plane)); min_x = std::min(min_x, x_on_plane);
max_y = std::max(max_y, std::abs(y_on_plane)); min_y = std::min(min_y, y_on_plane);
max_x = std::max(max_x, x_on_plane);
max_y = std::max(max_y, y_on_plane);
} }
if ((max_x == 0.0) || (max_y == 0.0)) double dx = max_x - min_x;
double dy = max_y - min_y;
if ((dx <= 0.0) || (dy <= 0.0))
return -1.0f; return -1.0f;
max_x *= margin_factor; double med_x = 0.5 * (max_x + min_x);
max_y *= margin_factor; double med_y = 0.5 * (max_y + min_y);
return std::min((double)canvas_w / (2.0 * max_x), (double)canvas_h / (2.0 * max_y)); dx *= margin_factor;
dy *= margin_factor;
return std::min((double)canvas_w / dx, (double)canvas_h / dy);
} }
#if ENABLE_THUMBNAIL_GENERATOR #if ENABLE_THUMBNAIL_GENERATOR

2
src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -1079,7 +1079,7 @@ void GLCanvas3D::LegendTexture::fill_color_print_legend_items( const GLCanvas3D
size_t color_pos = 4 * extruders_cnt; size_t color_pos = 4 * extruders_cnt;
size_t color_in_pos = 4 * (color_cnt - 1); size_t color_in_pos = 4 * (color_cnt - 1);
for (unsigned int i = 0; i < extruders_cnt; ++i) for (unsigned int i = 0; i < (unsigned int)extruders_cnt; ++i)
cp_legend_items.push_back((boost::format(I18N::translate_utf8(L("Extruder %d"))) % (i + 1)).str()); cp_legend_items.push_back((boost::format(I18N::translate_utf8(L("Extruder %d"))) % (i + 1)).str());
::memcpy((void*)(colors.data() + color_pos), (const void*)(colors_in.data() + color_in_pos), 4 * sizeof(float)); ::memcpy((void*)(colors.data() + color_pos), (const void*)(colors_in.data() + color_in_pos), 4 * sizeof(float));