3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Tech ENABLE_COLOR_CLASSES set as default

Browse source
This commit is contained in:
enricoturri1966 2022-01-14 08:19:00 +01:00
parent fab35e8aa4
commit 6201dad245
50 changed files with 18 additions and 1500 deletions
src/slic3r/GUI
GUI_App.cpp

12
src/slic3r/GUI/GUI_App.cpp
View file

@ -44,9 +44,7 @@
#include "libslic3r/Model.hpp"
#include "libslic3r/I18N.hpp"
#include "libslic3r/PresetBundle.hpp"
#if ENABLE_COLOR_CLASSES
#include "libslic3r/Color.hpp"
#endif // ENABLE_COLOR_CLASSES
#include "GUI.hpp"
#include "GUI_Utils.hpp"
@ -1583,12 +1581,7 @@ void GUI_App::set_label_clr_modified(const wxColour& clr)
if (m_color_label_modified == clr)
return;
m_color_label_modified = clr;
#if ENABLE_COLOR_CLASSES
const std::string str = encode_color(ColorRGB(clr.Red(), clr.Green(), clr.Blue()));
#else
auto clr_str = wxString::Format(wxT("#%02X%02X%02X"), clr.Red(), clr.Green(), clr.Blue());
std::string str = clr_str.ToStdString();
#endif // ENABLE_COLOR_CLASSES
app_config->set("label_clr_modified", str);
app_config->save();
}
@ -1598,12 +1591,7 @@ void GUI_App::set_label_clr_sys(const wxColour& clr)
if (m_color_label_sys == clr)
return;
m_color_label_sys = clr;
#if ENABLE_COLOR_CLASSES
const std::string str = encode_color(ColorRGB(clr.Red(), clr.Green(), clr.Blue()));
#else
auto clr_str = wxString::Format(wxT("#%02X%02X%02X"), clr.Red(), clr.Green(), clr.Blue());
std::string str = clr_str.ToStdString();
#endif // ENABLE_COLOR_CLASSES
app_config->set("label_clr_sys", str);
app_config->save();
}