3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-13 09:47:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

FIX: thumbnail: fix the thumbnail wrongly clip issue

Browse source 
Change-Id: I0f2040b8263aa3ea5c82278eabc8e6d0845bfa73
This commit is contained in:
lane.wei 2023-07-22 18:16:13 +08:00 • committed by Lane.Wei
parent 387f8838f2
commit 0fc5c074cf
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -5561,7 +5561,7 @@ void GLCanvas3D::render_thumbnail_internal(ThumbnailData& thumbnail_data, const
//camera.select_view("top"); //camera.select_view("top");
} }
else { else {
camera.zoom_to_box(volumes_box); //camera.zoom_to_box(volumes_box);
//const Vec3d& target = camera.get_target(); //const Vec3d& target = camera.get_target();
//double distance = camera.get_distance(); //double distance = camera.get_distance();
@ -5569,6 +5569,7 @@ void GLCanvas3D::render_thumbnail_internal(ThumbnailData& thumbnail_data, const
//BBS: use original iso view for thumbnail //BBS: use original iso view for thumbnail
camera.select_view("iso"); camera.select_view("iso");
camera.zoom_to_box(volumes_box);
} }
camera.apply_view_matrix(); camera.apply_view_matrix();
@ -6128,7 +6129,7 @@ bool GLCanvas3D::_init_main_toolbar()
item.tooltip = _utf8(L("Split to objects")); item.tooltip = _utf8(L("Split to objects"));
item.sprite_id++; item.sprite_id++;
item.left.render_callback = nullptr; item.left.render_callback = nullptr;
item.left.action_callback = [this]() { item.left.action_callback = [this]() {
if (m_canvas != nullptr) { if (m_canvas != nullptr) {
wxPostEvent(m_canvas, SimpleEvent(EVT_GLTOOLBAR_SPLIT_OBJECTS)); wxPostEvent(m_canvas, SimpleEvent(EVT_GLTOOLBAR_SPLIT_OBJECTS));
NetworkAgent* agent = GUI::wxGetApp().getAgent(); NetworkAgent* agent = GUI::wxGetApp().getAgent();
@ -6144,7 +6145,7 @@ bool GLCanvas3D::_init_main_toolbar()
item.icon_filename = m_is_dark ? "split_parts_dark.svg" : "split_parts.svg"; item.icon_filename = m_is_dark ? "split_parts_dark.svg" : "split_parts.svg";
item.tooltip = _utf8(L("Split to parts")); item.tooltip = _utf8(L("Split to parts"));
item.sprite_id++; item.sprite_id++;
item.left.action_callback = [this]() { item.left.action_callback = [this]() {
if (m_canvas != nullptr) { if (m_canvas != nullptr) {
wxPostEvent(m_canvas, SimpleEvent(EVT_GLTOOLBAR_SPLIT_VOLUMES)); wxPostEvent(m_canvas, SimpleEvent(EVT_GLTOOLBAR_SPLIT_VOLUMES));
NetworkAgent* agent = GUI::wxGetApp().getAgent(); NetworkAgent* agent = GUI::wxGetApp().getAgent();
@ -6160,7 +6161,7 @@ bool GLCanvas3D::_init_main_toolbar()
item.icon_filename = m_is_dark ? "toolbar_variable_layer_height_dark.svg" : "toolbar_variable_layer_height.svg"; item.icon_filename = m_is_dark ? "toolbar_variable_layer_height_dark.svg" : "toolbar_variable_layer_height.svg";
item.tooltip = _utf8(L("Variable layer height")); item.tooltip = _utf8(L("Variable layer height"));
item.sprite_id++; item.sprite_id++;
item.left.action_callback = [this]() { item.left.action_callback = [this]() {
if (m_canvas != nullptr) { if (m_canvas != nullptr) {
wxPostEvent(m_canvas, SimpleEvent(EVT_GLTOOLBAR_LAYERSEDITING)); wxPostEvent(m_canvas, SimpleEvent(EVT_GLTOOLBAR_LAYERSEDITING));
NetworkAgent* agent = GUI::wxGetApp().getAgent(); NetworkAgent* agent = GUI::wxGetApp().getAgent();
@ -6269,7 +6270,7 @@ bool GLCanvas3D::_init_assemble_view_toolbar()
item.tooltip = _utf8(L("Assembly View")); item.tooltip = _utf8(L("Assembly View"));
item.sprite_id = 1; item.sprite_id = 1;
item.left.toggable = false; item.left.toggable = false;
item.left.action_callback = [this]() { item.left.action_callback = [this]() {
if (m_canvas != nullptr) { if (m_canvas != nullptr) {
wxPostEvent(m_canvas, SimpleEvent(EVT_GLVIEWTOOLBAR_ASSEMBLE)); m_gizmos.reset_all_states(); wxGetApp().plater()->get_assmeble_canvas3D()->get_gizmos_manager().reset_all_states(); wxPostEvent(m_canvas, SimpleEvent(EVT_GLVIEWTOOLBAR_ASSEMBLE)); m_gizmos.reset_all_states(); wxGetApp().plater()->get_assmeble_canvas3D()->get_gizmos_manager().reset_all_states();
NetworkAgent* agent = GUI::wxGetApp().getAgent(); NetworkAgent* agent = GUI::wxGetApp().getAgent();
@ -8949,9 +8950,9 @@ std::vector<std::array<float, 4>> GLCanvas3D::_parse_colors(const std::vector<st
void GLCanvas3D::_set_warning_notification(EWarning warning, bool state) void GLCanvas3D::_set_warning_notification(EWarning warning, bool state)
{ {
enum ErrorType{ enum ErrorType{
PLATER_WARNING, PLATER_WARNING,
PLATER_ERROR, PLATER_ERROR,
SLICING_SERIOUS_WARNING, SLICING_SERIOUS_WARNING,
SLICING_ERROR SLICING_ERROR
}; };
std::string text; std::string text;