luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing issue #2210 (snap behavior for auto-measure)

This commit is contained in:
Matthias Koefferlein 2025-11-16 15:05:55 +01:00
parent dacb3230d5
commit 131a7bdf6e
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/laybasic/laybasic/laySnap.cc
View File

@ -262,7 +262,7 @@ public:
* "vertex_mode" is: * "vertex_mode" is:
* 0: no snapping to vertexes * 0: no snapping to vertexes
* 1: snapping to edge vertexes * 1: snapping to edge vertexes
* 2: also snapping to centers * 2: snapping to edge vertexes with high prio and also snapping to centers
*/ */
ContourFinder (const db::DPoint &original, const db::DVector &grid, const std::vector <db::DEdge> &cutlines, int vertex_mode = 2, bool directed = false) ContourFinder (const db::DPoint &original, const db::DVector &grid, const std::vector <db::DEdge> &cutlines, int vertex_mode = 2, bool directed = false)
: m_any (false), m_any_exact (false), : m_any (false), m_any_exact (false),
@ -449,8 +449,11 @@ private:
void void
find_closest_exact (const db::DPoint &p, const db::DEdge &e) find_closest_exact (const db::DPoint &p, const db::DEdge &e)
{ {
bool was_vertex = m_edge1_exact.is_degenerate () && m_edge2_exact.is_degenerate (); // NOTE: in vertex mode 2, vertices have higher priority than edges, so we capture the nature of the
bool is_vertex = e.is_degenerate (); // object to snap to. In vertex mode 1, "was_vertex" and "is_vertex" is always false and priority
// is given by distance. That mode is used in measurements (aka obj_snap2).
bool was_vertex = m_vertex_mode > 1 && m_edge1_exact.is_degenerate () && m_edge2_exact.is_degenerate ();
bool is_vertex = m_vertex_mode > 1 && e.is_degenerate ();
if (! m_any_exact || (! (was_vertex && ! is_vertex) && (m_original.distance (p) < m_original.distance (m_closest_exact) || (! was_vertex && is_vertex)))) { if (! m_any_exact || (! (was_vertex && ! is_vertex) && (m_original.distance (p) < m_original.distance (m_closest_exact) || (! was_vertex && is_vertex)))) {
@ -473,8 +476,11 @@ private:
void void
find_closest (const db::DPoint &p, const db::DEdge &e) find_closest (const db::DPoint &p, const db::DEdge &e)
{ {
bool was_vertex = m_edge1.is_degenerate () && m_edge2.is_degenerate (); // NOTE: in vertex mode 2, vertices have higher priority than edges, so we capture the nature of the
bool is_vertex = e.is_degenerate (); // object to snap to. In vertex mode 1, "was_vertex" and "is_vertex" is always false and priority
// is given by distance. That mode is used in measurements (aka obj_snap2).
bool was_vertex = m_vertex_mode > 1 && m_edge1.is_degenerate () && m_edge2.is_degenerate ();
bool is_vertex = m_vertex_mode > 1 && e.is_degenerate ();
if (! m_any || (! (was_vertex && ! is_vertex) && (m_original.distance (p) < m_original.distance (m_closest) || (! was_vertex && is_vertex)))) { if (! m_any || (! (was_vertex && ! is_vertex) && (m_original.distance (p) < m_original.distance (m_closest) || (! was_vertex && is_vertex)))) {