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

Fix spelling

Browse source
This commit is contained in:
Filip Sykala 2022-03-02 10:57:25 +01:00
parent 66a3752782
commit bd5d2d4493
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/libslic3r/Triangulation.cpp
View file

@ -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;

4
src/libslic3r/Triangulation.hpp
View file

@ -27,11 +27,11 @@ public:
/// <param name="points">Points to connect</param>
/// <param name="edges">Constraint for edges, pair is from point(first) to
/// point(second)</param>
/// <param name="allow_opposit_edge">Flag for filtration result indices by opposit half edge</param>
/// <param name="allow_opposite_edge">Flag for filtration result indices by opposit half edge</param>
/// <returns>Triangles</returns>
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);

4
src/slic3r/Utils/FontManager.cpp
View file

@ -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);
}

2
src/slic3r/Utils/FontManager.hpp
View file

@ -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);