juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-16 18:12:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: the encoding of filament check_ams_filament_valid

Browse Source 
jira: [STUDIO-12251]
Change-Id: Idc3d23dce67d3e835f15c47984fdd68041371d61
(cherry picked from commit 42b15b4d41a099c5f1aca9dd59ac592aafba0b43)
This commit is contained in:
xin.zhang
2025-05-23 17:53:16 +08:00
committed by Noisyfox
parent 2d69d58ce9
commit 4b6b3cc7bd
5 changed files with 46 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/slic3r/GUI/AMSMaterialsSetting.cpp
View File

@@ -555,7 +555,7 @@ void AMSMaterialsSetting::on_select_ok(wxCommandEvent &event)
if (wxGetApp().app_config->get("skip_ams_blacklist_check") != "true") {
bool in_blacklist = false;
std::string action;
std::string info;
wxString info;
std::string filamnt_type;
std::string filamnt_name;
it->get_filament_type(filamnt_type);
@@ -1456,7 +1456,7 @@ void ColorPicker::doRender(wxDC& dc)
}
if (m_show_full) {
dc.SetPen(wxPen(wxColour(0x6B6B6B)));
dc.SetPen(wxPen(wxColour("#6B6B6B")));
dc.SetBrush(*wxTRANSPARENT_BRUSH);
dc.DrawCircle(size.x / 2, size.y / 2, radius);
@@ -1519,30 +1519,30 @@ ColorPickerPopup::ColorPickerPopup(wxWindow* parent)
:PopupWindow(parent, wxBORDER_NONE)
{
m_def_colors.clear();
m_def_colors.push_back(wxColour(0xFFFFFF));
m_def_colors.push_back(wxColour(0xfff144));
m_def_colors.push_back(wxColour(0xDCF478));
m_def_colors.push_back(wxColour(0x0ACC38));
m_def_colors.push_back(wxColour(0x057748));
m_def_colors.push_back(wxColour(0x0d6284));
m_def_colors.push_back(wxColour(0x0EE2A0));
m_def_colors.push_back(wxColour(0x76D9F4));
m_def_colors.push_back(wxColour(0x46a8f9));
m_def_colors.push_back(wxColour(0x2850E0));
m_def_colors.push_back(wxColour(0x443089));
m_def_colors.push_back(wxColour(0xA03CF7));
m_def_colors.push_back(wxColour(0xF330F9));
m_def_colors.push_back(wxColour(0xD4B1DD));
m_def_colors.push_back(wxColour(0xf95d73));
m_def_colors.push_back(wxColour(0xf72323));
m_def_colors.push_back(wxColour(0x7c4b00));
m_def_colors.push_back(wxColour(0xf98c36));
m_def_colors.push_back(wxColour(0xfcecd6));
m_def_colors.push_back(wxColour(0xD3C5A3));
m_def_colors.push_back(wxColour(0xAF7933));
m_def_colors.push_back(wxColour(0x898989));
m_def_colors.push_back(wxColour(0xBCBCBC));
m_def_colors.push_back(wxColour(0x161616));
m_def_colors.push_back(wxColour("#FFFFFF"));
m_def_colors.push_back(wxColour("#fff144"));
m_def_colors.push_back(wxColour("#DCF478"));
m_def_colors.push_back(wxColour("#0ACC38"));
m_def_colors.push_back(wxColour("#057748"));
m_def_colors.push_back(wxColour("#0d6284"));
m_def_colors.push_back(wxColour("#0EE2A0"));
m_def_colors.push_back(wxColour("#76D9F4"));
m_def_colors.push_back(wxColour("#46a8f9"));
m_def_colors.push_back(wxColour("#2850E0"));
m_def_colors.push_back(wxColour("#443089"));
m_def_colors.push_back(wxColour("#A03CF7"));
m_def_colors.push_back(wxColour("#F330F9"));
m_def_colors.push_back(wxColour("#D4B1DD"));
m_def_colors.push_back(wxColour("#f95d73"));
m_def_colors.push_back(wxColour("#f72323"));
m_def_colors.push_back(wxColour("#7c4b00"));
m_def_colors.push_back(wxColour("#f98c36"));
m_def_colors.push_back(wxColour("#fcecd6"));
m_def_colors.push_back(wxColour("#D3C5A3"));
m_def_colors.push_back(wxColour("#AF7933"));
m_def_colors.push_back(wxColour("#898989"));
m_def_colors.push_back(wxColour("#BCBCBC"));
m_def_colors.push_back(wxColour("#161616"));
SetBackgroundColour(wxColour(*wxWHITE));
@@ -1557,7 +1557,7 @@ ColorPickerPopup::ColorPickerPopup(wxWindow* parent)
m_title_ams->SetBackgroundColour(wxColour(238, 238, 238));
m_sizer_ams->Add(m_title_ams, 0, wxALL, 5);
auto ams_line = new wxPanel(m_def_color_box, wxID_ANY, wxDefaultPosition, wxSize(-1, 1), wxTAB_TRAVERSAL);
ams_line->SetBackgroundColour(wxColour(0xCECECE));
ams_line->SetBackgroundColour(wxColour("#CECECE"));
ams_line->SetMinSize(wxSize(-1, 1));
ams_line->SetMaxSize(wxSize(-1, 1));
m_sizer_ams->Add(ams_line, 1, wxALIGN_CENTER, 0);
@@ -1604,7 +1604,7 @@ ColorPickerPopup::ColorPickerPopup(wxWindow* parent)
auto other_line = new wxPanel(m_def_color_box, wxID_ANY, wxDefaultPosition, wxSize(-1, 1), wxTAB_TRAVERSAL);
other_line->SetMinSize(wxSize(-1, 1));
other_line->SetMaxSize(wxSize(-1, 1));
other_line->SetBackgroundColour(wxColour(0xCECECE));
other_line->SetBackgroundColour(wxColour("#CECECE"));
m_sizer_other->Add(other_line, 1, wxALIGN_CENTER, 0);
//custom color
@@ -1613,7 +1613,7 @@ ColorPickerPopup::ColorPickerPopup(wxWindow* parent)
m_title_custom->SetFont(::Label::Body_14);
m_title_custom->SetBackgroundColour(wxColour(238, 238, 238));
auto custom_line = new wxPanel(m_def_color_box, wxID_ANY, wxDefaultPosition, wxSize(-1, 1), wxTAB_TRAVERSAL);
custom_line->SetBackgroundColour(wxColour(0xCECECE));
custom_line->SetBackgroundColour(wxColour("#CECECE"));
custom_line->SetMinSize(wxSize(-1, 1));
custom_line->SetMaxSize(wxSize(-1, 1));
m_sizer_custom->Add(m_title_custom, 0, wxALL, 5);