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

First draft of fill dialog with enhancements

This commit is contained in:
Matthias Koefferlein 2021-03-05 18:20:45 +01:00
parent 0d04937c91
commit 07966baf71
3 changed files with 980 additions and 625 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/db/db/dbFillTool.cc
View File

@ -388,10 +388,11 @@ compute_shear_matrix (const db::Vector &r, const db::Vector &c)
double det = r.x () * c.y () - r.y () * c.x ();
double m11 = c.y () * r.x () / det;
double m22 = m11;
double m12 = -c.x () * r.x () / det;
double m22 = c.y () * r.x () / det;
double m21 = -c.y () * r.y () / det;
return IMatrix2d (m11, m12, m12, m22);
return IMatrix2d (m11, m12, m21, m22);
}
DB_PUBLIC bool

1543
src/lay/lay/FillDialog.ui
View File

File diff suppressed because it is too large Load Diff

57
src/lay/lay/layFillDialog.cc
View File

@ -83,6 +83,8 @@ FillDialog::FillDialog (lay::Dispatcher *main, lay::LayoutView *view)
Ui::FillDialog::setupUi (this);
fc_boundary_layer->set_no_layer_available (true);
fill_area_stack->setCurrentIndex (0);
connect (fill_area_cbx, SIGNAL (currentIndexChanged (int)), this, SLOT (fill_area_changed (int)));
connect (button_box, SIGNAL (accepted ()), this, SLOT (ok_pressed ()));
@ -274,17 +276,37 @@ BEGIN_PROTECTED
const db::Cell *fill_cell = &cv->layout ().cell (fc.second);
int fc_bbox_layer = fc_boundary_layer->current_layer ();
if (fc_bbox_layer < 0 || ! cv->layout ().is_valid_layer (fc_bbox_layer)) {
if (fc_bbox_layer >= 0 && ! cv->layout ().is_valid_layer (fc_bbox_layer)) {
throw tl::Exception (tl::to_string (QObject::tr ("No valid layer selected to get fill cell's bounding box from")));
}
db::Box fc_bbox = fill_cell->bbox (fc_bbox_layer);
db::Box fc_bbox = fc_bbox_layer < 0 ? fill_cell->bbox () : fill_cell->bbox (fc_bbox_layer);
if (fc_bbox.empty ()) {
throw tl::Exception (tl::to_string (QObject::tr ("No valid layer selected to get fill cell's bounding box from - layer is empty for the fill cell")));
}
db::Coord row_dx = fc_bbox.width (), row_dy = 0;
db::Coord column_dx = 0.0, column_dy = fc_bbox.height ();
s = tl::to_string (row_le->text ());
ex = tl::Extractor (s.c_str ());
if (ex.try_read (x) && ex.test (",") && ex.try_read (y)) {
row_dx = db::coord_traits<db::Coord>::rounded (x / cv->layout ().dbu ());
row_dy = db::coord_traits<db::Coord>::rounded (y / cv->layout ().dbu ());
}
s = tl::to_string (column_le->text ());
ex = tl::Extractor (s.c_str ());
if (ex.try_read (x) && ex.test (",") && ex.try_read (y)) {
column_dx = db::coord_traits<db::Coord>::rounded (x / cv->layout ().dbu ());
column_dy = db::coord_traits<db::Coord>::rounded (y / cv->layout ().dbu ());
}
bool enhanced_fill = enhanced_cb->isChecked ();
double row_dx2 = 0.0, row_dy2 = 0.0;
double column_dx2 = 0.0, column_dy2 = 0.0;
const db::Cell *fill_cell2 = 0;
db::Box fc_bbox2;
@ -297,11 +319,30 @@ BEGIN_PROTECTED
fill_cell2 = &cv->layout ().cell (fc.second);
fc_bbox2 = fill_cell2->bbox (fc_bbox_layer);
fc_bbox2 = fc_bbox_layer < 0 ? fill_cell2->bbox () : fill_cell2->bbox (fc_bbox_layer);
if (fc_bbox2.empty ()) {
throw tl::Exception (tl::to_string (QObject::tr ("Second order fill cell is empty for the given boundary layer")));
}
row_dx2 = fc_bbox2.width ();
row_dy2 = 0;
column_dx2 = 0.0;
column_dy2 = fc_bbox2.height ();
s = tl::to_string (row_2nd_le->text ());
ex = tl::Extractor (s.c_str ());
if (ex.try_read (x) && ex.test (",") && ex.try_read (y)) {
row_dx2 = db::coord_traits<db::Coord>::rounded (x / cv->layout ().dbu ());
row_dy2 = db::coord_traits<db::Coord>::rounded (y / cv->layout ().dbu ());
}
s = tl::to_string (column_2nd_le->text ());
ex = tl::Extractor (s.c_str ());
if (ex.try_read (x) && ex.test (",") && ex.try_read (y)) {
column_dx2 = db::coord_traits<db::Coord>::rounded (x / cv->layout ().dbu ());
column_dy2 = db::coord_traits<db::Coord>::rounded (y / cv->layout ().dbu ());
}
}
if (tl::verbosity () >= 20) {
@ -483,7 +524,10 @@ BEGIN_PROTECTED
tl::info << "Compute fill for one region :" << fp0->to_string ();
}
bool any_fill = fill_region (cv.cell (), *fp0, fill_cell->cell_index (), fc_bbox, fr_bbox.p1 (), enhanced_fill, (enhanced_fill || fill_cell2) ? &new_fill_area : 0, fill_margin);
db::Vector rs (row_dx, row_dy), cs (column_dx, column_dy);
db::Vector ko = fc_bbox.center () - db::Point () - (rs + cs) / 2;
bool any_fill = fill_region (cv.cell (), *fp0, fill_cell->cell_index (), ko, rs, cs, fr_bbox.center (), enhanced_fill, (enhanced_fill || fill_cell2) ? &new_fill_area : 0, fill_margin);
if (! any_fill) {
non_filled_area.push_back (*fp0);
}
@ -506,6 +550,11 @@ BEGIN_PROTECTED
fc_bbox = fc_bbox2;
fill_margin = fill2_margin;
row_dx = row_dx2;
row_dy = row_dy2;
column_dx = column_dx2;
column_dy = column_dy2;
fill_cell2 = 0;
fc_bbox2 = db::Box ();