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

Fixed #108 (Box#enlarge, Box#move on empty boxes)

This commit is contained in:
Matthias Koefferlein 2018-04-07 09:21:50 +02:00
parent 3d5780db2b
commit 829966d9a1
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/db/db/dbBox.h
View File

@ -860,8 +860,10 @@ template <class C, class R>
inline box<C, R> &
box<C, R>::move (const vector<C> &p)
{
m_p1 += p;
m_p2 += p;
if (! empty ()) {
m_p1 += p;
m_p2 += p;
}
return *this;
}
@ -869,8 +871,10 @@ template <class C, class R>
inline box<C, R> &
box<C, R>::enlarge (const vector<C> &p)
{
m_p1 -= p;
m_p2 += p;
if (! empty ()) {
m_p1 -= p;
m_p2 += p;
}
return *this;
}

7
src/db/unit_tests/dbBox.cc
View File

@ -41,12 +41,19 @@ TEST(2)
EXPECT_EQ (b.moved (db::Vector (10, 20)), db::Box (110, 20, 10, 220));
EXPECT_EQ (b.enlarged (db::Vector (10, 20)), db::Box (-10, -20, 110, 220));
EXPECT_EQ (empty.moved (db::Vector (10, 20)).empty (), true);
EXPECT_EQ (empty.enlarged (db::Vector (10, 20)).empty (), true);
EXPECT_EQ (b + db::Box (-10, 20, 100, 200), db::Box (-10, 0, 100, 200));
EXPECT_EQ (b + db::Box (-10, -20, 100, -10), db::Box (-10, -20, 100, 200));
EXPECT_EQ (b + db::Box (110, 220, 120, 250), db::Box (0, 0, 120, 250));
EXPECT_EQ (b & db::Box (110, 220, 120, 250), empty);
EXPECT_EQ (b & db::Box (50, 100, 120, 250), db::Box (50, 100, 100, 200));
EXPECT_EQ (b & db::Box (50, 100, 60, 120), db::Box (50, 100, 60, 120));
empty.move (db::Vector (10, 20));
EXPECT_EQ (empty == db::Box (), true);
empty.enlarge (db::Vector (10, 20));
EXPECT_EQ (empty == db::Box (), true);
}
TEST(3)