From 4e43ad8c2ac8a9e1958596d331df934840ca5d0e Mon Sep 17 00:00:00 2001 From: Stone Li Date: Wed, 16 Nov 2022 09:18:15 +0800 Subject: [PATCH] ENH: enlarge filament system colors to 16 Change-Id: Ib31fb10869e86e36733aecab858303fafd993cbf --- src/slic3r/GUI/Plater.cpp | 16 +++++++++++++--- src/slic3r/GUI/Plater.hpp | 2 ++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index b861ba38b..821c7d091 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -2583,16 +2583,26 @@ void Plater::setExtruderParams(std::map& 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) diff --git a/src/slic3r/GUI/Plater.hpp b/src/slic3r/GUI/Plater.hpp index d6019cf10..d4f156aa3 100644 --- a/src/slic3r/GUI/Plater.hpp +++ b/src/slic3r/GUI/Plater.hpp @@ -23,6 +23,8 @@ #include "Jobs/SendJob.hpp" #include "libslic3r/Model.hpp" +#define FILAMENT_SYSTEM_COLORS_NUM 16 + class wxButton; class ScalableButton; class wxScrolledWindow;