Matrix2d and Matrix3d generalized for integer coordinates, added transformation methods for polygons, regions, boxes, edges, etc. Fill enhancements basically implemented. Needs testing.

This commit is contained in:
Matthias Koefferlein
2021-03-05 15:31:40 +01:00
parent beefaf40f5
commit dbeee1531e
19 changed files with 1391 additions and 527 deletions
BIN
View File
Binary file not shown.
+142
View File
@@ -67,6 +67,48 @@ class DBMatrix_TestClass < TestBase
end
def test_1i
m = RBA::IMatrix2d.new
assert_equal("(1,0) (0,1)", m.to_s)
m = RBA::IMatrix2d.new(2.0)
assert_equal("(2,0) (0,2)", m.to_s)
m = RBA::IMatrix2d.newc(2, 90, true)
assert_equal("(0,2) (2,0)", m.to_s)
m = RBA::IMatrix2d.new(RBA::ICplxTrans.new(2, 90, true, RBA::Point.new(0, 0)))
assert_equal("(0,2) (2,0)", m.to_s)
m = RBA::IMatrix2d.newc(0.0, 2, 2, 90, true)
assert_equal("(0,2) (2,0)", m.to_s)
m = RBA::IMatrix2d.newc(17.0, 2, 3, 90, true)
assert_equal("17.000000", "%.6f" % m.shear_angle)
assert_equal("90.0", m.angle.to_s)
assert_equal("2.000000", "%.6f" % m.mag_x)
assert_equal("3.000000", "%.6f" % m.mag_y)
assert_equal(true, m.is_mirror?)
m = RBA::IMatrix2d.new(1, 2, 3, 4)
assert_equal("(1,2) (3,4)", m.to_s)
assert_equal("1.0", m.m11.to_s)
assert_equal("2.0", m.m12.to_s)
assert_equal("3.0", m.m21.to_s)
assert_equal("4.0", m.m22.to_s)
assert_equal("4.0", m.m(1,1).to_s)
assert_equal("2.0", m.m(0,1).to_s)
m = RBA::IMatrix2d.newc(2, 90, true)
assert_equal(true, m.is_mirror?)
t = m.cplx_trans
assert_equal("m45 *2 0,0", t.to_s)
m = RBA::IMatrix2d.newc(2, 90, false)
assert_equal("90.0", m.angle.to_s)
assert_equal(false, m.is_mirror?)
t = m.inverted.cplx_trans
assert_equal("r270 *0.5 0,0", t.to_s)
p = m.trans(RBA::Point.new(1, 2))
assert_equal("-4,2", p.to_s)
assert_equal("(1,0) (0,1)", (m.inverted*m).to_s)
assert_equal("(0,-1.5) (1.5,0)", (m+m.inverted).to_s)
end
def test_2
m = RBA::Matrix3d.new
@@ -127,6 +169,66 @@ class DBMatrix_TestClass < TestBase
end
def test_2i
m = RBA::IMatrix3d.new
assert_equal("(1,0,0) (0,1,0) (0,0,1)", m.to_s)
m = RBA::IMatrix3d.new(2.0)
assert_equal("(2,0,0) (0,2,0) (0,0,1)", m.to_s)
m = RBA::IMatrix3d.newc(2, 90, true)
assert_equal("(0,2,0) (2,0,0) (0,0,1)", m.to_s)
m = RBA::IMatrix3d.new(RBA::ICplxTrans.new(2, 90, true, RBA::Point.new(1, 2)))
assert_equal("(0,2,1) (2,0,2) (0,0,1)", m.to_s)
m = RBA::IMatrix3d.newc(0.0, 2, 3, 90, true)
assert_equal("(0,3,0) (2,0,0) (0,0,1)", m.to_s)
m = RBA::IMatrix3d.newc(17.0, 2, 3, 90, true)
assert_equal("17.000000", "%.6f" % m.shear_angle)
assert_equal("90.0", m.angle.to_s)
assert_equal("2.000000", "%.6f" % m.mag_x)
assert_equal("3.000000", "%.6f" % m.mag_y)
assert_equal(true, m.is_mirror?)
m = RBA::IMatrix3d.newc(RBA::Point.new(1, 2), 17.0, 2, 3, 90, true)
assert_equal("17.000000", "%.6f" % m.shear_angle)
assert_equal("90.0", m.angle.to_s)
assert_equal("2.000000", "%.6f" % m.mag_x)
assert_equal("3.000000", "%.6f" % m.mag_y)
assert_equal("1,2", m.disp.to_s)
assert_equal(true, m.is_mirror?)
m = RBA::IMatrix3d.new(1, 2, 3, 4)
assert_equal("(1,2,0) (3,4,0) (0,0,1)", m.to_s)
assert_equal("4.0", m.m(1,1).to_s)
assert_equal("2.0", m.m(0,1).to_s)
assert_equal("0.0", m.m(0,2).to_s)
assert_equal("1.0", m.m(2,2).to_s)
m = RBA::IMatrix3d.newc(2, 90, true)
assert_equal(true, m.is_mirror?)
t = m.cplx_trans
assert_equal("m45 *2 0,0", t.to_s)
m = RBA::IMatrix3d.newc(2, 90, false)
assert_equal("90.0", m.angle.to_s)
assert_equal(false, m.is_mirror?)
t = m.inverted.cplx_trans
assert_equal("r270 *0.5 0,0", t.to_s)
p = m.trans(RBA::Point.new(1, 2))
assert_equal("-4,2", p.to_s)
assert_equal("(1,0,0) (0,1,0) (0,0,1)", (m.inverted*m).to_s)
assert_equal("(0,-1.5,0) (1.5,0,0) (0,0,2)", (m+m.inverted).to_s)
m = RBA::IMatrix3d.new(0, 1, -1, 0, 1, 2)
t = m.cplx_trans
assert_equal("r270 *1 1,2", t.to_s)
m = RBA::IMatrix3d.new(0, 1, 1, -1, 0, 2, 0, 0, 1)
t = m.cplx_trans
assert_equal("r270 *1 1,2", t.to_s)
assert_equal("1", m.disp.x.to_s)
assert_equal("2", m.disp.y.to_s)
m = RBA::IMatrix3d.newc(0.1, -0.2, 1.0, RBA::Point.new(1, 2), 17.0, 2, 2, 270, true)
assert_equal("0.100000", "%.6f" % m.tx(1.0))
assert_equal("-0.200000", "%.6f" % m.ty(1.0))
assert_equal("17.000000", "%.6f" % m.shear_angle)
assert_equal("1,2", m.disp.to_s)
end
def test_3
p = [ RBA::DPoint.new(1, 1), RBA::DPoint.new(2, 1), RBA::DPoint.new(2, 2) ]
@@ -142,6 +244,46 @@ class DBMatrix_TestClass < TestBase
end
def test_4
m = RBA::IMatrix2d::new(1.0, 0.5, -0.5, 2.0)
assert_equal((m * RBA::Point::new(10, 20)).to_s, "20,35")
assert_equal((m * RBA::Vector::new(10, 20)).to_s, "20,35")
assert_equal((m * RBA::Box::new(-5, -10, 10, 20)).to_s, "(-10,-25;20,43)")
assert_equal((m * RBA::Polygon::new(RBA::Box::new(-5, -10, 10, 20))).to_s, "(5,-25;-10,-18;5,43;20,35)")
assert_equal((m * RBA::SimplePolygon::new(RBA::Box::new(-5, -10, 10, 20))).to_s, "(5,-25;-10,-18;5,43;20,35)")
assert_equal((m * RBA::Edge::new(RBA::Point::new(-5, -10), RBA::Point::new(10, 20))).to_s, "(-10,-18;20,35)")
assert_equal(RBA::Region::new(RBA::Box::new(-5, -10, 10, 20)).transformed(m).to_s, "(5,-25;-10,-18;5,43;20,35)")
assert_equal(RBA::Edges::new(RBA::Edge::new(RBA::Point::new(-5, -10), RBA::Point::new(10, 20))).transformed(m).to_s, "(-10,-18;20,35)")
m = RBA::Matrix2d::new(1.0, 0.5, -0.5, 2.0)
assert_equal((m * RBA::DPoint::new(10, 20)).to_s, "20,35")
assert_equal((m * RBA::DVector::new(10, 20)).to_s, "20,35")
assert_equal((m * RBA::DBox::new(-5, -10, 10, 20)).to_s, "(-10,-25;20,42.5)")
assert_equal((m * RBA::DPolygon::new(RBA::DBox::new(-5, -10, 10, 20))).to_s, "(5,-25;-10,-17.5;5,42.5;20,35)")
assert_equal((m * RBA::DSimplePolygon::new(RBA::DBox::new(-5, -10, 10, 20))).to_s, "(5,-25;-10,-17.5;5,42.5;20,35)")
assert_equal((m * RBA::DEdge::new(RBA::DPoint::new(-5, -10), RBA::DPoint::new(10, 20))).to_s, "(-10,-17.5;20,35)")
m = RBA::IMatrix3d::new(1.0, 0.5, 1.0, -0.5, 2.0, 0.0, 0.0, 0.0, 1.0)
assert_equal((m * RBA::Point::new(10, 20)).to_s, "21,35")
assert_equal((m * RBA::Vector::new(10, 20)).to_s, "20,35")
assert_equal((m * RBA::Box::new(-5, -10, 10, 20)).to_s, "(-9,-25;21,43)")
assert_equal((m * RBA::Polygon::new(RBA::Box::new(-5, -10, 10, 20))).to_s, "(6,-25;-9,-18;6,43;21,35)")
assert_equal((m * RBA::SimplePolygon::new(RBA::Box::new(-5, -10, 10, 20))).to_s, "(6,-25;-9,-18;6,43;21,35)")
assert_equal((m * RBA::Edge::new(RBA::Point::new(-5, -10), RBA::Point::new(10, 20))).to_s, "(-9,-18;21,35)")
assert_equal(RBA::Region::new(RBA::Box::new(-5, -10, 10, 20)).transformed(m).to_s, "(6,-25;-9,-18;6,43;21,35)")
assert_equal(RBA::Edges::new(RBA::Edge::new(RBA::Point::new(-5, -10), RBA::Point::new(10, 20))).transformed(m).to_s, "(-9,-18;21,35)")
m = RBA::Matrix3d::new(1.0, 0.5, 1.0, -0.5, 2.0, 0.0, 0.0, 0.0, 1.0)
assert_equal((m * RBA::DPoint::new(10, 20)).to_s, "21,35")
assert_equal((m * RBA::DVector::new(10, 20)).to_s, "20,35")
assert_equal((m * RBA::DBox::new(-5, -10, 10, 20)).to_s, "(-9,-25;21,42.5)")
assert_equal((m * RBA::DPolygon::new(RBA::DBox::new(-5, -10, 10, 20))).to_s, "(6,-25;-9,-17.5;6,42.5;21,35)")
assert_equal((m * RBA::DSimplePolygon::new(RBA::DBox::new(-5, -10, 10, 20))).to_s, "(6,-25;-9,-17.5;6,42.5;21,35)")
assert_equal((m * RBA::DEdge::new(RBA::DPoint::new(-5, -10), RBA::DPoint::new(10, 20))).to_s, "(-9,-17.5;21,35)")
end
end
load("test_epilogue.rb")