3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-10 08:17:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ENH:optimized logic related to fan control

Browse source 
Change-Id: Ia67525bc75d4cc5be02eaf7131764fb0f9584f23
This commit is contained in:
tao wang 2023-02-01 15:25:47 +08:00 • committed by Lane.Wei
parent 3e07db0c2a
commit 450f3e1c77
4 changed files with 42 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/slic3r/GUI/Widgets/FanControl.cpp
View file

@ -2,6 +2,7 @@
#include "Label.hpp"
#include "../BitmapCache.hpp"
#include "../I18N.hpp"
#include "../GUI_App.hpp"
#include <wx/simplebook.h>
#include <wx/dcgraph.h>
@ -542,20 +543,34 @@ FanControlPopup::FanControlPopup(wxWindow* parent)
Bind(wxEVT_LEFT_DOWN, &FanControlPopup::on_left_down, this);
#endif
Bind(wxEVT_SHOW, &FanControlPopup::on_show, this);
SetBackgroundColour(*wxWHITE);
}
void FanControlPopup::update_show_mode(bool support_cham_fun)
{
if (support_cham_fun && !m_is_suppt_cham_fun) {
m_cham_fan->Show();
m_line_bottom->Show();
Layout();
Fit();
}
if (!support_cham_fun && m_is_suppt_cham_fun) {
m_cham_fan->Hide();
m_line_bottom->Hide();
Layout();
Fit();
}
m_is_suppt_cham_fun = support_cham_fun;
}
void FanControlPopup::update_fan_data(MachineObject::FanType type, MachineObject* obj)
{
bool is_suppt_cham_fun = obj->is_function_supported(PrinterFunction::FUNC_CHAMBER_FAN);
if (is_suppt_cham_fun) {
m_cham_fan->Show();
m_line_bottom->Show();
}
else {
m_cham_fan->Hide();
m_line_bottom->Hide();
}
m_is_suppt_cham_fun = obj->is_function_supported(PrinterFunction::FUNC_CHAMBER_FAN);
update_show_mode(m_is_suppt_cham_fun);
if (type == MachineObject::FanType::COOLING_FAN && obj->cooling_fan_speed >= 0) {
m_part_fan->set_fan_speed(obj->cooling_fan_speed);
@ -576,9 +591,6 @@ void FanControlPopup::update_fan_data(MachineObject::FanType type, MachineObject
Bind(EVT_FAN_CHANGED, [this](wxCommandEvent& e) {
post_event(e.GetInt(), e.GetString());
});
Layout();
Fit();
}
void FanControlPopup::on_left_down(wxMouseEvent& evt)
@ -619,6 +631,11 @@ bool FanControlPopup::ProcessLeftDown(wxMouseEvent& event)
return wxPopupTransientWindow::ProcessLeftDown(event);
}
void FanControlPopup::on_show(wxShowEvent& evt)
{
wxGetApp().UpdateDarkUIWin(this);
}
void FanControlPopup::paintEvent(wxPaintEvent& evt)
{
wxPaintDC dc(this);