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

Merge branch 'api-enhancements'

Browse Source
This commit is contained in:
Matthias Koefferlein
2022-02-11 19:10:21 +01:00
parent d764adb101 75aaf10512
commit 2ed572e684
31 changed files with 1264 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testdata/ruby/dbBoxTest.rb
Vendored
+14
View File
@@ -106,6 +106,13 @@ class DBBox_TestClass < TestBase
a = RBA::DBox.new
assert_equal( a.empty?, true )
a = RBA::DBox::world
b = RBA::DBox::new(1, 2, 3, 4)
assert_equal( a.empty?, false )
assert_equal( a == RBA::DBox::world, true )
assert_equal( (a + b) == RBA::DBox::world, true )
assert_equal( (a & b) == b, true )
end
# DBox basics
@@ -303,6 +310,13 @@ class DBBox_TestClass < TestBase
a = RBA::Box.new
assert_equal( a.empty?, true )
a = RBA::Box::world
b = RBA::Box::new(1, 2, 3, 4)
assert_equal( a.empty?, false )
assert_equal( a == RBA::Box::world, true )
assert_equal( (a + b) == RBA::Box::world, true )
assert_equal( (a & b) == b, true )
end
# Box basics
testdata/ruby/dbCellInstArrayTest.rb
Vendored
+22
View File
@@ -49,6 +49,11 @@ class DBCellInst_TestClass < TestBase
assert_equal(a.trans.to_s, "r90 0,0")
assert_equal(a.cplx_trans.to_s, "r90 *1 0,0")
a = RBA::CellInstArray::new(0, RBA::Vector::new(42, -17))
assert_equal(a.is_complex?, false)
assert_equal(a.trans.to_s, "r0 42,-17")
assert_equal(a.cplx_trans.to_s, "r0 *1 42,-17")
a = RBA::CellInstArray::new(0, RBA::ICplxTrans::new(1.5))
assert_equal(a.is_complex?, true)
assert_equal(a.trans.to_s, "r0 0,0")
@@ -106,6 +111,12 @@ class DBCellInst_TestClass < TestBase
assert_equal(a.cplx_trans.to_s, "r90 *1 0,0")
assert_equal(a.to_s, "#0 r90 0,0 [10,20*3;30,40*5]")
a = RBA::CellInstArray::new(0, RBA::Vector::new(42, -17), RBA::Vector::new(10, 20), RBA::Vector::new(30, 40), 3, 5)
assert_equal(a.is_complex?, false)
assert_equal(a.trans.to_s, "r0 42,-17")
assert_equal(a.cplx_trans.to_s, "r0 *1 42,-17")
assert_equal(a.to_s, "#0 r0 42,-17 [10,20*3;30,40*5]")
a = RBA::CellInstArray::new(0, RBA::ICplxTrans::new(1.5), RBA::Vector::new(10, 20), RBA::Vector::new(30, 40), 3, 5)
assert_equal(a.is_complex?, true)
assert_equal(a.trans.to_s, "r0 0,0")
@@ -178,6 +189,11 @@ class DBCellInst_TestClass < TestBase
assert_equal(a.trans.to_s, "r90 0,0")
assert_equal(a.cplx_trans.to_s, "r90 *1 0,0")
a = RBA::DCellInstArray::new(0, RBA::DVector::new(42, -17))
assert_equal(a.is_complex?, false)
assert_equal(a.trans.to_s, "r0 42,-17")
assert_equal(a.cplx_trans.to_s, "r0 *1 42,-17")
a = RBA::DCellInstArray::new(0, RBA::DCplxTrans::new(1.5))
assert_equal(a.is_complex?, true)
assert_equal(a.trans.to_s, "r0 0,0")
@@ -235,6 +251,12 @@ class DBCellInst_TestClass < TestBase
assert_equal(a.cplx_trans.to_s, "r90 *1 0,0")
assert_equal(a.to_s, "#0 r90 0,0 [10,20*3;30,40*5]")
a = RBA::DCellInstArray::new(0, RBA::DVector::new(42, -17), RBA::DVector::new(10, 20), RBA::DVector::new(30, 40), 3, 5)
assert_equal(a.is_complex?, false)
assert_equal(a.trans.to_s, "r0 42,-17")
assert_equal(a.cplx_trans.to_s, "r0 *1 42,-17")
assert_equal(a.to_s, "#0 r0 42,-17 [10,20*3;30,40*5]")
a = RBA::DCellInstArray::new(0, RBA::DCplxTrans::new(1.5), RBA::DVector::new(10, 20), RBA::DVector::new(30, 40), 3, 5)
assert_equal(a.is_complex?, true)
assert_equal(a.trans.to_s, "r0 0,0")
testdata/ruby/dbLayout.rb
Vendored
+42
View File
@@ -1043,10 +1043,31 @@ class DBLayout_TestClass < TestBase
ci = l.clip(c0.cell_index, RBA::Box.new(0, 0, 200, 200))
assert_equal(dump_layer_i(l, 0, ci), "(0,100;200,200); (0,100;200,200); (100,0;200,200)")
cic = l.clip(c0, RBA::Box.new(0, 0, 200, 200))
assert_equal(dump_layer_i(l, 0, cic.cell_index), "(0,100;200,200); (0,100;200,200); (100,0;200,200)")
cid = l.clip(c0.cell_index, RBA::DBox.new(0, 0, 0.2, 0.2))
assert_equal(dump_layer_i(l, 0, cid), "(0,100;200,200); (0,100;200,200); (100,0;200,200)")
cicd = l.clip(c0, RBA::DBox.new(0, 0, 0.2, 0.2))
assert_equal(dump_layer_i(l, 0, cicd.cell_index), "(0,100;200,200); (0,100;200,200); (100,0;200,200)")
ci = l.multi_clip(c0.cell_index, [RBA::Box.new(0, 0, 200, 200),RBA::Box.new(1000, 0, 1300, 200)])
assert_equal(dump_layer_i(l, 0, ci[0]), "(0,100;200,200); (0,100;200,200); (100,0;200,200)")
assert_equal(dump_layer_i(l, 0, ci[1]), "(1000,0;1100,200); (1200,0;1300,200)")
cic = l.multi_clip(c0, [RBA::Box.new(0, 0, 200, 200),RBA::Box.new(1000, 0, 1300, 200)])
assert_equal(dump_layer_i(l, 0, cic[0].cell_index), "(0,100;200,200); (0,100;200,200); (100,0;200,200)")
assert_equal(dump_layer_i(l, 0, cic[1].cell_index), "(1000,0;1100,200); (1200,0;1300,200)")
cid = l.multi_clip(c0.cell_index, [RBA::DBox.new(0, 0, 0.2, 0.2),RBA::DBox.new(1.0, 0, 1.3, 0.2)])
assert_equal(dump_layer_i(l, 0, cid[0]), "(0,100;200,200); (0,100;200,200); (100,0;200,200)")
assert_equal(dump_layer_i(l, 0, cid[1]), "(1000,0;1100,200); (1200,0;1300,200)")
cidc = l.multi_clip(c0, [RBA::DBox.new(0, 0, 0.2, 0.2),RBA::DBox.new(1.0, 0, 1.3, 0.2)])
assert_equal(dump_layer_i(l, 0, cidc[0].cell_index), "(0,100;200,200); (0,100;200,200); (100,0;200,200)")
assert_equal(dump_layer_i(l, 0, cidc[1].cell_index), "(1000,0;1100,200); (1200,0;1300,200)")
ll = RBA::Layout.new
ll.dbu = l.dbu
ll.insert_layer_at(0, RBA::LayerInfo.new(2, 0))
@@ -1054,10 +1075,31 @@ class DBLayout_TestClass < TestBase
ci = l.clip_into(c0.cell_index, ll, RBA::Box.new(0, 0, 200, 200))
assert_equal(dump_layer_i(ll, 0, ci), "(0,100;200,200); (0,100;200,200); (100,0;200,200)")
cic = l.clip_into(c0, ll, RBA::Box.new(0, 0, 200, 200))
assert_equal(dump_layer_i(ll, 0, cic.cell_index), "(0,100;200,200); (0,100;200,200); (100,0;200,200)")
cid = l.clip_into(c0.cell_index, ll, RBA::DBox.new(0, 0, 0.2, 0.2))
assert_equal(dump_layer_i(ll, 0, cid), "(0,100;200,200); (0,100;200,200); (100,0;200,200)")
cicd = l.clip_into(c0, ll, RBA::DBox.new(0, 0, 0.2, 0.2))
assert_equal(dump_layer_i(ll, 0, cicd.cell_index), "(0,100;200,200); (0,100;200,200); (100,0;200,200)")
ci = l.multi_clip_into(c0.cell_index, ll, [RBA::Box.new(0, 0, 200, 200),RBA::Box.new(1000, 0, 1300, 200)])
assert_equal(dump_layer_i(ll, 0, ci[0]), "(0,100;200,200); (0,100;200,200); (100,0;200,200)")
assert_equal(dump_layer_i(ll, 0, ci[1]), "(1000,0;1100,200); (1200,0;1300,200)")
cic = l.multi_clip_into(c0, ll, [RBA::Box.new(0, 0, 200, 200),RBA::Box.new(1000, 0, 1300, 200)])
assert_equal(dump_layer_i(ll, 0, cic[0]), "(0,100;200,200); (0,100;200,200); (100,0;200,200)")
assert_equal(dump_layer_i(ll, 0, cic[1]), "(1000,0;1100,200); (1200,0;1300,200)")
cid = l.multi_clip_into(c0.cell_index, ll, [RBA::DBox.new(0, 0, 0.2, 0.2),RBA::DBox.new(1.0, 0, 1.3, 0.2)])
assert_equal(dump_layer_i(ll, 0, cid[0]), "(0,100;200,200); (0,100;200,200); (100,0;200,200)")
assert_equal(dump_layer_i(ll, 0, cid[1]), "(1000,0;1100,200); (1200,0;1300,200)")
cicd = l.multi_clip_into(c0, ll, [RBA::DBox.new(0, 0, 0.2, 0.2),RBA::DBox.new(1.0, 0, 1.3, 0.2)])
assert_equal(dump_layer_i(ll, 0, cicd[0]), "(0,100;200,200); (0,100;200,200); (100,0;200,200)")
assert_equal(dump_layer_i(ll, 0, cicd[1]), "(1000,0;1100,200); (1200,0;1300,200)")
end
def test_8
testdata/ruby/dbLayoutTest.rb
Vendored
+18 -15
View File
@@ -23,10 +23,10 @@ end
load("test_prologue.rb")
class DBLayout_TestClass < TestBase
class DBLayoutTest_TestClass < TestBase
# LayerInfo
def _test_1_Layout
def test_1_Layout
lp = RBA::LayerInfo::new
@@ -62,7 +62,7 @@ class DBLayout_TestClass < TestBase
end
# Basics: cells and instances
def _test_2_Layout
def test_2_Layout
ly = RBA::Layout::new
@@ -182,7 +182,7 @@ class DBLayout_TestClass < TestBase
end
# Instances and bboxes
def _test_5_Layout
def test_5_Layout
ly = RBA::Layout::new
@@ -223,10 +223,13 @@ class DBLayout_TestClass < TestBase
assert_equal( c1.bbox_per_layer( lindex ).to_s, "()" )
assert_equal( c1.bbox_per_layer( ldummy ).to_s, "()" )
assert_equal( ly.unique_cell_name("c3"), "c3" )
assert_equal( ly.unique_cell_name("c1"), "c1$1" )
end
# Instances and bboxes
def _test_6_Layout
def test_6_Layout
ly = RBA::Layout::new
@@ -398,7 +401,7 @@ class DBLayout_TestClass < TestBase
end
# Instances and editable mode
def _test_6_EditableLayout
def test_6_EditableLayout
ly = RBA::Layout::new( true )
assert_equal( ly.is_editable?, true )
@@ -470,7 +473,7 @@ class DBLayout_TestClass < TestBase
end
# Instances and bboxes
def _test_6_Layout_props
def test_6_Layout_props
ly = RBA::Layout::new
pid = ly.properties_id( { 17 => "a", "b" => [ 1, 5, 7 ] }.to_a )
@@ -648,7 +651,7 @@ class DBLayout_TestClass < TestBase
end
# Properties
def _test_6_Layout_props2
def test_6_Layout_props2
ly = RBA::Layout::new(true)
pid = ly.properties_id( { 17 => "a", "b" => [ 1, 5, 7 ] }.to_a )
@@ -697,7 +700,7 @@ class DBLayout_TestClass < TestBase
end
# Instances and bboxes (editable mode)
def _test_6_Layout_new
def test_6_Layout_new
if( RBA::Application::instance.is_editable? )
@@ -805,7 +808,7 @@ class DBLayout_TestClass < TestBase
end
# Copy/move between cells
def _test_7_cells_copy_move
def test_7_cells_copy_move
# because of set_property ...
if !RBA::Application::instance.is_editable?
@@ -879,7 +882,7 @@ class DBLayout_TestClass < TestBase
end
# top cells
def _test_8
def test_8
l = RBA::Layout.new
tc = []
@@ -916,7 +919,7 @@ class DBLayout_TestClass < TestBase
end
# under construction and update
def _test_9
def test_9
ly = RBA::Layout::new
l1 = ly.insert_layer(RBA::LayerInfo::new(1, 0))
@@ -946,7 +949,7 @@ class DBLayout_TestClass < TestBase
end
# Instance editing
def _test_10
def test_10
ly = RBA::Layout::new
@@ -1025,7 +1028,7 @@ class DBLayout_TestClass < TestBase
end
# User properties
def _test_11
def test_11
ly = RBA::Layout::new
@@ -1049,7 +1052,7 @@ class DBLayout_TestClass < TestBase
end
# Meta information
def _test_12
def test_12
mi = RBA::LayoutMetaInfo::new("myinfo", "a")
testdata/ruby/dbPolygonTest.rb
Vendored
+11
View File
@@ -277,8 +277,19 @@ class DBPolygon_TestClass < TestBase
a = RBA::Polygon::new( [ RBA::Point::new( 0, 1 ), RBA::Point::new( 1, 5 ), RBA::Point::new( 5, 5 ) ] )
assert_equal( a.to_s, "(0,1;1,5;5,5)" )
assert_equal( a.sized(2, 0, 2).to_s, "(-2,1;-1,5;7,5;2,1)" )
assert_equal( a.sized(RBA::Vector::new(2, 0), 2).to_s, "(-2,1;-1,5;7,5;2,1)" )
assert_equal( a.sized(RBA::Vector::new(2, 0)).to_s, "(-2,1;-1,5;7,5;2,1)" )
aa = a.dup
a.size(2, 0, 2);
assert_equal( a.to_s, "(-2,1;-1,5;7,5;2,1)" )
a = aa
aa = a.dup
a.size(RBA::Vector::new(2, 0), 2);
assert_equal( a.to_s, "(-2,1;-1,5;7,5;2,1)" )
a = aa
aa = a.dup
a.size(RBA::Vector::new(2, 0));
assert_equal( a.to_s, "(-2,1;-1,5;7,5;2,1)" )
a = RBA::Polygon::new
assert_equal( a.to_s, "()" )
testdata/ruby/dbRecursiveInstanceIterator.rb
Vendored
+11
View File
@@ -27,7 +27,16 @@ class DBLayout_TestClass < TestBase
def collect(s, l)
# check native iteration here too ..
res2 = []
s.each do |s|
r = "[#{s.inst_cell.name}]"
r += (s.trans * s.inst_trans).to_s
res2.push(r)
end
res = []
s.reset
while !s.at_end?
r = "[#{s.inst_cell.name}]"
r += (s.trans * s.inst_trans).to_s
@@ -35,6 +44,8 @@ class DBLayout_TestClass < TestBase
s.next
end
assert_equal(res, res2)
return res.join("/")
end
testdata/ruby/dbRecursiveShapeIterator.rb
Vendored
+16
View File
@@ -27,7 +27,21 @@ class DBRecursiveShapeIterator_TestClass < TestBase
def collect(s, l)
# check native iteration here too ..
res2 = []
s.each do |s|
r = "[#{l.cell_name(s.cell_index)}]"
if s.shape.is_box?
box = s.shape.box
r += box.transformed(s.trans).to_s
else
r += "X";
end
res2.push(r)
end
res = []
s.reset
while !s.at_end?
r = "[#{l.cell_name(s.cell_index)}]"
if s.shape.is_box?
@@ -40,6 +54,8 @@ class DBRecursiveShapeIterator_TestClass < TestBase
res.push(r)
end
assert_equal(res, res2)
return res.join("/")
end
testdata/ruby/dbRegionTest.rb
Vendored
+10
View File
@@ -318,6 +318,16 @@ class DBRegion_TestClass < TestBase
rr.size(10, 20, 2)
assert_equal(rr.to_s, "(-20,-40;-20,180;0,180;0,220;110,220;110,0;90,0;90,-40)")
assert_equal((r1 | r2).sized(RBA::Vector::new(10, 20)).to_s, "(-20,-40;-20,180;0,180;0,220;110,220;110,0;90,0;90,-40)")
rr = (r1 | r2).dup
rr.size(10, 20, 2)
assert_equal(rr.to_s, "(-20,-40;-20,180;0,180;0,220;110,220;110,0;90,0;90,-40)")
assert_equal((r1 | r2).sized(RBA::Vector::new(10, 20), 2).to_s, "(-20,-40;-20,180;0,180;0,220;110,220;110,0;90,0;90,-40)")
rr = (r1 | r2).dup
rr.size(10, 20, 2)
assert_equal(rr.to_s, "(-20,-40;-20,180;0,180;0,220;110,220;110,0;90,0;90,-40)")
r1.merged_semantics = false
assert_equal((r1 | r2).sized(10, 2).to_s, "(-20,-30;-20,170;0,170;0,210;110,210;110,10;90,10;90,-30)")
testdata/ruby/dbTextTest.rb
Vendored
+44
View File
@@ -69,12 +69,34 @@ class DBText_TestClass < TestBase
a = RBA::DText::new( "hallo", a.trans, 22.0, 7 )
assert_equal( a.string, "hallo" )
assert_equal( a.trans.to_s, "m45 5,7" )
assert_equal( a.position.to_s, "5,7" )
assert_equal( a.bbox.to_s, "(5,7;5,7)" )
assert_equal( a.font, 7 )
assert_equal( a.size, 22.0 )
a.font = 8
assert_equal( a.font, 8 )
a.halign = 1
assert_equal( a.halign.to_i, 1 )
assert_equal( a.halign, RBA::DText::HAlignCenter )
assert_equal( a.halign.to_s, "HAlignCenter" )
a.halign = RBA::DText::HAlignRight
assert_equal( a.halign.to_i, 2 )
assert_equal( a.halign, RBA::DText::HAlignRight )
assert_equal( a.halign.to_s, "HAlignRight" )
a.valign = 1
assert_equal( a.valign.to_i, 1 )
assert_equal( a.valign, RBA::DText::VAlignCenter )
assert_equal( a.valign.to_s, "VAlignCenter" )
a.valign = RBA::DText::VAlignBottom
assert_equal( a.valign.to_i, 2 )
assert_equal( a.valign, RBA::DText::VAlignBottom )
assert_equal( a.valign.to_s, "VAlignBottom" )
a.size = 23.0
assert_equal( a.size, 23.0 )
@@ -141,12 +163,34 @@ class DBText_TestClass < TestBase
a = RBA::Text::new( "hallo", a.trans, 22, 7 )
assert_equal( a.string, "hallo" )
assert_equal( a.trans.to_s, "m45 5,7" )
assert_equal( a.position.to_s, "5,7" )
assert_equal( a.bbox.to_s, "(5,7;5,7)" )
assert_equal( a.font, 7 )
assert_equal( a.size, 22.0 )
a.font = 8
assert_equal( a.font, 8 )
a.halign = 1
assert_equal( a.halign.to_i, 1 )
assert_equal( a.halign, RBA::Text::HAlignCenter )
assert_equal( a.halign.to_s, "HAlignCenter" )
a.halign = RBA::Text::HAlignLeft
assert_equal( a.halign.to_i, 0 )
assert_equal( a.halign, RBA::Text::HAlignLeft )
assert_equal( a.halign.to_s, "HAlignLeft" )
a.valign = 1
assert_equal( a.valign.to_i, 1 )
assert_equal( a.valign, RBA::Text::VAlignCenter )
assert_equal( a.valign.to_s, "VAlignCenter" )
a.valign = RBA::Text::VAlignTop
assert_equal( a.valign.to_i, 0 )
assert_equal( a.valign, RBA::Text::VAlignTop )
assert_equal( a.valign.to_s, "VAlignTop" )
a.size = 23
assert_equal( a.size, 23 )
testdata/ruby/dbTransTest.rb
Vendored
+8
View File
@@ -80,6 +80,8 @@ class DBTrans_TestClass < TestBase
assert_equal( RBA::Trans::new(RBA::Trans::R180, RBA::DVector::new(5,-7)).to_s, "r180 5,-7" )
assert_equal( RBA::Trans::new(RBA::Trans::R180).to_s, "r180 0,0" )
assert_equal( e.trans( 2.0 ).to_s, "2" )
assert_equal( (e * 2.0).to_s, "2" )
assert_equal( e.trans( RBA::Edge::new(0, 1, 2, 3) ).to_s, "(-3,-2;-1,0)" )
assert_equal( ( e * RBA::Edge::new(0, 1, 2, 3) ).to_s, "(-3,-2;-1,0)" )
assert_equal( e.trans( RBA::Box::new(0, 1, 2, 3) ).to_s, "(-3,-2;-1,0)" )
@@ -140,7 +142,9 @@ class DBTrans_TestClass < TestBase
assert_equal( mb.trans( RBA::DPoint::new( 1, 0 )).to_s, "17,3" )
assert_equal( mb.ctrans(2).to_s, "4.0" )
assert_equal( (mb * 2).to_s, "4.0" )
assert_equal( i.ctrans(2).to_s, "1.0" )
assert_equal( (i * 2).to_s, "1.0" )
end
@@ -199,6 +203,7 @@ class DBTrans_TestClass < TestBase
assert_equal( (c.angle - 45).abs < 1e-10, true )
assert_equal( c.ctrans( 5 ).to_s, "3.75" )
assert_equal( (c * 5).to_s, "3.75" )
assert_equal( c.trans( RBA::DPoint::new( 12, 16 ) ).to_s, "17.3492424049,-14.6213203436" )
assert_equal( RBA::DCplxTrans::new.to_s, "r0 *1 0,0" )
@@ -306,7 +311,9 @@ class DBTrans_TestClass < TestBase
assert_equal( mb.trans( RBA::Point::new( 1, 0 )).to_s, "17,3" )
assert_equal( mb.ctrans(2).to_s, "4.0" )
assert_equal( (mb * 2).to_s, "4.0" )
assert_equal( i.ctrans(2).to_s, "1.0" )
assert_equal( (i * 2).to_s, "1.0" )
end
@@ -353,6 +360,7 @@ class DBTrans_TestClass < TestBase
assert_equal( (c.angle - 45).abs < 1e-10, true )
assert_equal( c.ctrans( 5 ).to_s, "3.75" )
assert_equal( (c * 5).to_s, "3.75" )
assert_equal( c.trans( RBA::Point::new( 12, 16 ) ).to_s, "17.3492424049,-14.6213203436" )
assert_equal( RBA::CplxTrans::new.to_s, "r0 *1 0,0" )