3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-31 04:31:15 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

ENH:display in black when the transparent filament is loaded

Browse source 
Change-Id: I4c2887ef93ac81571bcb037ddee8a363ab428e04
This commit is contained in:
tao wang 2023-05-26 17:45:35 +08:00 • committed by Lane.Wei
parent 1a9b82cf1a
commit da42ed6f58
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/slic3r/GUI/Widgets/AMSControl.cpp
View file

@ -474,7 +474,9 @@ void AMSextruder::doRender(wxDC& dc)
dc.DrawRoundedRectangle(-size.x / 2, size.y * 0.1, size.x, size.y, 4); dc.DrawRoundedRectangle(-size.x / 2, size.y * 0.1, size.x, size.y, 4);
if (m_vams_loading) { if (m_vams_loading) {
dc.SetPen(wxPen(m_current_colur, 6, wxSOLID));
if (m_current_colur.Alpha() == 0) { dc.SetPen(wxPen(*wxBLACK, 6, wxSOLID)); }
else { dc.SetPen(wxPen(m_current_colur, 6, wxSOLID)); }
dc.DrawRoundedRectangle(-size.x / 2, size.y * 0.1, size.x, size.y, 4); dc.DrawRoundedRectangle(-size.x / 2, size.y * 0.1, size.x, size.y, 4);
if (m_current_colur == *wxWHITE && !wxGetApp().dark_mode()) { if (m_current_colur == *wxWHITE && !wxGetApp().dark_mode()) {
@ -485,7 +487,8 @@ void AMSextruder::doRender(wxDC& dc)
} }
if (m_ams_loading && !m_none_ams_mode) { if (m_ams_loading && !m_none_ams_mode) {
dc.SetPen(wxPen(m_current_colur, 6, wxSOLID)); if (m_current_colur.Alpha() == 0) {dc.SetPen(wxPen(*wxBLACK, 6, wxSOLID));}
else {dc.SetPen(wxPen(m_current_colur, 6, wxSOLID));}
dc.DrawLine(size.x / 2, -1, size.x / 2, size.y * 0.6 - 1); dc.DrawLine(size.x / 2, -1, size.x / 2, size.y * 0.6 - 1);
if (m_current_colur == *wxWHITE && !wxGetApp().dark_mode()) { if (m_current_colur == *wxWHITE && !wxGetApp().dark_mode()) {
@ -497,7 +500,8 @@ void AMSextruder::doRender(wxDC& dc)
} }
else { else {
if (m_ams_loading) { if (m_ams_loading) {
dc.SetPen(wxPen(m_current_colur, 6, wxSOLID)); if (m_current_colur.Alpha() == 0) { dc.SetPen(wxPen(*wxBLACK, 6, wxSOLID)); }
else { dc.SetPen(wxPen(m_current_colur, 6, wxSOLID)); }
dc.DrawLine(size.x / 2, -1, size.x / 2, size.y * 0.6 - 1); dc.DrawLine(size.x / 2, -1, size.x / 2, size.y * 0.6 - 1);
if (m_current_colur == *wxWHITE && !wxGetApp().dark_mode()) { if (m_current_colur == *wxWHITE && !wxGetApp().dark_mode()) {
@ -574,7 +578,8 @@ void AMSVirtualRoad::doRender(wxDC& dc)
wxSize size = GetSize(); wxSize size = GetSize();
if (m_vams_loading) { if (m_vams_loading) {
dc.SetPen(wxPen(m_current_color, 6, wxSOLID)); if (m_current_color.Alpha() == 0) { dc.SetPen(wxPen(*wxBLACK, 6, wxSOLID)); }
else { dc.SetPen(wxPen(m_current_color, 6, wxSOLID)); }
} }
else { else {
dc.SetPen(wxPen(AMS_CONTROL_GRAY500, 2, wxSOLID)); dc.SetPen(wxPen(AMS_CONTROL_GRAY500, 2, wxSOLID));
@ -1177,7 +1182,9 @@ void AMSRoad::doRender(wxDC &dc)
// mode none // mode none
// if (m_pass_rode_mode.size() == 1 && m_pass_rode_mode[0] == AMSPassRoadMode::AMS_ROAD_MODE_NONE) return; // if (m_pass_rode_mode.size() == 1 && m_pass_rode_mode[0] == AMSPassRoadMode::AMS_ROAD_MODE_NONE) return;
dc.SetPen(wxPen(m_road_color, m_passroad_width, wxSOLID)); if (m_road_color.Alpha() == 0) {dc.SetPen(wxPen(*wxBLACK, m_passroad_width, wxSOLID));}
else {dc.SetPen(wxPen(m_road_color, m_passroad_width, wxSOLID));}
dc.SetBrush(wxBrush(*wxTRANSPARENT_BRUSH)); dc.SetBrush(wxBrush(*wxTRANSPARENT_BRUSH));
// left pass mode // left pass mode