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

Merge pull request #364 from KLayout/issue-363 

Fixed #363 (able to draw invalid polygon with two points)
This commit is contained in:
Matthias Köfferlein 2019-09-29 21:26:58 +02:00 committed by GitHub
parent c328d55039 eda5a2497e
commit 1c16cea421
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/edt/edt/edtServiceImpl.cc
View File

@ -365,54 +365,35 @@ PolygonService::do_mouse_click (const db::DPoint &p)
void
PolygonService::do_finish_edit ()
{
// one point is reserved for the current one
if (m_points.size () < 4) {
throw tl::Exception (tl::to_string (QObject::tr ("A polygon must have at least 3 points")));
}
m_points.pop_back ();
deliver_shape (get_polygon (true /*compress*/));
deliver_shape (get_polygon ());
}
db::Polygon
PolygonService::get_polygon (bool compress) const
PolygonService::get_polygon () const
{
db::Polygon poly;
if (m_points.size () < 4) {
throw tl::Exception (tl::to_string (QObject::tr ("A polygon must have at least 3 points")));
}
std::vector<db::Point> points_dbu;
points_dbu.reserve (m_points.size () + 1);
for (std::vector<db::DPoint>::const_iterator p = m_points.begin (); p != m_points.end (); ++p) {
points_dbu.reserve (m_points.size ());
// one point is reserved for the current one
for (std::vector<db::DPoint>::const_iterator p = m_points.begin (); p + 1 != m_points.end (); ++p) {
points_dbu.push_back (trans () * *p);
}
if (m_closure_set) {
points_dbu.push_back (trans () * m_closure);
}
if (compress) {
std::vector<db::Point>::iterator wp = points_dbu.begin ();
db::Point p0 = points_dbu.back ();
for (std::vector<db::Point>::const_iterator p = points_dbu.begin (); p != points_dbu.end (); ++p) {
db::Point p1 = *p;
db::Point p2 = (p + 1 == points_dbu.end () ? points_dbu [0] : p[1]);
if (db::vprod_sign (db::Vector (p0, p1), db::Vector (p1, p2)) != 0) {
*wp++ = p1;
}
p0 = p1;
}
points_dbu.erase (wp, points_dbu.end ());
poly.assign_hull (points_dbu.begin (), points_dbu.end (), true, true /*remove reflected*/);
if (poly.hull ().size () < 3) {
throw tl::Exception (tl::to_string (QObject::tr ("A polygon must have at least 3 effective points")));
}
poly.assign_hull (points_dbu.begin (), points_dbu.end (), false);
return poly;
}

2
src/edt/edt/edtServiceImpl.h
View File

@ -100,7 +100,7 @@ private:
db::DPoint m_last;
void update_marker ();
db::Polygon get_polygon (bool compress) const;
db::Polygon get_polygon () const;
void add_closure ();
void set_last_point (const db::DPoint &p);
};