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

ENH: enlarge filament system colors to 16

Browse source 
Change-Id: Ib31fb10869e86e36733aecab858303fafd993cbf
This commit is contained in:
Stone Li 2022-11-16 09:18:15 +08:00 • committed by Lane.Wei
parent 4b0d63ba8e
commit 4e43ad8c2a
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/slic3r/GUI/Plater.cpp
View file

@ -2583,16 +2583,26 @@ void Plater::setExtruderParams(std::map<size_t, Slic3r::ExtruderParams>& extPara
wxColour Plater::get_next_color_for_filament()
{
static int curr_color_filamenet = 0;
wxColour colors[7] = {
// refs to https://www.ebaomonthly.com/window/photo/lesson/colorList.htm
wxColour colors[FILAMENT_SYSTEM_COLORS_NUM] = {
*wxYELLOW,
* wxRED,
*wxBLUE,
*wxCYAN,
*wxLIGHT_GREY,
*wxWHITE,
*wxBLACK
*wxBLACK,
wxColour(0,127,255),
wxColour(139,0,255),
wxColour(102,255,0),
wxColour(255,215,0),
wxColour(0,35,100),
wxColour(255,0,255),
wxColour(8,37,103),
wxColour(127,255,212),
wxColour(255,191,0)
};
return colors[curr_color_filamenet++ % 7];
return colors[curr_color_filamenet++ % FILAMENT_SYSTEM_COLORS_NUM];
}
wxString Plater::get_slice_warning_string(GCodeProcessorResult::SliceWarning& warning)