juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 11:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up code

Browse Source
This commit is contained in:
Noisyfox
2025-05-21 16:25:48 +08:00
parent 3b3406a375
commit cee7041b4d
3 changed files with 71 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/GUI/Widgets/AMSControl.cpp
View File

@@ -15,10 +15,10 @@
namespace Slic3r { namespace GUI { namespace Slic3r { namespace GUI {
#define AMS_CANS_SIZE wxSize(FromDIP(284), FromDIP(196))
#define AMS_CANS_WINDOW_SIZE wxSize(FromDIP(264), FromDIP(196))
/*************************************************
Description:AMSControl
**************************************************/
AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size) AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size)
: wxSimplebook(parent, wxID_ANY, pos, size) : wxSimplebook(parent, wxID_ANY, pos, size)
, m_Humidity_tip_popup(AmsHumidityTipPopup(this)) , m_Humidity_tip_popup(AmsHumidityTipPopup(this))

85
src/slic3r/GUI/Widgets/AMSItem.cpp
View File

@@ -18,26 +18,26 @@
namespace Slic3r { namespace GUI { namespace Slic3r { namespace GUI {
static const wxColour AMS_TRAY_DEFAULT_COL = wxColour(255, 255, 255); static const wxColour AMS_TRAY_DEFAULT_COL = wxColour(255, 255, 255);
wxDEFINE_EVENT(EVT_AMS_EXTRUSION_CALI, wxCommandEvent);
wxDEFINE_EVENT(EVT_AMS_EXTRUSION_CALI, wxCommandEvent); wxDEFINE_EVENT(EVT_AMS_LOAD, SimpleEvent);
wxDEFINE_EVENT(EVT_AMS_LOAD, SimpleEvent); wxDEFINE_EVENT(EVT_AMS_UNLOAD, SimpleEvent);
wxDEFINE_EVENT(EVT_AMS_UNLOAD, SimpleEvent); wxDEFINE_EVENT(EVT_AMS_SETTINGS, SimpleEvent);
wxDEFINE_EVENT(EVT_AMS_SETTINGS, SimpleEvent); wxDEFINE_EVENT(EVT_AMS_FILAMENT_BACKUP, SimpleEvent);
wxDEFINE_EVENT(EVT_AMS_FILAMENT_BACKUP, SimpleEvent); wxDEFINE_EVENT(EVT_AMS_REFRESH_RFID, wxCommandEvent);
wxDEFINE_EVENT(EVT_AMS_REFRESH_RFID, wxCommandEvent); wxDEFINE_EVENT(EVT_AMS_ON_SELECTED, wxCommandEvent);
wxDEFINE_EVENT(EVT_AMS_ON_SELECTED, wxCommandEvent); wxDEFINE_EVENT(EVT_AMS_ON_FILAMENT_EDIT, wxCommandEvent);
wxDEFINE_EVENT(EVT_AMS_ON_FILAMENT_EDIT, wxCommandEvent); wxDEFINE_EVENT(EVT_VAMS_ON_FILAMENT_EDIT, wxCommandEvent);
wxDEFINE_EVENT(EVT_VAMS_ON_FILAMENT_EDIT, wxCommandEvent); wxDEFINE_EVENT(EVT_AMS_CLIBRATION_AGAIN, wxCommandEvent);
wxDEFINE_EVENT(EVT_AMS_CLIBRATION_AGAIN, wxCommandEvent); wxDEFINE_EVENT(EVT_AMS_CLIBRATION_CANCEL, wxCommandEvent);
wxDEFINE_EVENT(EVT_AMS_CLIBRATION_CANCEL, wxCommandEvent); wxDEFINE_EVENT(EVT_AMS_GUIDE_WIKI, wxCommandEvent);
wxDEFINE_EVENT(EVT_AMS_GUIDE_WIKI, wxCommandEvent); wxDEFINE_EVENT(EVT_AMS_RETRY, wxCommandEvent);
wxDEFINE_EVENT(EVT_AMS_RETRY, wxCommandEvent); wxDEFINE_EVENT(EVT_AMS_SHOW_HUMIDITY_TIPS, wxCommandEvent);
wxDEFINE_EVENT(EVT_AMS_SHOW_HUMIDITY_TIPS, wxCommandEvent); wxDEFINE_EVENT(EVT_AMS_UNSELETED_VAMS, wxCommandEvent);
wxDEFINE_EVENT(EVT_AMS_UNSELETED_VAMS, wxCommandEvent); wxDEFINE_EVENT(EVT_CLEAR_SPEED_CONTROL, wxCommandEvent);
wxDEFINE_EVENT(EVT_CLEAR_SPEED_CONTROL, wxCommandEvent);
#define AMS_CANS_WINDOW_SIZE wxSize(FromDIP(264), FromDIP(196))
bool AMSinfo::parse_ams_info(MachineObject *obj, Ams *ams, bool remain_flag, bool humidity_flag) bool AMSinfo::parse_ams_info(MachineObject *obj, Ams *ams, bool remain_flag, bool humidity_flag)
{ {
if (!ams) return false; if (!ams) return false;
@@ -85,8 +85,11 @@ bool AMSinfo::parse_ams_info(MachineObject *obj, Ams *ams, bool remain_flag, boo
if (!MachineObject::is_bbl_filament(it->second->tag_uid) || !remain_flag) { if (!MachineObject::is_bbl_filament(it->second->tag_uid) || !remain_flag) {
info.material_remain = 100; info.material_remain = 100;
} else { } else {
info.material_remain = it->second->remain < 0 ? 0 : it->second->remain; if(it->second->remain < 0 || it->second->remain > 100) {
info.material_remain = it->second->remain > 100 ? 100 : info.material_remain; info.material_remain = 100;/*ignore the invalid data*/
} else {
info.material_remain = it->second->remain;
}
} }
@@ -198,16 +201,17 @@ void AMSrefresh::on_timer(wxTimerEvent &event)
void AMSrefresh::PlayLoading() void AMSrefresh::PlayLoading()
{ {
if (m_play_loading | m_disable_mode) return; if (m_play_loading || m_disable_mode) return;
m_play_loading = true; m_play_loading = true;
//m_rotation_angle = 0;
m_playing_timer->Start(AMS_REFRESH_PLAY_LOADING_TIMER); m_playing_timer->Start(AMS_REFRESH_PLAY_LOADING_TIMER);
Refresh(); Refresh();
} }
void AMSrefresh::StopLoading() void AMSrefresh::StopLoading()
{ {
if (!m_play_loading | m_disable_mode) return; if (!m_play_loading || m_disable_mode) return;
m_playing_timer->Stop(); m_playing_timer->Stop();
m_play_loading = false; m_play_loading = false;
Refresh(); Refresh();
@@ -399,6 +403,8 @@ AMSextruderImage::~AMSextruderImage() {}
//Ams Extruder
AMSextruder::AMSextruder(wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size) { create(parent, id, pos, size); } AMSextruder::AMSextruder(wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size) { create(parent, id, pos, size); }
AMSextruder::~AMSextruder() {} AMSextruder::~AMSextruder() {}
@@ -625,7 +631,6 @@ void AMSVirtualRoad::msw_rescale()
Refresh(); Refresh();
} }
/************************************************* /*************************************************
Description:AMSLib Description:AMSLib
**************************************************/ **************************************************/
@@ -655,7 +660,6 @@ void AMSLib::create(wxWindow *parent, wxWindowID id, const wxPoint &pos, const w
SetSize(AMS_CAN_LIB_SIZE); SetSize(AMS_CAN_LIB_SIZE);
SetMinSize(AMS_CAN_LIB_SIZE); SetMinSize(AMS_CAN_LIB_SIZE);
SetMaxSize(AMS_CAN_LIB_SIZE); SetMaxSize(AMS_CAN_LIB_SIZE);
auto m_sizer_body = new wxBoxSizer(wxVERTICAL); auto m_sizer_body = new wxBoxSizer(wxVERTICAL);
wxBoxSizer *m_sizer_edit = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *m_sizer_edit = new wxBoxSizer(wxHORIZONTAL);
@@ -765,11 +769,11 @@ void AMSLib::render(wxDC &dc)
render_generic_text(dc); render_generic_text(dc);
} }
else if (m_ams_model == AMSModel::AMS_LITE) { else if (m_ams_model == AMSModel::AMS_LITE) {
render_extra_text(dc); render_lite_text(dc);
} }
} }
void AMSLib::render_extra_text(wxDC& dc) void AMSLib::render_lite_text(wxDC& dc)
{ {
auto tmp_lib_colour = m_info.material_colour; auto tmp_lib_colour = m_info.material_colour;
@@ -818,7 +822,6 @@ void AMSLib::render_extra_text(wxDC& dc)
} }
} }
if (has_split) { if (has_split) {
dc.SetFont(::Label::Body_10); dc.SetFont(::Label::Body_10);
auto line_top = m_info.material_name.substr(0, m_info.material_name.find(has_split_char)); auto line_top = m_info.material_name.substr(0, m_info.material_name.find(has_split_char));
@@ -983,11 +986,11 @@ void AMSLib::doRender(wxDC &dc)
render_generic_lib(dc); render_generic_lib(dc);
} }
else if (m_ams_model == AMSModel::AMS_LITE) { else if (m_ams_model == AMSModel::AMS_LITE) {
render_extra_lib(dc); render_lite_lib(dc);
} }
} }
void AMSLib::render_extra_lib(wxDC& dc) void AMSLib::render_lite_lib(wxDC& dc)
{ {
wxSize size = GetSize(); wxSize size = GetSize();
@@ -1019,7 +1022,6 @@ void AMSLib::render_extra_lib(wxDC& dc)
dc.DrawLine(size.x / 2, size.y / 2, size.x / 2, 0); dc.DrawLine(size.x / 2, size.y / 2, size.x / 2, 0);
} }
//draw def background //draw def background
dc.SetPen(wxPen(*wxTRANSPARENT_PEN)); dc.SetPen(wxPen(*wxTRANSPARENT_PEN));
dc.SetBrush(wxBrush(AMS_CONTROL_DEF_LIB_BK_COLOUR)); dc.SetBrush(wxBrush(AMS_CONTROL_DEF_LIB_BK_COLOUR));
@@ -1626,9 +1628,9 @@ AMSPreview::AMSPreview() {}
AMSPreview::AMSPreview(wxWindow *parent, wxWindowID id, AMSinfo amsinfo, const wxSize cube_size, const wxPoint &pos, const wxSize &size) : AMSPreview() AMSPreview::AMSPreview(wxWindow *parent, wxWindowID id, AMSinfo amsinfo, const wxSize cube_size, const wxPoint &pos, const wxSize &size) : AMSPreview()
{ {
m_amsinfo = amsinfo;
m_cube_size = cube_size;
create(parent, id, pos, AMS_ITEM_SIZE); create(parent, id, pos, AMS_ITEM_SIZE);
m_amsinfo = amsinfo;
m_cube_size = cube_size;
Bind(wxEVT_PAINT, &AMSPreview::paintEvent, this); Bind(wxEVT_PAINT, &AMSPreview::paintEvent, this);
Bind(wxEVT_ENTER_WINDOW, &AMSPreview::OnEnterWindow, this); Bind(wxEVT_ENTER_WINDOW, &AMSPreview::OnEnterWindow, this);
Bind(wxEVT_LEAVE_WINDOW, &AMSPreview::OnLeaveWindow, this); Bind(wxEVT_LEAVE_WINDOW, &AMSPreview::OnLeaveWindow, this);
@@ -2037,7 +2039,9 @@ AmsItem::AmsItem(wxWindow *parent,AMSinfo info, AMSModel model) : AmsItem()
m_info = info; m_info = info;
wxWindow::Create(parent, wxID_ANY, wxDefaultPosition, AMS_CANS_WINDOW_SIZE); wxWindow::Create(parent, wxID_ANY, wxDefaultPosition, AMS_CANS_WINDOW_SIZE);
create(parent); create(parent);
Bind(wxEVT_PAINT, &AmsItem::paintEvent, this); Bind(wxEVT_PAINT, &AmsItem::paintEvent, this);
} }
@@ -2092,6 +2096,7 @@ void AmsItem::create(wxWindow *parent)
SetSizer(sizer_can); SetSizer(sizer_can);
} }
Layout(); Layout();
Fit(); Fit();
Thaw(); Thaw();
@@ -2099,8 +2104,8 @@ void AmsItem::create(wxWindow *parent)
void AmsItem::AddCan(Caninfo caninfo, int canindex, int maxcan, wxBoxSizer* sizer) void AmsItem::AddCan(Caninfo caninfo, int canindex, int maxcan, wxBoxSizer* sizer)
{ {
auto amscan = new wxWindow(this, wxID_ANY); auto amscan = new wxWindow(this, wxID_ANY);
amscan->SetBackgroundColour(AMS_CONTROL_DEF_LIB_BK_COLOUR); amscan->SetBackgroundColour(AMS_CONTROL_DEF_LIB_BK_COLOUR);
wxBoxSizer* m_sizer_ams = new wxBoxSizer(wxVERTICAL); wxBoxSizer* m_sizer_ams = new wxBoxSizer(wxVERTICAL);
@@ -2130,14 +2135,12 @@ void AmsItem::AddCan(Caninfo caninfo, int canindex, int maxcan, wxBoxSizer* size
ev.Skip(); ev.Skip();
}); });
m_panel_lib->m_ams_model = m_ams_model;
m_panel_lib->m_ams_model = m_ams_model; m_panel_lib->m_ams_id = m_info.ams_id;
m_panel_lib->m_ams_id = m_info.ams_id; m_panel_lib->m_slot_id = caninfo.can_id;
m_panel_lib->m_slot_id = caninfo.can_id;
m_panel_lib->m_info.can_id = caninfo.can_id; m_panel_lib->m_info.can_id = caninfo.can_id;
m_panel_lib->m_can_index = canindex; m_panel_lib->m_can_index = canindex;
auto m_panel_road = new AMSRoad(amscan, wxID_ANY, caninfo, canindex, maxcan, wxDefaultPosition, AMS_CAN_ROAD_SIZE); auto m_panel_road = new AMSRoad(amscan, wxID_ANY, caninfo, canindex, maxcan, wxDefaultPosition, AMS_CAN_ROAD_SIZE);
if (m_ams_model == AMSModel::GENERIC_AMS) { if (m_ams_model == AMSModel::GENERIC_AMS) {
@@ -2161,8 +2164,6 @@ void AmsItem::AddCan(Caninfo caninfo, int canindex, int maxcan, wxBoxSizer* size
m_sizer_ams->Add(m_panel_refresh, 0, wxALIGN_CENTER, 0); m_sizer_ams->Add(m_panel_refresh, 0, wxALIGN_CENTER, 0);
} }
} }
amscan->SetSizer(m_sizer_ams); amscan->SetSizer(m_sizer_ams);
amscan->Layout(); amscan->Layout();
amscan->Fit(); amscan->Fit();
@@ -2231,6 +2232,7 @@ void AmsItem::Update(AMSinfo info)
} }
} }
} }
Layout(); Layout();
} }
@@ -2295,7 +2297,6 @@ void AmsItem::SetAmsStepExtra(wxString canid, AMSPassRoadType type, AMSPassRoadS
void AmsItem::SetAmsStep(wxString canid, AMSPassRoadType type, AMSPassRoadSTEP step) void AmsItem::SetAmsStep(wxString canid, AMSPassRoadType type, AMSPassRoadSTEP step)
{ {
if (step == AMSPassRoadSTEP::AMS_ROAD_STEP_NONE) { if (step == AMSPassRoadSTEP::AMS_ROAD_STEP_NONE) {
for (auto road_it : m_can_road_list) { for (auto road_it : m_can_road_list) {
AMSRoad* road = road_it.second; AMSRoad* road = road_it.second;

14
src/slic3r/GUI/Widgets/AMSItem.hpp
View File

@@ -28,11 +28,6 @@
#define AMS_CONTROL_MAX_COUNT 4 #define AMS_CONTROL_MAX_COUNT 4
#define AMS_CONTRO_CALIBRATION_BUTTON_SIZE wxSize(FromDIP(150), FromDIP(28)) #define AMS_CONTRO_CALIBRATION_BUTTON_SIZE wxSize(FromDIP(150), FromDIP(28))
// enum AMSRoadMode{
// AMS_ROAD_MODE_LEFT,
// AMS_ROAD_MODE_LEFT_RIGHT,
// AMS_ROAD_MODE_END,
//};
namespace Slic3r { namespace GUI { namespace Slic3r { namespace GUI {
@@ -118,6 +113,7 @@ enum FilamentStep {
STEP_COUNT, STEP_COUNT,
}; };
enum FilamentStepType { enum FilamentStepType {
STEP_TYPE_LOAD = 0, STEP_TYPE_LOAD = 0,
STEP_TYPE_UNLOAD = 1, STEP_TYPE_UNLOAD = 1,
@@ -130,8 +126,8 @@ enum FilamentStepType {
#define AMS_CAN_LIB_SIZE wxSize(FromDIP(58), FromDIP(80)) #define AMS_CAN_LIB_SIZE wxSize(FromDIP(58), FromDIP(80))
#define AMS_CAN_ROAD_SIZE wxSize(FromDIP(66), FromDIP(70)) #define AMS_CAN_ROAD_SIZE wxSize(FromDIP(66), FromDIP(70))
#define AMS_CAN_ITEM_HEIGHT_SIZE FromDIP(27) #define AMS_CAN_ITEM_HEIGHT_SIZE FromDIP(27)
#define AMS_CANS_SIZE wxSize(FromDIP(284), FromDIP(196)) //#define AMS_CANS_SIZE wxSize(FromDIP(284), FromDIP(196))
#define AMS_CANS_WINDOW_SIZE wxSize(FromDIP(264), FromDIP(196)) //#define AMS_CANS_WINDOW_SIZE wxSize(FromDIP(264), FromDIP(196))
#define AMS_STEP_SIZE wxSize(FromDIP(172), FromDIP(196)) #define AMS_STEP_SIZE wxSize(FromDIP(172), FromDIP(196))
#define AMS_REFRESH_SIZE wxSize(FromDIP(30), FromDIP(30)) #define AMS_REFRESH_SIZE wxSize(FromDIP(30), FromDIP(30))
#define AMS_EXTRUDER_SIZE wxSize(FromDIP(86), FromDIP(72)) #define AMS_EXTRUDER_SIZE wxSize(FromDIP(86), FromDIP(72))
@@ -428,10 +424,10 @@ protected:
void on_left_down(wxMouseEvent &evt); void on_left_down(wxMouseEvent &evt);
void paintEvent(wxPaintEvent &evt); void paintEvent(wxPaintEvent &evt);
void render(wxDC &dc); void render(wxDC &dc);
void render_extra_text(wxDC& dc); void render_lite_text(wxDC& dc);
void render_generic_text(wxDC& dc); void render_generic_text(wxDC& dc);
void doRender(wxDC& dc); void doRender(wxDC& dc);
void render_extra_lib(wxDC& dc); void render_lite_lib(wxDC& dc);
void render_generic_lib(wxDC& dc); void render_generic_lib(wxDC& dc);
}; };