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

Remove m_volume_type no need any moore

Browse source
This commit is contained in:
Filip Sykala 2021-10-21 17:16:41 +02:00
parent 081abc2560
commit 5e9ed16f90
2 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
View file

@ -189,7 +189,6 @@ GLGizmoEmboss::GLGizmoEmboss(GLCanvas3D &parent)
: GLGizmoBase(parent, M_ICON_FILENAME, -2) : GLGizmoBase(parent, M_ICON_FILENAME, -2)
, m_font_selected(0) , m_font_selected(0)
, m_volume(nullptr) , m_volume(nullptr)
, m_volume_type(ModelVolumeType::MODEL_PART)
, m_is_initialized(false) // initialize on first opening gizmo , m_is_initialized(false) // initialize on first opening gizmo
{ {
// TODO: add suggestion to use https://fontawesome.com/ // TODO: add suggestion to use https://fontawesome.com/
@ -308,7 +307,7 @@ void GLGizmoEmboss::initialize()
void GLGizmoEmboss::load_font_list() void GLGizmoEmboss::load_font_list()
{ {
const AppConfig *cfg = wxGetApp().app_config; const AppConfig *cfg = wxGetApp().app_config;
std::string font_list_str = cfg->get(AppConfig::SECTION_EMBOSS, M_APP_CFG_FONT_LIST); std::string font_list_str = cfg->get(AppConfig::SECTION_FONT, M_APP_CFG_FONT_LIST);
if (!font_list_str.empty()) { if (!font_list_str.empty()) {
std::optional<FontList> fl = TextConfigurationSerialization::deserialize_font_list(font_list_str); std::optional<FontList> fl = TextConfigurationSerialization::deserialize_font_list(font_list_str);
if (fl.has_value()) m_font_list = *fl; if (fl.has_value()) m_font_list = *fl;
@ -320,7 +319,7 @@ void GLGizmoEmboss::store_font_list()
{ {
AppConfig *cfg = wxGetApp().app_config; AppConfig *cfg = wxGetApp().app_config;
std::string font_list_str = TextConfigurationSerialization::serialize(m_font_list); std::string font_list_str = TextConfigurationSerialization::serialize(m_font_list);
cfg->set(AppConfig::SECTION_EMBOSS, M_APP_CFG_FONT_LIST, font_list_str); cfg->set(AppConfig::SECTION_FONT, M_APP_CFG_FONT_LIST, font_list_str);
} }
FontList GLGizmoEmboss::create_default_font_list() { FontList GLGizmoEmboss::create_default_font_list() {
@ -338,7 +337,6 @@ FontList GLGizmoEmboss::create_default_font_list() {
void GLGizmoEmboss::set_default_configuration() { void GLGizmoEmboss::set_default_configuration() {
m_text = _u8L("Embossed text"); m_text = _u8L("Embossed text");
m_font_prop = FontProp(); m_font_prop = FontProp();
m_volume_type = ModelVolumeType::MODEL_PART;
// may be set default font? // may be set default font?
} }
@ -411,10 +409,10 @@ bool GLGizmoEmboss::process()
void GLGizmoEmboss::set_volume_type(ModelVolumeType volume_type) void GLGizmoEmboss::set_volume_type(ModelVolumeType volume_type)
{ {
m_volume_type = volume_type; // fsFIXME - may be it's no needed
const Selection& selection = m_parent.get_selection(); const Selection& selection = m_parent.get_selection();
if (selection.is_empty() || selection.get_object_idx() < 0) if (selection.is_empty() ||
selection.get_object_idx() < 0 ||
m_volume == nullptr)
return; return;
m_volume->set_type(volume_type); m_volume->set_type(volume_type);
@ -459,7 +457,7 @@ bool GLGizmoEmboss::add_volume(const std::string &name, indexed_triangle_set &it
// create new volume inside of object // create new volume inside of object
int object_idx = selection.get_object_idx(); int object_idx = selection.get_object_idx();
ModelObject *obj = plater->model().objects[object_idx]; ModelObject *obj = plater->model().objects[object_idx];
m_volume = obj->add_volume(std::move(tm), m_volume_type); m_volume = obj->add_volume(std::move(tm));
} }
} else { } else {
m_volume->set_mesh(std::move(tm)); m_volume->set_mesh(std::move(tm));
@ -946,7 +944,6 @@ bool GLGizmoEmboss::load_configuration(ModelVolume *volume)
m_font_prop = configuration.font_prop; m_font_prop = configuration.font_prop;
m_text = configuration.text; m_text = configuration.text;
m_volume_type = volume->type(); // not neccesary
m_volume = volume; m_volume = volume;
return true; return true;
} }

3
src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp
View file

@ -124,9 +124,6 @@ private:
// actual volume // actual volume
ModelVolume *m_volume; ModelVolume *m_volume;
// Only for new created volume
ModelVolumeType m_volume_type;
// initialize when GL is accessible // initialize when GL is accessible
bool m_is_initialized; bool m_is_initialized;