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

Merge pull request #2228 from KLayout/bugfix/issue-2220 

Fixing issue #2220 (select fails to select from 2nd layout when two a…
This commit is contained in:
Matthias Köfferlein 2025-12-07 22:29:08 +01:00 committed by GitHub
parent 4f30ad36db 7026cad2c1
commit b7bda218b6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/laybasic/laybasic/layFinder.cc
View File

@ -811,8 +811,12 @@ InstFinder::find_internal (LayoutViewBase *view, unsigned int cv_index, const db
void void
InstFinder::checkpoint () InstFinder::checkpoint ()
{ {
if (--m_tries < 0) { if (! point_mode ()) {
throw StopException (); ++*mp_progress;
} else {
if (--m_tries < 0) {
throw StopException ();
}
} }
} }
@ -835,15 +839,13 @@ InstFinder::visit_cell (const db::Cell &cell, const db::Box &search_box, const d
if (! point_mode ()) { if (! point_mode ()) {
++*mp_progress;
// look for instances to check here .. // look for instances to check here ..
for (db::Cell::touching_iterator inst = cell.begin_touching (search_box); ! inst.at_end (); ++inst) { for (db::Cell::touching_iterator inst = cell.begin_touching (search_box); ! inst.at_end (); ++inst) {
const db::CellInstArray &cell_inst = inst->cell_inst (); const db::CellInstArray &cell_inst = inst->cell_inst ();
const db::Cell &inst_cell = layout ().cell (cell_inst.object ().cell_index ()); const db::Cell &inst_cell = layout ().cell (cell_inst.object ().cell_index ());
++*mp_progress; checkpoint ();
if (! consider_cell (inst_cell)) { if (! consider_cell (inst_cell)) {
continue; continue;
@ -857,7 +859,7 @@ InstFinder::visit_cell (const db::Cell &cell, const db::Box &search_box, const d
db::box_convert <db::CellInst, false> bc (layout ()); db::box_convert <db::CellInst, false> bc (layout ());
for (db::CellInstArray::iterator p = cell_inst.begin_touching (search_box, bc); ! p.at_end (); ++p) { for (db::CellInstArray::iterator p = cell_inst.begin_touching (search_box, bc); ! p.at_end (); ++p) {
++*mp_progress; checkpoint ();
db::Box ibox; db::Box ibox;
if (! m_visible_layers || level == mp_view->get_max_hier_levels () - 1 || inst_cell.is_ghost_cell () || mp_view->is_cell_hidden (inst_cell.cell_index (), m_cv_index)) { if (! m_visible_layers || level == mp_view->get_max_hier_levels () - 1 || inst_cell.is_ghost_cell () || mp_view->is_cell_hidden (inst_cell.cell_index (), m_cv_index)) {