From 4c566a6113c2c2c3326d2722604039f6d8bb4b3e Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Fri, 1 Jun 2012 16:44:57 +0200
Subject: [PATCH] Make a convenient function to convert between gp_Trsf and
 Base::Matrix4D

---
 src/Mod/Part/App/TopoShape.cpp | 38 ++++++++++++++++++++--------------
 src/Mod/Part/App/TopoShape.h   |  2 ++
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/Mod/Part/App/TopoShape.cpp b/src/Mod/Part/App/TopoShape.cpp
index fd90af18f..9bf487074 100644
--- a/src/Mod/Part/App/TopoShape.cpp
+++ b/src/Mod/Part/App/TopoShape.cpp
@@ -433,25 +433,19 @@ void TopoShape::operator = (const TopoShape& sh)
     }
 }
 
-void TopoShape::setTransform(const Base::Matrix4D& rclTrf)
+void TopoShape::convertTogpTrsf(const Base::Matrix4D& mtrx, gp_Trsf& trsf)
 {
-    gp_Trsf mov;
-    mov.SetValues(rclTrf[0][0],rclTrf[0][1],rclTrf[0][2],rclTrf[0][3],
-                  rclTrf[1][0],rclTrf[1][1],rclTrf[1][2],rclTrf[1][3],
-                  rclTrf[2][0],rclTrf[2][1],rclTrf[2][2],rclTrf[2][3],
-                  0.00001,0.00001);
-    TopLoc_Location loc(mov);
-    _Shape.Location(loc);
+    trsf.SetValues(mtrx[0][0],mtrx[0][1],mtrx[0][2],mtrx[0][3],
+                   mtrx[1][0],mtrx[1][1],mtrx[1][2],mtrx[1][3],
+                   mtrx[2][0],mtrx[2][1],mtrx[2][2],mtrx[2][3],
+                   0.00001,0.00001);
 }
 
-Base::Matrix4D TopoShape::getTransform(void) const
+void TopoShape::convertToMatrix(const gp_Trsf& trsf, Base::Matrix4D& mtrx)
 {
-    Base::Matrix4D mtrx;
-    gp_Trsf Trf = _Shape.Location().Transformation();
-
-    gp_Mat m = Trf._CSFDB_Getgp_Trsfmatrix();
-    gp_XYZ p = Trf._CSFDB_Getgp_Trsfloc();
-    Standard_Real scale = Trf._CSFDB_Getgp_Trsfscale();
+    gp_Mat m = trsf._CSFDB_Getgp_Trsfmatrix();
+    gp_XYZ p = trsf._CSFDB_Getgp_Trsfloc();
+    Standard_Real scale = trsf._CSFDB_Getgp_Trsfscale();
 
     // set Rotation matrix
     mtrx[0][0] = scale * m._CSFDB_Getgp_Matmatrix(0,0);
@@ -470,7 +464,21 @@ Base::Matrix4D TopoShape::getTransform(void) const
     mtrx[0][3] = p._CSFDB_Getgp_XYZx();
     mtrx[1][3] = p._CSFDB_Getgp_XYZy();
     mtrx[2][3] = p._CSFDB_Getgp_XYZz();
+}
 
+void TopoShape::setTransform(const Base::Matrix4D& rclTrf)
+{
+    gp_Trsf mov;
+    convertTogpTrsf(rclTrf, mov);
+    TopLoc_Location loc(mov);
+    _Shape.Location(loc);
+}
+
+Base::Matrix4D TopoShape::getTransform(void) const
+{
+    Base::Matrix4D mtrx;
+    gp_Trsf Trf = _Shape.Location().Transformation();
+    convertToMatrix(Trf, mtrx);
     return mtrx;
 }
 
diff --git a/src/Mod/Part/App/TopoShape.h b/src/Mod/Part/App/TopoShape.h
index 1de76b1ca..1d16b9e07 100644
--- a/src/Mod/Part/App/TopoShape.h
+++ b/src/Mod/Part/App/TopoShape.h
@@ -73,6 +73,8 @@ public:
     Base::Matrix4D getTransform(void) const;
     /// Bound box from the CasCade shape
     Base::BoundBox3d getBoundBox(void)const;
+    static void convertTogpTrsf(const Base::Matrix4D& mtrx, gp_Trsf& trsf);
+    static void convertToMatrix(const gp_Trsf& trsf, Base::Matrix4D& mtrx);
     //@}
 
     /** @name Subelement management */