Merge pull request #31 from andrsd/pt-translate

Adding `Point::translate` by a vector defined by 2 points

Author: andrsd

include/formo/point.h

@@ -113,12 +113,26 @@ class Point : public Shape {
     /// @param vec The vector of translation
     void translate(const Vector & vec);
 
+    /// Translates a point from point `p1` to point `p2`
+    ///
+    /// @param p1 First point
+    /// @param p2 Second point
+    void translate(const Point & p1, const Point & p2);
+
     /// Translates a point in the direction of the vector `vec`. The magnitude of the translation is
     /// the vector's magnitude.
     ///
     /// @param vec The vector of translation
+    /// @return Translated point
     Point translated(const Vector & vec) const;
 
+    /// Translates a point from point `p1` to point `p2`
+    ///
+    /// @param p1 First point
+    /// @param p2 Second point
+    /// @return Translated point
+    Point translated(const Point & p1, const Point & p2) const;
+
 private:
     gp_Pnt pnt;
     TopoDS_Vertex vtx;

python/src/formo.cpp

@@ -179,10 +179,14 @@ PYBIND11_MODULE(formo, m)
             py::arg("ax1"), py::arg("angle"))
         .def("rotated", &Point::rotated,
             py::arg("ax1"), py::arg("angle"))
-        .def("translate", &Point::translate,
+        .def("translate", static_cast<void (Point::*)(const Vector &)>(&Point::translate),
             py::arg("vec"))
-        .def("translated", &Point::translated,
+        .def("translate", static_cast<void (Point::*)(const Point &, const Point &)>(&Point::translate),
+            py::arg("p1"), py::arg("p2"))
+        .def("translated", static_cast<Point (Point::*)(const Vector &) const>(&Point::translated),
             py::arg("vec"))
+        .def("translated", static_cast<Point (Point::*)(const Point &, const Point &) const>(&Point::translated),
+            py::arg("p1"), py::arg("p2"))
     ;
 
     py::class_<Direction>(m, "Direction")

src/point.cpp

@@ -126,12 +126,24 @@ Point::translate(const Vector & vec)
     this->pnt.Translate(vec);
 }
 
+void
+Point::translate(const Point & p1, const Point & p2)
+{
+    this->pnt.Translate(p1, p2);
+}
+
 Point
 Point::translated(const Vector & vec) const
 {
     return Point(this->pnt.Translated(vec));
 }
 
+Point
+Point::translated(const Point & p1, const Point & p2) const
+{
+    return Point(this->pnt.Translated(p1, p2));
+}
+
 Point::operator gp_Pnt() const
 {
     return this->pnt;

test/src/Point_test.cpp

@@ -91,6 +91,15 @@ TEST(PointTest, translate)
     EXPECT_NEAR(pt.z(), 4, 1e-15);
 }
 
+TEST(PointTest, translate_2pts)
+{
+    Point pt(1, 0, 2);
+    pt.translate(Point(0, 0, 0), Point(1, -1, 2));
+    EXPECT_NEAR(pt.x(), 2, 1e-15);
+    EXPECT_NEAR(pt.y(), -1, 1e-15);
+    EXPECT_NEAR(pt.z(), 4, 1e-15);
+}
+
 TEST(PointTest, translated)
 {
     Point pt(1, 0, 2);
@@ -100,6 +109,15 @@ TEST(PointTest, translated)
     EXPECT_NEAR(npt.z(), 4, 1e-15);
 }
 
+TEST(PointTest, translated_2pts)
+{
+    Point pt(1, 0, 2);
+    auto npt = pt.translated(Point(0, 0, 0), Point(1, -1, 2));
+    EXPECT_NEAR(npt.x(), 2, 1e-15);
+    EXPECT_NEAR(npt.y(), -1, 1e-15);
+    EXPECT_NEAR(npt.z(), 4, 1e-15);
+}
+
 TEST(PointTest, mirror_pt)
 {
     Point pt(1, 0, -2);