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

Texts#polygons now has an argument to specify a property key that receives the text string

This commit is contained in:
Matthias Koefferlein 2025-03-23 15:54:18 +01:00
parent f977973b85
commit a22f48d87a
12 changed files with 100 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -233,14 +233,32 @@ AsIfFlatTexts::processed_to_polygons (const TextToPolygonProcessorBase &filter)
}
RegionDelegate *
AsIfFlatTexts::polygons (db::Coord e) const
AsIfFlatTexts::polygons (db::Coord e, const tl::Variant &text_prop) const
{
db::property_names_id_type key_id = 0;
if (! text_prop.is_nil ()) {
key_id = db::property_names_id (text_prop);
}
std::map<std::string, db::properties_id_type> value_ids;
std::unique_ptr<FlatRegion> output (new FlatRegion ());
for (TextsIterator tp (begin ()); ! tp.at_end (); ++tp) {
db::Box box = tp->box ();
box.enlarge (db::Vector (e, e));
output->insert (db::Polygon (box));
if (key_id == 0) {
output->insert (db::Polygon (box));
} else {
std::string value (tp->string ());
auto v = value_ids.find (value);
if (v == value_ids.end ()) {
db::PropertiesSet ps;
ps.insert_by_id (key_id, db::property_values_id (value));
v = value_ids.insert (std::make_pair (value, db::properties_id (ps))).first;
}
output->insert (db::PolygonWithProperties (db::Polygon (box), v->second));
}
}
return output.release ();

2
src/db/db/dbAsIfFlatTexts.h
View File

@ -71,7 +71,7 @@ public:
virtual TextsDelegate *add (const Texts &other) const;
virtual RegionDelegate *polygons (db::Coord e) const;
virtual RegionDelegate *polygons (db::Coord e, const tl::Variant &text_prop) const;
virtual EdgesDelegate *edges () const;
virtual TextsDelegate *in (const Texts &, bool) const;

22
src/db/db/dbDeepTexts.cc
View File

@ -528,8 +528,15 @@ DeepTexts::processed_to_polygons (const TextToPolygonProcessorBase &filter) cons
return shape_collection_processed_impl<db::Text, db::Polygon, db::DeepRegion> (deep_layer (), filter);
}
RegionDelegate *DeepTexts::polygons (db::Coord e) const
RegionDelegate *DeepTexts::polygons (db::Coord e, const tl::Variant &text_prop) const
{
db::property_names_id_type key_id = 0;
if (! text_prop.is_nil ()) {
key_id = db::property_names_id (text_prop);
}
std::map<std::string, db::properties_id_type> value_ids;
db::DeepLayer new_layer = deep_layer ().derived ();
db::Layout &layout = const_cast<db::Layout &> (deep_layer ().layout ());
@ -539,7 +546,18 @@ RegionDelegate *DeepTexts::polygons (db::Coord e) const
db::Box box = s->bbox ();
box.enlarge (db::Vector (e, e));
db::Polygon poly (box);
output.insert (db::PolygonRef (poly, layout.shape_repository ()));
if (key_id == 0) {
output.insert (db::PolygonRef (poly, layout.shape_repository ()));
} else {
std::string value (s->text_string ());
auto v = value_ids.find (value);
if (v == value_ids.end ()) {
db::PropertiesSet ps;
ps.insert_by_id (key_id, db::property_values_id (value));
v = value_ids.insert (std::make_pair (value, db::properties_id (ps))).first;
}
output.insert (db::PolygonRefWithProperties (db::PolygonRef (poly, layout.shape_repository ()), v->second));
}
}
}

2
src/db/db/dbDeepTexts.h
View File

@ -86,7 +86,7 @@ public:
virtual TextsDelegate *add_in_place (const Texts &other);
virtual TextsDelegate *add (const Texts &other) const;
virtual RegionDelegate *polygons (db::Coord e) const;
virtual RegionDelegate *polygons (db::Coord e, const tl::Variant &text_prop) const;
virtual EdgesDelegate *edges () const;
virtual TextsDelegate *in (const Texts &, bool) const;

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

@ -49,7 +49,7 @@ EmptyTexts::clone () const
}
RegionDelegate *
EmptyTexts::polygons (db::Coord) const
EmptyTexts::polygons (db::Coord, const tl::Variant &) const
{
return new EmptyRegion ();
}

2
src/db/db/dbEmptyTexts.h
View File

@ -62,7 +62,7 @@ public:
virtual TextsDelegate *processed (const TextProcessorBase &) const { return new EmptyTexts (); }
virtual RegionDelegate *processed_to_polygons (const TextToPolygonProcessorBase &) const;
virtual RegionDelegate *polygons (db::Coord e) const;
virtual RegionDelegate *polygons (db::Coord e, const tl::Variant &text_prop) const;
virtual EdgesDelegate *edges () const;
virtual TextsDelegate *add_in_place (const Texts &other);

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

@ -177,9 +177,9 @@ Texts::iter () const
return *(i ? i : &def_iter);
}
void Texts::polygons (Region &output, db::Coord e) const
void Texts::polygons (Region &output, db::Coord e, const tl::Variant &text_prop) const
{
output.set_delegate (mp_delegate->polygons (e));
output.set_delegate (mp_delegate->polygons (e, text_prop));
}
void Texts::edges (Edges &output) const

2
src/db/db/dbTexts.h
View File

@ -590,7 +590,7 @@ public:
* The given extension is applied in all directions rendering a square of 2*e
* width and height. The center of the boxes will be the position of the texts.
*/
void polygons (Region &output, db::Coord e = 1) const;
void polygons (Region &output, db::Coord e = 1, const tl::Variant &text_prop = tl::Variant ()) const;
/**
* @brief Returns individual, dot-like edges

2
src/db/db/dbTextsDelegate.h
View File

@ -100,7 +100,7 @@ public:
virtual TextsDelegate *processed (const TextProcessorBase &proc) const = 0;
virtual RegionDelegate *processed_to_polygons (const TextToPolygonProcessorBase &proc) const = 0;
virtual RegionDelegate *polygons (db::Coord e) const = 0;
virtual RegionDelegate *polygons (db::Coord e, const tl::Variant &text_prop) const = 0;
virtual EdgesDelegate *edges () const = 0;
virtual TextsDelegate *add_in_place (const Texts &other) = 0;

12
src/db/db/gsiDeclDbTexts.cc
View File

@ -349,10 +349,10 @@ static db::Texts moved_xy (const db::Texts *r, db::Coord x, db::Coord y)
return r->transformed (db::Disp (db::Vector (x, y)));
}
static db::Region polygons0 (const db::Texts *e, db::Coord d)
static db::Region polygons0 (const db::Texts *e, db::Coord d, const tl::Variant &text_prop)
{
db::Region r;
e->polygons (r, d);
e->polygons (r, d, text_prop);
return r;
}
@ -710,9 +710,13 @@ Class<db::Texts> decl_Texts (decl_dbShapeCollection, "db", "Texts",
"@brief Returns a region with the enlarged bounding boxes of the texts\n"
"This method acts like the other version of \\extents, but allows giving different enlargements for x and y direction.\n"
) +
method_ext ("polygons", &polygons0, gsi::arg ("e", db::Coord (1)),
method_ext ("polygons", &polygons0, gsi::arg ("e", db::Coord (1)), gsi::arg ("text_prop", tl::Variant (), "nil"),
"@brief Converts the edge pairs to polygons\n"
"This method creates polygons from the texts. This is equivalent to calling \\extents."
"This method creates polygons from the texts. This is basically equivalent to calling \\extents. "
"In addition, a user property with the key given by 'text_prop' can be attached. The value of that "
"user property will be the text string. If 'text_prop' is nil, no user property is attached.\n"
"\n"
"The 'text_prop' argument has been added in version 0.30."
) +
method_ext ("filter", &filter, gsi::arg ("filter"),
"@brief Applies a generic filter in place (replacing the texts from the Texts collection)\n"

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

@ -276,3 +276,34 @@ TEST(8_add_with_properties)
EXPECT_EQ (r.to_string (), "('uvw',r0 -10,20){net=>17};('abc',r0 10,20){net=>17}");
EXPECT_EQ ((ro1 + rf2).to_string (), "('uvw',r0 -10,20){net=>17};('abc',r0 10,20){net=>17}");
}
TEST(9_polygons)
{
db::DeepShapeStore dss ("TOP", 0.001);
db::Texts rf;
db::Texts rd (dss);
rf.insert (db::Text ("ABC", db::Trans (db::Vector (10, 20))));
rf.insert (db::Text ("XZY", db::Trans (db::Vector (-10, -20))));
rd.insert (db::Text ("ABC", db::Trans (db::Vector (10, 20))));
rd.insert (db::Text ("XZY", db::Trans (db::Vector (-10, -20))));
db::Region r;
rf.polygons (r, 1);
EXPECT_EQ (r.to_string (), "(9,19;9,21;11,21;11,19);(-11,-21;-11,-19;-9,-19;-9,-21)");
rf.polygons (r, 2);
EXPECT_EQ (r.to_string (), "(8,18;8,22;12,22;12,18);(-12,-22;-12,-18;-8,-18;-8,-22)");
rd.polygons (r, 1);
EXPECT_EQ (r.to_string (), "(9,19;9,21;11,21;11,19);(-11,-21;-11,-19;-9,-19;-9,-21)");
rf.polygons (r, 1, tl::Variant (17));
EXPECT_EQ (r.to_string (), "(9,19;9,21;11,21;11,19){17=>ABC};(-11,-21;-11,-19;-9,-19;-9,-21){17=>XZY}");
rd.polygons (r, 1, tl::Variant (17));
EXPECT_EQ (r.to_string (), "(9,19;9,21;11,21;11,19){17=>ABC};(-11,-21;-11,-19;-9,-19;-9,-21){17=>XZY}");
}

13
testdata/ruby/dbTextsTest.rb vendored
View File

@ -529,6 +529,19 @@ class DBTexts_TestClass < TestBase
end
# polygons
def test_polygons
r = RBA::Texts::new
r.insert(RBA::Text::new("abc", RBA::Trans::new(10, 20)))
r.insert(RBA::Text::new("uvw", RBA::Trans::new(-10, -20)))
assert_equal(r.polygons.to_s, "(9,19;9,21;11,21;11,19);(-11,-21;-11,-19;-9,-19;-9,-21)")
assert_equal(r.polygons(2).to_s, "(8,18;8,22;12,22;12,18);(-12,-22;-12,-18;-8,-18;-8,-22)")
assert_equal(r.polygons(1, 17).to_s, "(9,19;9,21;11,21;11,19){17=>abc};(-11,-21;-11,-19;-9,-19;-9,-21){17=>uvw}")
end
end