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

FIX: wipetower position problem 

jira: STUDIO-4914

Change-Id: I7b05d3c53931ed8ce3d4603ff21ee6ef675611e5
This commit is contained in:
liz.li 2023-10-30 19:47:57 +08:00 committed by Lane.Wei
parent 05a5098b7c
commit d7283d48a1
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7551,6 +7551,7 @@ void GLCanvas3D::_render_imgui_select_plate_toolbar()
m_sel_plate_toolbar.m_items[i]->selected = false; m_sel_plate_toolbar.m_items[i]->selected = false;
} }
all_plates_stats_item->selected = true; all_plates_stats_item->selected = true;
wxGetApp().plater()->update(true, true);
wxCommandEvent evt = wxCommandEvent(EVT_GLTOOLBAR_SLICE_ALL); wxCommandEvent evt = wxCommandEvent(EVT_GLTOOLBAR_SLICE_ALL);
wxPostEvent(wxGetApp().plater(), evt); wxPostEvent(wxGetApp().plater(), evt);
} }
@ -7635,6 +7636,8 @@ void GLCanvas3D::_render_imgui_select_plate_toolbar()
all_plates_stats_item->selected = false; all_plates_stats_item->selected = false;
item->selected = true; item->selected = true;
// begin to slicing plate // begin to slicing plate
if (item->slice_state != IMToolbarItem::SliceState::SLICED)
wxGetApp().plater()->update(true, true);
wxCommandEvent* evt = new wxCommandEvent(EVT_GLTOOLBAR_SELECT_SLICED_PLATE); wxCommandEvent* evt = new wxCommandEvent(EVT_GLTOOLBAR_SELECT_SLICED_PLATE);
evt->SetInt(i); evt->SetInt(i);
wxQueueEvent(wxGetApp().plater(), evt); wxQueueEvent(wxGetApp().plater(), evt);

4
src/slic3r/GUI/MainFrame.cpp
View File

@ -601,7 +601,7 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, BORDERLESS_FRAME_
} }
return;} return;}
#endif #endif
if (evt.CmdDown() && evt.GetKeyCode() == 'R') { if (m_slice_enable) { wxPostEvent(m_plater, SimpleEvent(EVT_GLTOOLBAR_SLICE_PLATE)); this->m_tabpanel->SetSelection(tpPreview); } return; } if (evt.CmdDown() && evt.GetKeyCode() == 'R') { if (m_slice_enable) { wxGetApp().plater()->update(true, true); wxPostEvent(m_plater, SimpleEvent(EVT_GLTOOLBAR_SLICE_PLATE)); this->m_tabpanel->SetSelection(tpPreview); } return; }
if (evt.CmdDown() && evt.ShiftDown() && evt.GetKeyCode() == 'G') { if (evt.CmdDown() && evt.ShiftDown() && evt.GetKeyCode() == 'G') {
m_plater->apply_background_progress(); m_plater->apply_background_progress();
m_print_enable = get_enable_print_status(); m_print_enable = get_enable_print_status();
@ -1563,7 +1563,7 @@ wxBoxSizer* MainFrame::create_side_tools()
m_slice_btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent& event) m_slice_btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent& event)
{ {
//this->m_plater->select_view_3D("Preview"); //this->m_plater->select_view_3D("Preview");
m_plater->update(false, true); m_plater->update(true, true);
if (m_slice_select == eSliceAll) if (m_slice_select == eSliceAll)
wxPostEvent(m_plater, SimpleEvent(EVT_GLTOOLBAR_SLICE_ALL)); wxPostEvent(m_plater, SimpleEvent(EVT_GLTOOLBAR_SLICE_ALL));
else else