diff --git a/src/libslic3r/Triangulation.cpp b/src/libslic3r/Triangulation.cpp index 9119df7d9b..4ecdd43aee 100644 --- a/src/libslic3r/Triangulation.cpp +++ b/src/libslic3r/Triangulation.cpp @@ -28,7 +28,7 @@ inline void insert_edge(Triangulation::HalfEdges &edges, uint32_t &offset, const Triangulation::Indices Triangulation::triangulate(const Points & points, const HalfEdges &half_edges, - bool allow_opposit_edge) + bool allow_opposite_edge) { // IMPROVE use int point insted of float !!! @@ -46,11 +46,11 @@ Triangulation::Indices Triangulation::triangulate(const Points & points, vertices_handle.reserve(points.size()); for (const auto &p : points) { Point cdt_p(p.x(), p.y()); - auto handl = cdt.insert(cdt_p); - vertices_handle.push_back(handl); + auto handle = cdt.insert(cdt_p); + vertices_handle.push_back(handle); // point index uint32_t pi = &p - &points.front(); - map[handl] = pi; + map[handle] = pi; } // triangle can not contain forbiden edge @@ -69,7 +69,7 @@ Triangulation::Indices Triangulation::triangulate(const Points & points, for (size_t i = 0; i < 3; ++i) pi[i] = map[face->vertex(i)]; // Do not use triangles with opposit edges - if (!allow_opposit_edge) { + if (!allow_opposite_edge) { if (half_edges.find(std::make_pair(pi[1], pi[0])) != half_edges.end()) continue; if (half_edges.find(std::make_pair(pi[2], pi[1])) != half_edges.end()) continue; if (half_edges.find(std::make_pair(pi[0], pi[2])) != half_edges.end()) continue; diff --git a/src/libslic3r/Triangulation.hpp b/src/libslic3r/Triangulation.hpp index ccc08b52a6..ac847a8e4a 100644 --- a/src/libslic3r/Triangulation.hpp +++ b/src/libslic3r/Triangulation.hpp @@ -27,11 +27,11 @@ public: /// Points to connect /// Constraint for edges, pair is from point(first) to /// point(second) - /// Flag for filtration result indices by opposit half edge + /// Flag for filtration result indices by opposit half edge /// Triangles static Indices triangulate(const Points & points, const HalfEdges &half_edges, - bool allow_opposit_edge = false); + bool allow_opposite_edge = false); static Indices triangulate(const Polygon &polygon); static Indices triangulate(const Polygons &polygons); static Indices triangulate(const ExPolygons &expolygons); diff --git a/src/slic3r/Utils/FontManager.cpp b/src/slic3r/Utils/FontManager.cpp index d3751f0482..35767c8569 100644 --- a/src/slic3r/Utils/FontManager.cpp +++ b/src/slic3r/Utils/FontManager.cpp @@ -90,7 +90,7 @@ bool FontManager::load_font(size_t font_index) { if (font_index >= m_font_list.size()) return false; std::swap(font_index, m_font_selected); - bool is_loaded = load_activ_font(); + bool is_loaded = load_active_font(); if (!is_loaded) std::swap(font_index, m_font_selected); return is_loaded; } @@ -113,7 +113,7 @@ static std::string get_file_name(const std::string &file_path) return file_path.substr(offset, count); } -bool FontManager::load_activ_font() +bool FontManager::load_active_font() { return set_up_font_file(m_font_selected); } diff --git a/src/slic3r/Utils/FontManager.hpp b/src/slic3r/Utils/FontManager.hpp index 4e99449122..93d183cbcf 100644 --- a/src/slic3r/Utils/FontManager.hpp +++ b/src/slic3r/Utils/FontManager.hpp @@ -169,7 +169,7 @@ private: // load actual selected font ImFont *load_imgui_font(size_t index, const std::string &text); - bool load_activ_font(); + bool load_active_font(); bool set_wx_font(size_t item_index, const wxFont &wx_font);