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

Enhancement: drawing of cross fill 

* Polygons were not filled
* Restrict cross filling to box-only shapes.
This commit is contained in:
Matthias Koefferlein 2019-06-20 17:55:44 +02:00
parent 32dc52143c
commit 391484b276
1 changed files with 25 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/laybasic/laybasic/layBitmapRenderer.cc
View File

@ -161,53 +161,35 @@ BitmapRenderer::insert (const db::DEdge &e)
m_edges.push_back (e); m_edges.push_back (e);
} }
static inline bool point_inside_box (const db::DPoint &pt, const db::DBox &box)
{
return (! (db::coord_traits<db::DBox::coord_type>::equal (pt.x (), box.left ()) || db::coord_traits<db::DBox::coord_type>::equal (pt.x (), box.right ())) &&
! (db::coord_traits<db::DBox::coord_type>::equal (pt.y (), box.bottom ()) || db::coord_traits<db::DBox::coord_type>::equal (pt.y (), box.top ())));
}
void void
BitmapRenderer::add_xfill () BitmapRenderer::add_xfill ()
{ {
bool any = false; db::DBox box;
db::DPoint a1, a2, b1, b2;
const double eps = 1e-10;
for (std::vector<lay::RenderEdge>::const_iterator e = m_edges.begin (); e != m_edges.end (); ++e) { for (std::vector<lay::RenderEdge>::const_iterator e = m_edges.begin (); e != m_edges.end (); ++e) {
if (! e->is_ortho ()) {
db::DPoint p1 = e->p1 (); return;
if (!any) {
a1 = a2 = b1 = b2 = p1;
any = true;
} else {
db::DVector d;
d = p1 - a1;
if (d.x () - d.y () < -eps) {
a1 = p1;
}
d = p1 - a2;
if (d.x () - d.y () > eps) {
a2 = p1;
}
d = p1 - b1;
if (d.x () + d.y () < -eps) {
b1 = p1;
}
d = p1 - b2;
if (d.x () + d.y () > eps) {
b2 = p1;
}
} }
box += e->p1 ();
box += e->p2 ();
} }
if (any) { if (! box.empty () && box.area () > 0.0) {
insert (db::DEdge (a1, a2));
insert (db::DEdge (b1, b2)); for (std::vector<lay::RenderEdge>::const_iterator e = m_edges.begin (); e != m_edges.end (); ++e) {
if (point_inside_box (e->p1 (), box) || point_inside_box (e->p2 (), box)) {
return;
}
}
insert (db::DEdge (box.p1 (), box.p2 ()));
insert (db::DEdge (box.lower_right (), box.upper_left ()));
} }
} }
@ -483,6 +465,9 @@ BitmapRenderer::draw (const db::Shape &shape, const db::CplxTrans &trans,
render_fill (*fill); render_fill (*fill);
} }
if (frame) { if (frame) {
if (m_xfill) {
add_xfill ();
}
render_contour (*frame); render_contour (*frame);
} }