3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-03-10 13:27:07 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

FIX: add images for filament load steps

Browse source 
jira: [STUDIO-9850]
Change-Id: Ie3f3dfbda3d7bc2e1e8c8bab4c9a5f2168536e53
(cherry picked from commit 89efa6cb272e11a0ee79f9713b537ff68009e44f)
This commit is contained in:
xin.zhang 2025-02-11 11:29:41 +08:00 • committed by Noisyfox
parent 0e1a930e10
commit 6d04854a98
9 changed files with 49 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/slic3r/GUI/StatusPanel.cpp
View file

@ -1843,10 +1843,18 @@ wxBoxSizer* StatusBasePanel::create_filament_group(wxWindow* parent)
m_filament_step = new FilamentLoad(m_filament_load_box, wxID_ANY);
m_filament_step->SetDoubleBuffered(true);
m_filament_step->set_min_size(wxSize(wxSize(FromDIP(570), FromDIP(215))));
m_filament_step->set_max_size(wxSize(wxSize(FromDIP(570), FromDIP(215))));
m_filament_step->set_min_size(wxSize(wxSize(FromDIP(300), FromDIP(215))));
m_filament_step->set_max_size(wxSize(wxSize(FromDIP(300), FromDIP(215))));
m_filament_step->SetBackgroundColour(*wxWHITE);
m_filament_load_img = new wxStaticBitmap(m_filament_load_box, wxID_ANY, wxNullBitmap);
m_filament_load_img->SetBackgroundColour(*wxWHITE);
wxBoxSizer *steps_sizer = new wxBoxSizer(wxHORIZONTAL);
steps_sizer->Add(m_filament_step, 0, wxALIGN_LEFT, FromDIP(20));
steps_sizer->Add(m_filament_load_img, 0, wxALIGN_TOP, FromDIP(30));
steps_sizer->AddSpacer(FromDIP(50));
StateColor btn_bd_white(std::pair<wxColour, int>(wxColour(255, 255, 254), StateColor::Disabled), std::pair<wxColour, int>(wxColour(38, 46, 48), StateColor::Enabled));
StateColor btn_text_white(std::pair<wxColour, int>(wxColour(255, 255, 254), StateColor::Disabled), std::pair<wxColour, int>(wxColour(38, 46, 48), StateColor::Enabled));
StateColor btn_bg_white(std::pair<wxColour, int>(AMS_CONTROL_DISABLE_COLOUR, StateColor::Disabled), std::pair<wxColour, int>(AMS_CONTROL_DISABLE_COLOUR, StateColor::Pressed),
@ -1867,7 +1875,7 @@ wxBoxSizer* StatusBasePanel::create_filament_group(wxWindow* parent)
});
sizer_box->Add(m_filament_step, 0, wxALIGN_CENTER|wxTOP, FromDIP(10));
sizer_box->Add(steps_sizer, 0, wxALIGN_CENTER | wxTOP, FromDIP(10));
sizer_box->Add(0, 0, 0, wxTOP, FromDIP(5));
sizer_box->Add(m_button_retry, 0, wxLEFT, FromDIP(28));
sizer_box->Add(0, 0, 0, wxTOP, FromDIP(10));
@ -1890,6 +1898,35 @@ void StatusBasePanel::expand_filament_loading(wxMouseEvent& e)
tag_show = true;
m_img_filament_loading->SetBitmap(create_scaled_bitmap("filament_load_expand", this, 24));
}
if (obj)
{
static int load_img_size = 215;
if (obj->is_series_n())
{
m_filament_load_img->SetBitmap(create_scaled_bitmap("filament_load_n_series", this, load_img_size));
}
else if (obj->is_series_x())
{
m_filament_load_img->SetBitmap(create_scaled_bitmap("filament_load_x_series", this, load_img_size));
}
else if (obj->is_series_p())
{
m_filament_load_img->SetBitmap(create_scaled_bitmap("filament_load_p_series", this, load_img_size));
}
else if (obj->is_series_o())
{
if (obj->get_current_extruder().id == MAIN_NOZZLE_ID)
{
m_filament_load_img->SetBitmap(create_scaled_bitmap("filament_load_o_series_right", this, load_img_size));
}
else if (obj->get_current_extruder().id == DEPUTY_NOZZLE_ID)
{
m_filament_load_img->SetBitmap(create_scaled_bitmap("filament_load_o_series_left", this, load_img_size));
}
}
}
m_filament_load_box->Show(tag_show);
///m_button_retry->Show(tag_show);
m_filament_step->Show(tag_show);