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

ENH:dynamic display of AUX fan 

Change-Id: Ib2b5578567eaa6fde15fdb54bdf24063b627d2d7
This commit is contained in:
tao wang 2023-08-14 19:46:43 +08:00 committed by Lane.Wei
parent 7a7a9f4296
commit 23dc1ec960
6 changed files with 72 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2614,6 +2614,9 @@ bool MachineObject::is_function_supported(PrinterFunction func)
case FUNC_CHAMBER_FAN: case FUNC_CHAMBER_FAN:
func_name = "FUNC_CHAMBER_FAN"; func_name = "FUNC_CHAMBER_FAN";
break; break;
case FUNC_AUX_FAN:
func_name = "FUNC_AUX_FAN";
break;
case FUNC_EXTRUSION_CALI: case FUNC_EXTRUSION_CALI:
if (!ams_support_virtual_tray) if (!ams_support_virtual_tray)
return false; return false;

1
src/slic3r/GUI/DeviceManager.hpp
View File

@ -76,6 +76,7 @@ enum PrinterFunction {
FUNC_SEND_TO_SDCARD, FUNC_SEND_TO_SDCARD,
FUNC_AUTO_SWITCH_FILAMENT, FUNC_AUTO_SWITCH_FILAMENT,
FUNC_CHAMBER_FAN, FUNC_CHAMBER_FAN,
FUNC_AUX_FAN,
FUNC_EXTRUSION_CALI, FUNC_EXTRUSION_CALI,
FUNC_VIRTUAL_TYAY, FUNC_VIRTUAL_TYAY,
FUNC_PRINT_ALL, FUNC_PRINT_ALL,

55
src/slic3r/GUI/StatusPanel.cpp
View File

@ -106,7 +106,7 @@ static std::vector<std::string> message_containing_done{
#define TASK_BUTTON_SIZE2 (wxSize(-1, FromDIP(24))) #define TASK_BUTTON_SIZE2 (wxSize(-1, FromDIP(24)))
#define Z_BUTTON_SIZE (wxSize(FromDIP(52), FromDIP(52))) #define Z_BUTTON_SIZE (wxSize(FromDIP(52), FromDIP(52)))
#define MISC_BUTTON_PANEL_SIZE (wxSize(FromDIP(136), FromDIP(55))) #define MISC_BUTTON_PANEL_SIZE (wxSize(FromDIP(136), FromDIP(55)))
#define MISC_BUTTON_SIZE (wxSize(FromDIP(66), FromDIP(51))) #define MISC_BUTTON_2FAN_SIZE (wxSize(FromDIP(66), FromDIP(51)))
#define MISC_BUTTON_3FAN_SIZE (wxSize(FromDIP(44), FromDIP(51))) #define MISC_BUTTON_3FAN_SIZE (wxSize(FromDIP(44), FromDIP(51)))
#define TEMP_CTRL_MIN_SIZE (wxSize(FromDIP(122), FromDIP(52))) #define TEMP_CTRL_MIN_SIZE (wxSize(FromDIP(122), FromDIP(52)))
#define AXIS_MIN_SIZE (wxSize(FromDIP(220), FromDIP(220))) #define AXIS_MIN_SIZE (wxSize(FromDIP(220), FromDIP(220)))
@ -1066,8 +1066,8 @@ wxBoxSizer *StatusBasePanel::create_misc_control(wxWindow *parent)
/* create speed control */ /* create speed control */
m_switch_speed = new ImageSwitchButton(parent, m_bitmap_speed_active, m_bitmap_speed); m_switch_speed = new ImageSwitchButton(parent, m_bitmap_speed_active, m_bitmap_speed);
m_switch_speed->SetLabels(_L("100%"), _L("100%")); m_switch_speed->SetLabels(_L("100%"), _L("100%"));
m_switch_speed->SetMinSize(MISC_BUTTON_SIZE); m_switch_speed->SetMinSize(MISC_BUTTON_2FAN_SIZE);
m_switch_speed->SetMaxSize(MISC_BUTTON_SIZE); m_switch_speed->SetMaxSize(MISC_BUTTON_2FAN_SIZE);
m_switch_speed->SetPadding(FromDIP(3)); m_switch_speed->SetPadding(FromDIP(3));
m_switch_speed->SetBorderWidth(FromDIP(2)); m_switch_speed->SetBorderWidth(FromDIP(2));
m_switch_speed->SetFont(Label::Head_13); m_switch_speed->SetFont(Label::Head_13);
@ -1083,8 +1083,8 @@ wxBoxSizer *StatusBasePanel::create_misc_control(wxWindow *parent)
/* create lamp control */ /* create lamp control */
m_switch_lamp = new ImageSwitchButton(parent, m_bitmap_lamp_on, m_bitmap_lamp_off); m_switch_lamp = new ImageSwitchButton(parent, m_bitmap_lamp_on, m_bitmap_lamp_off);
m_switch_lamp->SetLabels(_L("Lamp"), _L("Lamp")); m_switch_lamp->SetLabels(_L("Lamp"), _L("Lamp"));
m_switch_lamp->SetMinSize(MISC_BUTTON_SIZE); m_switch_lamp->SetMinSize(MISC_BUTTON_2FAN_SIZE);
m_switch_lamp->SetMaxSize(MISC_BUTTON_SIZE); m_switch_lamp->SetMaxSize(MISC_BUTTON_2FAN_SIZE);
m_switch_lamp->SetPadding(FromDIP(3)); m_switch_lamp->SetPadding(FromDIP(3));
m_switch_lamp->SetBorderWidth(FromDIP(2)); m_switch_lamp->SetBorderWidth(FromDIP(2));
m_switch_lamp->SetFont(Label::Head_13); m_switch_lamp->SetFont(Label::Head_13);
@ -1163,10 +1163,14 @@ wxBoxSizer *StatusBasePanel::create_misc_control(wxWindow *parent)
m_fan_panel->SetBackgroundColor(parent->GetBackgroundColour()); m_fan_panel->SetBackgroundColor(parent->GetBackgroundColour());
}); });
m_switch_block_fan = new wxPanel(m_fan_panel);
m_switch_block_fan->SetBackgroundColour(parent->GetBackgroundColour());
fan_line_sizer->Add(0, 0, 0, wxLEFT, FromDIP(2)); fan_line_sizer->Add(0, 0, 0, wxLEFT, FromDIP(2));
fan_line_sizer->Add(m_switch_nozzle_fan, 0, wxALIGN_CENTER | wxTOP | wxBOTTOM , FromDIP(2)); fan_line_sizer->Add(m_switch_nozzle_fan, 0, wxALIGN_CENTER | wxTOP | wxBOTTOM , FromDIP(2));
fan_line_sizer->Add(m_switch_printing_fan, 0, wxALIGN_CENTER | wxTOP | wxBOTTOM, FromDIP(2)); fan_line_sizer->Add(m_switch_printing_fan, 0, wxALIGN_CENTER | wxTOP | wxBOTTOM, FromDIP(2));
fan_line_sizer->Add(m_switch_cham_fan, 0, wxALIGN_CENTER | wxTOP | wxBOTTOM , FromDIP(2)); fan_line_sizer->Add(m_switch_cham_fan, 0, wxALIGN_CENTER | wxTOP | wxBOTTOM , FromDIP(2));
fan_line_sizer->Add(m_switch_block_fan, 1, wxEXPAND | wxTOP | wxBOTTOM , FromDIP(2));
fan_line_sizer->Add(0, 0, 0, wxLEFT, FromDIP(2)); fan_line_sizer->Add(0, 0, 0, wxLEFT, FromDIP(2));
m_fan_panel->SetSizer(fan_line_sizer); m_fan_panel->SetSizer(fan_line_sizer);
@ -2132,7 +2136,9 @@ void StatusPanel::update_misc_ctrl(MachineObject *obj)
// update extruder icon // update extruder icon
update_extruder_status(obj); update_extruder_status(obj);
bool is_suppt_aux_fun = obj->is_function_supported(PrinterFunction::FUNC_AUX_FAN);
bool is_suppt_cham_fun = obj->is_function_supported(PrinterFunction::FUNC_CHAMBER_FAN); bool is_suppt_cham_fun = obj->is_function_supported(PrinterFunction::FUNC_CHAMBER_FAN);
//update cham fan //update cham fan
if (m_current_support_cham_fan != is_suppt_cham_fun) { if (m_current_support_cham_fan != is_suppt_cham_fun) {
if (is_suppt_cham_fun) { if (is_suppt_cham_fun) {
@ -2144,15 +2150,35 @@ void StatusPanel::update_misc_ctrl(MachineObject *obj)
} }
else { else {
m_switch_cham_fan->Hide(); m_switch_cham_fan->Hide();
m_switch_nozzle_fan->SetMinSize(MISC_BUTTON_SIZE); m_switch_nozzle_fan->SetMinSize(MISC_BUTTON_2FAN_SIZE);
m_switch_nozzle_fan->SetMaxSize(MISC_BUTTON_SIZE); m_switch_nozzle_fan->SetMaxSize(MISC_BUTTON_2FAN_SIZE);
m_switch_printing_fan->SetMinSize(MISC_BUTTON_SIZE); m_switch_printing_fan->SetMinSize(MISC_BUTTON_2FAN_SIZE);
m_switch_printing_fan->SetMaxSize(MISC_BUTTON_SIZE); m_switch_printing_fan->SetMaxSize(MISC_BUTTON_2FAN_SIZE);
} }
m_misc_ctrl_sizer->Layout(); m_misc_ctrl_sizer->Layout();
} }
if (m_current_support_aux_fan != is_suppt_aux_fun) {
if (is_suppt_aux_fun) {
m_switch_printing_fan->Show();
m_switch_nozzle_fan->SetMinSize(MISC_BUTTON_3FAN_SIZE);
m_switch_nozzle_fan->SetMaxSize(MISC_BUTTON_3FAN_SIZE);
m_switch_cham_fan->SetMinSize(MISC_BUTTON_3FAN_SIZE);
m_switch_cham_fan->SetMaxSize(MISC_BUTTON_3FAN_SIZE);
}
else {
m_switch_printing_fan->Hide();
m_switch_nozzle_fan->SetMinSize(MISC_BUTTON_2FAN_SIZE);
m_switch_nozzle_fan->SetMaxSize(MISC_BUTTON_2FAN_SIZE);
m_switch_cham_fan->SetMinSize(MISC_BUTTON_2FAN_SIZE);
m_switch_cham_fan->SetMaxSize(MISC_BUTTON_2FAN_SIZE);
}
m_misc_ctrl_sizer->Layout();
}
// nozzle fan // nozzle fan
if (m_switch_nozzle_fan_timeout > 0) { if (m_switch_nozzle_fan_timeout > 0) {
m_switch_nozzle_fan_timeout--; m_switch_nozzle_fan_timeout--;
@ -2208,7 +2234,8 @@ void StatusPanel::update_misc_ctrl(MachineObject *obj)
m_switch_speed->SetLabels(text_speed, text_speed); m_switch_speed->SetLabels(text_speed, text_speed);
} }
m_current_support_cham_fan = is_suppt_cham_fun?true:false; m_current_support_aux_fan = is_suppt_aux_fun;
m_current_support_cham_fan = is_suppt_cham_fun;
} }
void StatusPanel::update_extruder_status(MachineObject* obj) void StatusPanel::update_extruder_status(MachineObject* obj)
@ -3542,8 +3569,8 @@ void StatusPanel::on_nozzle_fan_switch(wxCommandEvent &event)
m_fan_control_popup = new FanControlPopup(this); m_fan_control_popup = new FanControlPopup(this);
if (obj) { if (obj) {
bool is_suppt_cham_fun = obj->is_function_supported(PrinterFunction::FUNC_CHAMBER_FAN); m_fan_control_popup->show_cham_fan(obj->is_function_supported(PrinterFunction::FUNC_CHAMBER_FAN));
m_fan_control_popup->update_show_mode(is_suppt_cham_fun); m_fan_control_popup->show_aux_fan(obj->is_function_supported(PrinterFunction::FUNC_AUX_FAN));
} }
auto pos = m_switch_nozzle_fan->GetScreenPosition(); auto pos = m_switch_nozzle_fan->GetScreenPosition();
@ -3856,10 +3883,10 @@ void StatusPanel::msw_rescale()
m_bitmap_speed_active.msw_rescale(); m_bitmap_speed_active.msw_rescale();
m_switch_speed->SetImages(m_bitmap_speed, m_bitmap_speed); m_switch_speed->SetImages(m_bitmap_speed, m_bitmap_speed);
m_switch_speed->SetMinSize(MISC_BUTTON_SIZE); m_switch_speed->SetMinSize(MISC_BUTTON_2FAN_SIZE);
m_switch_speed->Rescale(); m_switch_speed->Rescale();
m_switch_lamp->SetImages(m_bitmap_lamp_on, m_bitmap_lamp_off); m_switch_lamp->SetImages(m_bitmap_lamp_on, m_bitmap_lamp_off);
m_switch_lamp->SetMinSize(MISC_BUTTON_SIZE); m_switch_lamp->SetMinSize(MISC_BUTTON_2FAN_SIZE);
m_switch_lamp->Rescale(); m_switch_lamp->Rescale();
m_switch_nozzle_fan->SetImages(m_bitmap_fan_on, m_bitmap_fan_off); m_switch_nozzle_fan->SetImages(m_bitmap_fan_on, m_bitmap_fan_off);
m_switch_nozzle_fan->Rescale(); m_switch_nozzle_fan->Rescale();

2
src/slic3r/GUI/StatusPanel.hpp
View File

@ -313,12 +313,14 @@ protected:
TempInput * m_tempCtrl_chamber; TempInput * m_tempCtrl_chamber;
int m_temp_chamber_timeout {0}; int m_temp_chamber_timeout {0};
bool m_current_support_cham_fan{true}; bool m_current_support_cham_fan{true};
bool m_current_support_aux_fan{true};
FanSwitchButton *m_switch_nozzle_fan; FanSwitchButton *m_switch_nozzle_fan;
int m_switch_nozzle_fan_timeout{0}; int m_switch_nozzle_fan_timeout{0};
FanSwitchButton *m_switch_printing_fan; FanSwitchButton *m_switch_printing_fan;
int m_switch_printing_fan_timeout{0}; int m_switch_printing_fan_timeout{0};
FanSwitchButton *m_switch_cham_fan; FanSwitchButton *m_switch_cham_fan;
int m_switch_cham_fan_timeout{0}; int m_switch_cham_fan_timeout{0};
wxPanel* m_switch_block_fan;
float m_fixed_aspect_ratio{1.8}; float m_fixed_aspect_ratio{1.8};

24
src/slic3r/GUI/Widgets/FanControl.cpp
View File

@ -535,7 +535,7 @@ FanControlPopup::FanControlPopup(wxWindow* parent)
SetBackgroundColour(*wxWHITE); SetBackgroundColour(*wxWHITE);
} }
void FanControlPopup::update_show_mode(bool support_cham_fun) void FanControlPopup::show_cham_fan(bool support_cham_fun)
{ {
if (support_cham_fun && !m_is_suppt_cham_fun) { if (support_cham_fun && !m_is_suppt_cham_fun) {
@ -554,10 +554,30 @@ void FanControlPopup::update_show_mode(bool support_cham_fun)
m_is_suppt_cham_fun = support_cham_fun; m_is_suppt_cham_fun = support_cham_fun;
} }
void FanControlPopup::show_aux_fan(bool support_aux_fun)
{
if (support_aux_fun && !m_is_suppt_aux_fun) {
m_aux_fan->Show();
m_line_bottom->Show();
Layout();
Fit();
}
if (!support_aux_fun && m_is_suppt_aux_fun) {
m_aux_fan->Hide();
m_line_bottom->Hide();
Layout();
Fit();
}
m_is_suppt_aux_fun = support_aux_fun;
}
void FanControlPopup::update_fan_data(MachineObject::FanType type, MachineObject* obj) void FanControlPopup::update_fan_data(MachineObject::FanType type, MachineObject* obj)
{ {
m_is_suppt_cham_fun = obj->is_function_supported(PrinterFunction::FUNC_CHAMBER_FAN); m_is_suppt_cham_fun = obj->is_function_supported(PrinterFunction::FUNC_CHAMBER_FAN);
update_show_mode(m_is_suppt_cham_fun); show_cham_fan(m_is_suppt_cham_fun);
if (type == MachineObject::FanType::COOLING_FAN && obj->cooling_fan_speed >= 0) { if (type == MachineObject::FanType::COOLING_FAN && obj->cooling_fan_speed >= 0) {
m_part_fan->set_fan_speed(obj->cooling_fan_speed); m_part_fan->set_fan_speed(obj->cooling_fan_speed);

4
src/slic3r/GUI/Widgets/FanControl.hpp
View File

@ -154,9 +154,11 @@ private:
wxWindow* m_line_top; wxWindow* m_line_top;
wxWindow* m_line_bottom; wxWindow* m_line_bottom;
bool m_is_suppt_cham_fun{true}; bool m_is_suppt_cham_fun{true};
bool m_is_suppt_aux_fun{true};
public: public:
void update_show_mode(bool support_cham_fun); void show_cham_fan(bool support_cham_fun);
void show_aux_fan(bool support_aux_fun);
void update_fan_data(MachineObject::FanType type, MachineObject* obj); void update_fan_data(MachineObject::FanType type, MachineObject* obj);
void on_left_down(wxMouseEvent& evt); void on_left_down(wxMouseEvent& evt);
void paintEvent(wxPaintEvent& evt); void paintEvent(wxPaintEvent& evt);