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

Bugfixes, tests for flat interact between region and texts.

This commit is contained in:
Matthias Koefferlein 2020-05-13 18:25:43 +02:00
parent 16d6c75b0e
commit 831acb2c40
3 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/db/db/dbAsIfFlatEdgePairs.cc
View File

@ -75,7 +75,7 @@ AsIfFlatEdgePairs::in (const EdgePairs &other, bool invert) const
op.insert (*o);
}
std::auto_ptr<FlatEdgePairs> new_edge_pairs (new FlatEdgePairs (false));
std::auto_ptr<FlatEdgePairs> new_edge_pairs (new FlatEdgePairs ());
for (EdgePairsIterator o (begin ()); ! o.at_end (); ++o) {
if ((op.find (*o) == op.end ()) == invert) {

4
src/db/db/dbAsIfFlatTexts.cc
View File

@ -88,7 +88,7 @@ AsIfFlatTexts::in (const Texts &other, bool invert) const
op.insert (*o);
}
std::auto_ptr<FlatTexts> new_texts (new FlatTexts (false));
std::auto_ptr<FlatTexts> new_texts (new FlatTexts ());
for (TextsIterator o (begin ()); ! o.at_end (); ++o) {
if ((op.find (*o) == op.end ()) == invert) {
@ -308,7 +308,7 @@ AsIfFlatTexts::selected_interacting_generic (const Region &other, bool inverse)
scanner.insert2 (p.operator-> (), 1);
}
std::auto_ptr<FlatTexts> output (new FlatTexts (true));
std::auto_ptr<FlatTexts> output (new FlatTexts ());
if (! inverse) {

29
src/db/unit_tests/dbTextsTests.cc
View File

@ -173,3 +173,32 @@ TEST(6)
db::Texts r (db::RecursiveShapeIterator (ly, ly.cell (top_cell), l1));
EXPECT_EQ (r.to_string (), "('abc',r0 100,-200);('uvw',r0 110,210)");
}
TEST(7)
{
db::Texts texts;
texts.insert (db::Text ("abc", db::Trans (db::Vector (100, -200))));
texts.insert (db::Text ("uvw", db::Trans (db::Vector (110, 210))));
db::Region region;
region.insert (db::Polygon (db::Box (50, -300, 150, -100)));
EXPECT_EQ (texts.selected_interacting (region).to_string (), "('abc',r0 100,-200)");
EXPECT_EQ (texts.selected_not_interacting (region).to_string (), "('uvw',r0 110,210)");
{
db::Texts tcopy = texts;
tcopy.select_interacting (region);
EXPECT_EQ (tcopy.to_string (), "('abc',r0 100,-200)");
}
{
db::Texts tcopy = texts;
tcopy.select_not_interacting (region);
EXPECT_EQ (tcopy.to_string (), "('uvw',r0 110,210)");
}
db::Region region_out;
texts.pull_interacting (region_out, region);
EXPECT_EQ (region_out.to_string (), "(50,-300;50,-100;150,-100;150,-300)");
}