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

Enhanced progress estimation of box scanner - no progress jumping back and forth.

This commit is contained in:
Matthias Koefferlein 2019-12-17 22:38:17 +01:00
parent a9bd037b58
commit fcba0018ba
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/db/db/dbBoxScanner.h
View File

@ -415,6 +415,11 @@ private:
} while (f != future && bc (*f->first).left () == xx); } while (f != future && bc (*f->first).left () == xx);
} while (f != future && f - c < min_box_size); } while (f != future && f - c < min_box_size);
if (m_report_progress) {
// Note: there is no better estimation of the progress than "current" ...
progress->set (current - m_pp.begin ());
}
for (iterator_type i = f0; i != f; ++i) { for (iterator_type i = f0; i != f; ++i) {
for (iterator_type j = c; j < i; ++j) { for (iterator_type j = c; j < i; ++j) {
if (bs_boxes_overlap (bc (*i->first), bc (*j->first), enl)) { if (bs_boxes_overlap (bc (*i->first), bc (*j->first), enl)) {
@ -430,10 +435,6 @@ private:
x = xx; x = xx;
if (m_report_progress) {
progress->set (f - m_pp.begin ());
}
} }
y = yy; y = yy;