mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: Preview slider jump layer and inappropriate log 

Change-Id: I484c52087741a8f5ee4da6bc240c9897e3f94bd3
(cherry picked from commit a2862f87369f78a39caf427a924a756f7115e1b5)
This commit is contained in:
liz.li 2022-12-10 12:58:40 +08:00 committed by Lane.Wei
parent 25484bcba9
commit 6c04bebc3d
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3476,12 +3476,13 @@ void GLCanvas3D::on_mouse_wheel(wxMouseEvent& evt)
evt.SetY(evt.GetY() * scale); evt.SetY(evt.GetY() * scale);
#endif #endif
IMSlider* m_layers_slider = get_gcode_viewer().get_layers_slider();
IMSlider* m_moves_slider = get_gcode_viewer().get_moves_slider();
m_layers_slider->on_mouse_wheel(evt);
m_moves_slider->on_mouse_wheel(evt);
if (wxGetApp().imgui()->update_mouse_data(evt)) { if (wxGetApp().imgui()->update_mouse_data(evt)) {
if (m_canvas_type == CanvasPreview) {
IMSlider* m_layers_slider = get_gcode_viewer().get_layers_slider();
IMSlider* m_moves_slider = get_gcode_viewer().get_moves_slider();
m_layers_slider->on_mouse_wheel(evt);
m_moves_slider->on_mouse_wheel(evt);
}
render(); render();
m_dirty = true; m_dirty = true;
return; return;

6
src/slic3r/GUI/IMSlider.cpp
View File

@ -1366,7 +1366,7 @@ void IMSlider::render_go_to_layer_dialog(){
| ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollbar
| ImGuiWindowFlags_NoScrollWithMouse; | ImGuiWindowFlags_NoScrollWithMouse;
imgui.begin(_u8L("Jump to layer"), windows_flag); imgui.begin(_u8L("Jump to layer"), windows_flag);
imgui.text(_u8L("Please enter the layer number") + " (" + std::to_string(m_min_value) + " - " + std::to_string(m_max_value) + "):"); imgui.text(_u8L("Please enter the layer number") + " (" + std::to_string(m_min_value + 1) + " - " + std::to_string(m_max_value + 1) + "):");
if (ImGui::IsMouseClicked(0)) { if (ImGui::IsMouseClicked(0)) {
set_focus = false; set_focus = false;
} }
@ -1385,7 +1385,7 @@ void IMSlider::render_go_to_layer_dialog(){
for (size_t i = 0; i< strlen(m_layer_number); i++) for (size_t i = 0; i< strlen(m_layer_number); i++)
if (!isdigit(m_layer_number[i])) if (!isdigit(m_layer_number[i]))
disable_button = true; disable_button = true;
if (!disable_button && (m_min_value > atoi(m_layer_number) || atoi(m_layer_number) > m_max_value)) if (!disable_button && (m_min_value > atoi(m_layer_number) - 1 || atoi(m_layer_number) - 1 > m_max_value))
disable_button = true; disable_button = true;
} }
if (disable_button) { if (disable_button) {
@ -1393,7 +1393,7 @@ void IMSlider::render_go_to_layer_dialog(){
imgui.push_button_disable_style(); imgui.push_button_disable_style();
} }
if (imgui.bbl_button(_L("OK")) || (!disable_button && ImGui::IsKeyDown(ImGui::GetKeyIndex(ImGuiKey_Enter)))) { if (imgui.bbl_button(_L("OK")) || (!disable_button && ImGui::IsKeyDown(ImGui::GetKeyIndex(ImGuiKey_Enter)))) {
do_go_to_layer(atoi(m_layer_number)); do_go_to_layer(atoi(m_layer_number) - 1);
m_show_go_to_layer_dialog = false; m_show_go_to_layer_dialog = false;
move_to_center = true; move_to_center = true;
set_focus = true; set_focus = true;