WIP: mouse cursor and snap highlighting

This commit is contained in:
Matthias Koefferlein
2020-09-05 23:58:10 +02:00
parent 70981ab03b
commit fb90144176
11 changed files with 327 additions and 103 deletions
@@ -51,95 +51,101 @@ TEST(1)
view.set_max_hier_levels (1);
std::pair<bool, db::DPoint> res;
lay::PointSnapToObjectResult res;
// not hit
res = lay::obj_snap (&view, db::DPoint (1.505, 1.505), db::DVector (), 0.1);
EXPECT_EQ (res.first, false);
EXPECT_EQ (res.second.to_string (), "1.505,1.505");
EXPECT_EQ (res.object_snap, lay::PointSnapToObjectResult::NoObject);
EXPECT_EQ (res.snapped_point.to_string (), "1.505,1.505");
res = lay::obj_snap (&view, db::DPoint (0.505, 0.505), db::DVector (), 0.1);
EXPECT_EQ (res.first, true);
EXPECT_EQ (res.second.to_string (), "0.5,0.5");
EXPECT_EQ (res.object_snap, lay::PointSnapToObjectResult::ObjectEdge);
EXPECT_EQ (res.snapped_point.to_string (), "0.5,0.5");
res = lay::obj_snap (&view, db::DPoint (0.485, 0.505), db::DVector (0.01, 0.01), 0.1);
EXPECT_EQ (res.first, true);
EXPECT_EQ (res.second.to_string (), "0.49,0.51");
EXPECT_EQ (res.object_snap, lay::PointSnapToObjectResult::ObjectEdge);
EXPECT_EQ (res.snapped_point.to_string (), "0.49,0.51");
EXPECT_EQ (res.object_ref.to_string (), "(0,1;1,0)");
res = lay::obj_snap (&view, db::DPoint (0.205, 0.215), db::DVector (0.01, 0.025), 0.1);
EXPECT_EQ (res.first, false);
EXPECT_EQ (res.second.to_string (), "0.21,0.225");
EXPECT_EQ (res.object_snap, lay::PointSnapToObjectResult::NoObject);
EXPECT_EQ (res.snapped_point.to_string (), "0.21,0.225");
res = lay::obj_snap (&view, db::DPoint (0.505, 1.005), db::DVector (), 0.1);
EXPECT_EQ (res.first, false);
EXPECT_EQ (res.second.to_string (), "0.505,1.005");
EXPECT_EQ (res.object_snap, lay::PointSnapToObjectResult::NoObject);
EXPECT_EQ (res.snapped_point.to_string (), "0.505,1.005");
res = lay::obj_snap (&view, db::DPoint (0.005, 1.005), db::DVector (), 0.1);
EXPECT_EQ (res.first, true);
EXPECT_EQ (res.second.to_string (), "0,1");
EXPECT_EQ (res.object_snap, lay::PointSnapToObjectResult::ObjectVertex);
EXPECT_EQ (res.snapped_point.to_string (), "0,1");
res = lay::obj_snap (&view, db::DPoint (0.0, 1.005), db::DVector (), 0.1);
EXPECT_EQ (res.object_snap, lay::PointSnapToObjectResult::ObjectVertex);
EXPECT_EQ (res.snapped_point.to_string (), "0,1");
res = lay::obj_snap (&view, db::DPoint (1.000, 0.505), db::DPoint (0.505, 0.500), db::DVector (), lay::AC_Horizontal, 0.1);
EXPECT_EQ (res.first, true);
EXPECT_EQ (res.second.to_string (), "0.495,0.505");
EXPECT_EQ (res.object_snap, lay::PointSnapToObjectResult::ObjectEdge);
EXPECT_EQ (res.snapped_point.to_string (), "0.495,0.505");
// projected snapping
res = lay::obj_snap (&view, db::DPoint (1.000, 0.505), db::DPoint (0.005, 1.005), db::DVector (), lay::AC_Horizontal, 0.1);
EXPECT_EQ (res.first, true);
EXPECT_EQ (res.second.to_string (), "0,0.505");
EXPECT_EQ (res.object_snap, lay::PointSnapToObjectResult::ObjectUnspecific);
EXPECT_EQ (res.snapped_point.to_string (), "0,0.505");
EXPECT_EQ (res.object_ref.to_string (), "(0,1;0,1)");
std::pair<bool, db::DEdge> res2;
lay::TwoPointSnapToObjectResult res2;
res2 = lay::obj_snap2 (&view, db::DPoint (1.5, 1.5), db::DVector (), 0.005, 1.0);
EXPECT_EQ (res2.first, false);
EXPECT_EQ (res2.second.to_string (), "(0,0;0,0)");
EXPECT_EQ (res2.any, false);
EXPECT_EQ (db::DEdge (res2.first, res2.second).to_string (), "(0,0;0,0)");
res2 = lay::obj_snap2 (&view, db::DPoint (0.205, 0.5), db::DVector (), 0.005, 1.0);
EXPECT_EQ (res2.first, true);
EXPECT_EQ (res2.second.to_string (), "(0.3525,0.6475;0,0.295)");
EXPECT_EQ (res2.any, true);
EXPECT_EQ (db::DEdge (res2.first, res2.second).to_string (), "(0.3525,0.6475;0,0.295)");
res2 = lay::obj_snap2 (&view, db::DPoint (0.205, 0.5), db::DVector (), lay::AC_Horizontal, 0.005, 1.0);
EXPECT_EQ (res2.first, true);
EXPECT_EQ (res2.second.to_string (), "(0,0.5;0.5,0.5)");
EXPECT_EQ (res2.any, true);
EXPECT_EQ (db::DEdge (res2.first, res2.second).to_string (), "(0,0.5;0.5,0.5)");
res2 = lay::obj_snap2 (&view, db::DPoint (0.205, 0.5), db::DVector (0.03, 0.03), lay::AC_Horizontal, 0.005, 1.0);
EXPECT_EQ (res2.first, true);
EXPECT_EQ (res2.second.to_string (), "(0,0.51;0.49,0.51)");
EXPECT_EQ (res2.any, true);
EXPECT_EQ (db::DEdge (res2.first, res2.second).to_string (), "(0,0.51;0.49,0.51)");
res2 = lay::obj_snap2 (&view, db::DPoint (0.205, 0.5), db::DVector (), lay::AC_Vertical, 0.005, 1.0);
EXPECT_EQ (res2.first, true);
EXPECT_EQ (res2.second.to_string (), "(0.205,0.795;0.205,0)");
EXPECT_EQ (res2.any, true);
EXPECT_EQ (db::DEdge (res2.first, res2.second).to_string (), "(0.205,0.795;0.205,0)");
res2 = lay::obj_snap2 (&view, db::DPoint (0.205, 0.5), db::DVector (), lay::AC_Diagonal, 0.005, 1.0);
EXPECT_EQ (res2.first, true);
EXPECT_EQ (res2.second.to_string (), "(0.3525,0.6475;0,0.295)");
EXPECT_EQ (res2.any, true);
EXPECT_EQ (db::DEdge (res2.first, res2.second).to_string (), "(0.3525,0.6475;0,0.295)");
res2 = lay::obj_snap2 (&view, db::DPoint (0.205, 0.505), db::DVector (), lay::AC_Ortho, 0.005, 1.0);
EXPECT_EQ (res2.first, true);
EXPECT_EQ (res2.second.to_string (), "(0,0.505;0.495,0.505)");
EXPECT_EQ (res2.any, true);
EXPECT_EQ (db::DEdge (res2.first, res2.second).to_string (), "(0,0.505;0.495,0.505)");
res2 = lay::obj_snap2 (&view, db::DPoint (0.205, 0.5), db::DVector (), lay::AC_Any, 0.005, 1.0);
EXPECT_EQ (res2.first, true);
EXPECT_EQ (res2.second.to_string (), "(0.3525,0.6475;0,0.295)");
EXPECT_EQ (res2.any, true);
EXPECT_EQ (db::DEdge (res2.first, res2.second).to_string (), "(0.3525,0.6475;0,0.295)");
res2 = lay::obj_snap2 (&view, db::DPoint (0.205, 0.495), db::DVector (0.01, 0.01), 0.005, 1.0);
EXPECT_EQ (res2.first, true);
EXPECT_EQ (res2.second.to_string (), "(0.355,0.645;0,0.29)");
EXPECT_EQ (res2.any, true);
EXPECT_EQ (db::DEdge (res2.first, res2.second).to_string (), "(0.355,0.645;0,0.29)");
res2 = lay::obj_snap2 (&view, db::DPoint (0.5, 0.5), db::DVector (), 0.005, 1.0);
EXPECT_EQ (res2.first, false);
EXPECT_EQ (res2.second.to_string (), "(0,0;0,0)");
EXPECT_EQ (res2.any, false);
EXPECT_EQ (db::DEdge (res2.first, res2.second).to_string (), "(0,0;0,0)");
res2 = lay::obj_snap2 (&view, db::DPoint (0.005, 0.5), db::DVector (), 0.005, 1.0);
EXPECT_EQ (res2.first, true);
EXPECT_EQ (res2.second.to_string (), "(0,0.5;0.5,0.5)");
EXPECT_EQ (res2.any, true);
EXPECT_EQ (db::DEdge (res2.first, res2.second).to_string (), "(0,0.5;0.5,0.5)");
res2 = lay::obj_snap2 (&view, db::DPoint (0.0, 0.5), db::DVector (), 0.005, 1.0);
EXPECT_EQ (res2.first, false);
EXPECT_EQ (res2.second.to_string (), "(0,0;0,0)");
EXPECT_EQ (res2.any, false);
EXPECT_EQ (db::DEdge (res2.first, res2.second).to_string (), "(0,0;0,0)");
res2 = lay::obj_snap2 (&view, db::DPoint (-0.2, 0.5), db::DVector (), 0.005, 1.0);
EXPECT_EQ (res2.first, false);
EXPECT_EQ (res2.second.to_string (), "(0,0;0,0)");
EXPECT_EQ (res2.any, false);
EXPECT_EQ (db::DEdge (res2.first, res2.second).to_string (), "(0,0;0,0)");
}
+2 -2
View File
@@ -13,10 +13,10 @@ SOURCES = \
layLayerProperties.cc \
layParsedLayerSource.cc \
layRenderer.cc \
laySnap.cc \
layNetlistBrowserModelTests.cc \
layNetlistBrowserTreeModelTests.cc \
layAbstractMenuTests.cc
layAbstractMenuTests.cc \
laySnapTests.cc
INCLUDEPATH += $$TL_INC $$LAYBASIC_INC $$DB_INC $$GSI_INC $$OUT_PWD/../laybasic
DEPENDPATH += $$TL_INC $$LAYBASIC_INC $$DB_INC $$GSI_INC $$OUT_PWD/../laybasic