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

Fix issue

Browse source 
load of style stored in 3mf
This commit is contained in:
Filip Sykala - NTB T15p 2023-01-10 11:48:50 +01:00
parent 301ccbdc65
commit 625e2fa25a
1 changed files with 10 additions and 7 deletions

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

@ -1024,10 +1024,12 @@ bool GLGizmoEmboss::set_volume(ModelVolume *volume)
wxFont wx_font; wxFont wx_font;
bool is_exact_font = true; bool is_exact_font = true;
bool is_path_changed = false; bool is_path_changed = false;
// load wxFont from same OS
if (style.type == WxFontUtils::get_actual_type()) if (style.type == WxFontUtils::get_actual_type())
wx_font = WxFontUtils::load_wxFont(style.path); wx_font = WxFontUtils::load_wxFont(style.path);
if (!wx_font.IsOk()) { // Different OS or not found on same OS
if (!wx_font.IsOk()) {
is_exact_font = false; is_exact_font = false;
// Try create similar wx font // Try create similar wx font
wx_font = WxFontUtils::create_wxFont(style); wx_font = WxFontUtils::create_wxFont(style);
@ -1043,23 +1045,24 @@ bool GLGizmoEmboss::set_volume(ModelVolume *volume)
if (it != m_face_names.faces.end()) if (it != m_face_names.faces.end())
wx_font.SetFaceName(face_name); wx_font.SetFaceName(face_name);
} }
is_path_changed = wx_font.IsOk();
// Have to use some wxFont
if (!wx_font.IsOk())
wx_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
} }
assert(wx_font.IsOk());
const auto& styles = m_style_manager.get_styles(); const auto& styles = m_style_manager.get_styles();
auto it = std::find_if(styles.begin(), styles.end(), has_same_name); auto it = std::find_if(styles.begin(), styles.end(), has_same_name);
if (it == styles.end()) { if (it == styles.end()) {
// style was not found // style was not found
if (wx_font.IsOk()) m_style_manager.load_style(style, wx_font);
m_style_manager.load_style(style, wx_font);
} else { } else {
size_t style_index = it - styles.begin(); size_t style_index = it - styles.begin();
if (!m_style_manager.load_style(style_index)) { if (!m_style_manager.load_style(style_index)) {
// can`t load stored style // can`t load stored style
m_style_manager.erase(style_index); m_style_manager.erase(style_index);
if (wx_font.IsOk()) m_style_manager.load_style(style, wx_font);
m_style_manager.load_style(style, wx_font);
} else { } else {
// stored style is loaded, now set modification of style // stored style is loaded, now set modification of style
m_style_manager.get_style() = style; m_style_manager.get_style() = style;