luke/klayout
1
0
Fork 0
mirror of https://github.com/KLayout/klayout.git synced 2026-09-07 03:21:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Edges#each, Edges#each_merged, Region#each, Region#each_merged, Texts#each and EdgePairs#each now deliver objects with properties too.

Browse Source
This commit is contained in:
Matthias Koefferlein
2025-02-14 22:11:18 +01:00
parent 502346608f
commit e48c6f3660
9 changed files with 96 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testdata/ruby/dbEdgePairsTest.rb
Vendored
+6
View File
@@ -590,6 +590,12 @@ class DBEdgePairs_TestClass < TestBase
r.insert(RBA::EdgePairWithProperties::new(RBA::EdgePair::new(RBA::Edge::new(0, 0, 100, 100), RBA::Edge::new(200, 300, 200, 500)), { 1 => "one" }))
assert_equal(r.to_s, "(0,0;100,100)/(200,300;200,500){1=>one}")
r = RBA::EdgePairs::new
r.insert(RBA::EdgePairWithProperties::new(RBA::EdgePair::new(RBA::Edge::new(0, 0, 100, 100), RBA::Edge::new(200, 300, 200, 500)), { 1 => "one" }))
r.insert(RBA::EdgePair::new(RBA::Edge::new(0, 10, 100, 110), RBA::Edge::new(220, 300, 220, 500)))
s = r.each.collect(&:to_s).join(";")
assert_equal(s, "(0,10;100,110)/(220,300;220,500) props={};(0,0;100,100)/(200,300;200,500) props={1=>one}")
end
end
testdata/ruby/dbEdgesTest.rb
Vendored
+22 -6
View File
@@ -129,12 +129,8 @@ class DBEdges_TestClass < TestBase
r.assign(RBA::Edges::new(RBA::Box::new(10, 20, 100, 200)))
assert_equal(csort(r.to_s), csort("(10,20;10,200);(10,200;100,200);(100,200;100,20);(100,20;10,20)"))
s = ""
r.each do |e|
s.empty? || s += ";"
s += e.to_s
end
assert_equal(s, "(10,20;10,200);(10,200;100,200);(100,200;100,20);(100,20;10,20)")
s = r.each.collect(&:to_s).join(";")
assert_equal(s, "(10,20;10,200) props={};(10,200;100,200) props={};(100,200;100,20) props={};(100,20;10,20) props={}")
assert_equal(r.is_empty?, false)
assert_equal(r.count, 4)
assert_equal(r.hier_count, 4)
@@ -1019,6 +1015,26 @@ class DBEdges_TestClass < TestBase
r.insert(s)
assert_equal(r.to_s, "(0,0;100,100){1=>one}")
r = RBA::Edges::new
s = RBA::Shapes::new
s.insert(RBA::EdgeWithProperties::new(RBA::Edge::new(0, 0, 100, 100), { 1 => "one" }))
r.insert(s)
assert_equal(r.to_s, "(0,0;100,100){1=>one}")
r = RBA::Edges::new
r.insert(RBA::EdgeWithProperties::new(RBA::Edge::new(0, 0, 100, 0), { 1 => "one" }))
r.insert(RBA::Edge::new(10, 0, 110, 0))
s = r.each.collect(&:to_s).join(";")
assert_equal(s, "(10,0;110,0) props={};(0,0;100,0) props={1=>one}")
s = r.each_merged.collect(&:to_s).join(";")
assert_equal(s, "(10,0;110,0) props={};(0,0;100,0) props={1=>one}")
r = RBA::Edges::new
r.insert(RBA::EdgeWithProperties::new(RBA::Edge::new(0, 0, 100, 0), { 1 => "one" }))
r.insert(RBA::EdgeWithProperties::new(RBA::Edge::new(10, 0, 110, 0), { 1 => "one" }))
s = r.each_merged.collect(&:to_s).join(";")
assert_equal(s, "(0,0;110,0) props={1=>one}")
end
end
testdata/ruby/dbRegionTest.rb
Vendored
+16 -6
View File
@@ -180,12 +180,8 @@ class DBRegion_TestClass < TestBase
RBA::Polygon::new(RBA::Box::new(20, 50, 120, 250))
] )
assert_equal(csort(r.to_s), csort("(10,20;10,200;100,200;100,20);(20,50;20,250;120,250;120,50)"))
s = ""
r.each do |p|
s.empty? || s += ";"
s += p.to_s
end
assert_equal(s, "(10,20;10,200;100,200;100,20);(20,50;20,250;120,250;120,50)")
s = r.each.collect(&:to_s).join(";")
assert_equal(s, "(10,20;10,200;100,200;100,20) props={};(20,50;20,250;120,250;120,50) props={}")
assert_equal(r.merged.to_s, "(10,20;10,200;20,200;20,250;120,250;120,50;100,50;100,20)")
assert_equal(r.merged(false, 1).to_s, "(10,20;10,200;20,200;20,250;120,250;120,50;100,50;100,20)")
assert_equal(r.merged(1).to_s, "(10,20;10,200;20,200;20,250;120,250;120,50;100,50;100,20)")
@@ -1571,6 +1567,20 @@ class DBRegion_TestClass < TestBase
r.insert(s)
assert_equal(r.to_s, "(0,0;0,200;100,200;100,0){1=>one}")
r = RBA::Region::new
r.insert(RBA::BoxWithProperties::new(RBA::Box::new(0, 0, 100, 200), { 1 => "one" }))
r.insert(RBA::Box::new(10, 20, 110, 220))
s = r.each.collect(&:to_s).join(";")
assert_equal(s, "(10,20;10,220;110,220;110,20) props={};(0,0;0,200;100,200;100,0) props={1=>one}")
s = r.each_merged.collect(&:to_s).join(";")
assert_equal(s, "(10,20;10,220;110,220;110,20) props={};(0,0;0,200;100,200;100,0) props={1=>one}")
r = RBA::Region::new
r.insert(RBA::BoxWithProperties::new(RBA::Box::new(0, 0, 100, 200), { 1 => "one" }))
r.insert(RBA::BoxWithProperties::new(RBA::Box::new(10, 20, 110, 220), { 1 => "one" }))
s = r.each_merged.collect(&:to_s).join(";")
assert_equal(s, "(0,0;0,200;10,200;10,220;110,220;110,20;100,20;100,0) props={1=>one}")
end
end
testdata/ruby/dbTextsTest.rb
Vendored
+6
View File
@@ -459,6 +459,12 @@ class DBTexts_TestClass < TestBase
r.insert(RBA::TextWithProperties::new(RBA::Text::new("abc", RBA::Trans::new), { 1 => "one" }))
assert_equal(r.to_s, "('abc',r0 0,0){1=>one}")
r = RBA::Texts::new
r.insert(RBA::TextWithProperties::new(RBA::Text::new("abc", RBA::Trans::new), { 1 => "one" }))
r.insert(RBA::Text::new("xuv", RBA::Trans::new))
s = r.each.collect(&:to_s).join(";")
assert_equal(s, "('xuv',r0 0,0) props={};('abc',r0 0,0) props={1=>one}")
end
end