GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-11 03:11:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Skip can load check for MAC - because time delay

Browse Source
This commit is contained in:
Filip Sykala - NTB T15p 2022-11-08 13:27:50 +01:00
parent aa00da1b7e
commit 04db4fc56f
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/slic3r/Utils/WxFontUtils.cpp
View File

@ -71,12 +71,13 @@ bool WxFontUtils::can_load(const wxFont &font)
#ifdef _WIN32 #ifdef _WIN32
return Emboss::can_load(font.GetHFONT()) != nullptr; return Emboss::can_load(font.GetHFONT()) != nullptr;
#elif defined(__APPLE__) #elif defined(__APPLE__)
return is_valid_ttf(get_file_path(font)); return true;
//return is_valid_ttf(get_file_path(font));
#elif defined(__linux__) #elif defined(__linux__)
return true; return true;
// font config check file path take about 4000ms for chech them all // font config check file path take about 4000ms for chech them all
std::string font_path = Slic3r::GUI::get_font_path(font); //std::string font_path = Slic3r::GUI::get_font_path(font);
return !font_path.empty(); //return !font_path.empty();
#endif #endif
return false; return false;
} }
@ -87,11 +88,19 @@ std::unique_ptr<Emboss::FontFile> WxFontUtils::create_font_file(const wxFont &fo
return Emboss::create_font_file(font.GetHFONT()); return Emboss::create_font_file(font.GetHFONT());
#elif defined(__APPLE__) #elif defined(__APPLE__)
std::string file_path = get_file_path(font); std::string file_path = get_file_path(font);
if (file_path.empty()) return nullptr; if (!is_valid_ttf(file_path)) {
BOOST_LOG_TRIVIAL(error) << "Can not process font('" << get_human_readable_name(font) << "'), "
<< "file in path('" << file_path << "') is not valid TTF.";
return nullptr;
}
return Emboss::create_font_file(file_path.c_str()); return Emboss::create_font_file(file_path.c_str());
#elif defined(__linux__) #elif defined(__linux__)
std::string font_path = Slic3r::GUI::get_font_path(font); std::string font_path = Slic3r::GUI::get_font_path(font);
if (font_path.empty()) return nullptr; if (font_path.empty()){
BOOST_LOG_TRIVIAL(error) << "Can not read font('" << get_human_readable_name(font) << "'), "
<< "file path is empty.";
return nullptr;
}
return Emboss::create_font_file(font_path.c_str()); return Emboss::create_font_file(font_path.c_str());
#else #else
// HERE is place to add implementation for another platform // HERE is place to add implementation for another platform