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

Try to find correct font face name in list

Browse Source
This commit is contained in:
Filip Sykala - NTB T15p 2022-12-19 10:54:21 +01:00
parent e8e50b50f1
commit aa97f869e4
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
View File

@ -1009,13 +1009,27 @@ bool GLGizmoEmboss::set_volume(ModelVolume *volume)
}; };
wxFont wx_font; wxFont wx_font;
bool is_exact_font = true;
bool is_path_changed = false; bool is_path_changed = false;
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()) {
create_notification_not_valid_font(tc); if (!wx_font.IsOk()) {
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);
std::optional<std::string> face_name_opt = style.prop.face_name;
if (face_name_opt.has_value()) {
wxString face_name(style.prop.face_name->c_str());
init_face_names();
m_face_names.is_init = false;
auto it = std::lower_bound(m_face_names.faces.begin(), m_face_names.faces.end(), face_name,
[](const FaceName &fn, const wxString& face_name)->bool { return fn.wx_name == face_name; });
// only known font could be setted
// (unknown has undefined behavior)
if (it != m_face_names.faces.end())
wx_font.SetFaceName(face_name);
}
is_path_changed = wx_font.IsOk(); is_path_changed = wx_font.IsOk();
} }
@ -1045,6 +1059,9 @@ bool GLGizmoEmboss::set_volume(ModelVolume *volume)
m_style_manager.get_style().path = path; m_style_manager.get_style().path = path;
} }
if (!is_exact_font)
create_notification_not_valid_font(tc);
m_text = tc.text; m_text = tc.text;
m_volume = volume; m_volume = volume;
@ -2862,7 +2879,6 @@ bool transform_on_surface(ModelVolume &volume, RaycastManager &raycast_manager,
Transform3d to_world = priv::world_matrix(gl_volume, selection.get_model()); Transform3d to_world = priv::world_matrix(gl_volume, selection.get_model());
Vec3d point = to_world * Vec3d::Zero(); Vec3d point = to_world * Vec3d::Zero();
Vec3d direction = to_world.linear() * (-Vec3d::UnitZ()); Vec3d direction = to_world.linear() * (-Vec3d::UnitZ());
//direction.normalize();
// ray in direction of text projection(from volume zero to z-dir) // ray in direction of text projection(from volume zero to z-dir)
std::optional<RaycastManager::Hit> hit_opt = raycast_manager.unproject(point, direction, &cond); std::optional<RaycastManager::Hit> hit_opt = raycast_manager.unproject(point, direction, &cond);
@ -2871,11 +2887,11 @@ bool transform_on_surface(ModelVolume &volume, RaycastManager &raycast_manager,
if (!hit_opt.has_value()) if (!hit_opt.has_value())
return false; return false;
const RaycastManager::Hit &hit = *hit_opt;
const RaycastManager::Hit &hit = *hit_opt; Transform3d hit_tr = raycast_manager.get_transformation(hit.tr_key);
Transform3d hit_tr = raycast_manager.get_transformation(hit.tr_key); Vec3d hit_world = hit_tr * hit.position.cast<double>();
Vec3d hit_world = hit_tr * hit.position.cast<double>(); Vec3d offset_world = hit_world - point; // vector in world
Vec3d offset_world = hit_world - point; // vector in world
// TIP: It should be close to only z move // TIP: It should be close to only z move
Vec3d offset_volume = to_world.inverse().linear() * offset_world; Vec3d offset_volume = to_world.inverse().linear() * offset_world;

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

@ -222,10 +222,11 @@ wxFont WxFontUtils::create_wxFont(const EmbossStyle &style)
auto it = type_to_family.right.find(*fp.family); auto it = type_to_family.right.find(*fp.family);
if (it != type_to_family.right.end()) info.Family(it->second); if (it != type_to_family.right.end()) info.Family(it->second);
} }
if (fp.face_name.has_value()) { // Face names are not portable, so prefer to use Family() in portable code.
/* if (fp.face_name.has_value()) {
wxString face_name(*fp.face_name); wxString face_name(*fp.face_name);
info.FaceName(face_name); info.FaceName(face_name);
} }*/
if (fp.style.has_value()) { if (fp.style.has_value()) {
auto it = type_to_style.right.find(*fp.style); auto it = type_to_style.right.find(*fp.style);
if (it != type_to_style.right.end()) info.Style(it->second); if (it != type_to_style.right.end()) info.Style(it->second);