Issue #1942: group - names are empty strings

[modules/shaper.git] / src / GeomAlgoAPI / GeomAlgoAPI_Translation.cpp

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Translation.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_Translation.cpp
index 27af5311f05f1879307097b5998bbe444c3fcd26..55ed0e89caebdb654ace2add8987a55b9a022021 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_Translation.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_Translation.cpp
@@ -3,10 +3,13 @@
 // File:        GeomAlgoAPI_Translation.cpp
 // Created:     8 June 2015
 // Author:      Dmitry Bobylev
+//
+// Modified by Clarisse Genrault (CEA) : 17 Nov 2016
 
 #include "GeomAlgoAPI_Translation.h"
 
 #include <BRepBuilderAPI_Transform.hxx>
+#include <Precision.hxx>
 #include <gp_Ax1.hxx>
 
 //=================================================================================================
@@ -14,43 +17,133 @@ GeomAlgoAPI_Translation::GeomAlgoAPI_Translation(std::shared_ptr<GeomAPI_Shape>
                                                  std::shared_ptr<GeomAPI_Ax1>   theAxis,
                                                  double                         theDistance)
 {
-  build(theSourceShape, theAxis, theDistance);
+  myMethodType = BY_DISTANCE;
+  mySourceShape = theSourceShape;
+  myAxis = theAxis;
+  myDistance = theDistance;
 }
 
 //=================================================================================================
-void GeomAlgoAPI_Translation::build(std::shared_ptr<GeomAPI_Shape> theSourceShape,
-                                    std::shared_ptr<GeomAPI_Ax1>   theAxis,
-                                    double                         theDistance)
+GeomAlgoAPI_Translation::GeomAlgoAPI_Translation(std::shared_ptr<GeomAPI_Shape> theSourceShape,
+                                                 double                         theDx,
+                                                 double                         theDy,
+                                                 double                         theDz)
 {
-  if(!theSourceShape || !theAxis) {
-    return;
+  myMethodType = BY_DIM;
+  mySourceShape = theSourceShape;
+  myDx = theDx;
+  myDy = theDy;
+  myDz = theDz;
+}
+
+//=================================================================================================
+GeomAlgoAPI_Translation::GeomAlgoAPI_Translation(std::shared_ptr<GeomAPI_Shape> theSourceShape,
+                                                 std::shared_ptr<GeomAPI_Pnt>   theStartPoint,
+                                                 std::shared_ptr<GeomAPI_Pnt>   theEndPoint)
+{
+  myMethodType = BY_POINTS;
+  mySourceShape = theSourceShape;
+  myStartPoint = theStartPoint;
+  myEndPoint = theEndPoint;
+}
+
+//=================================================================================================
+bool GeomAlgoAPI_Translation::check()
+{
+  switch (myMethodType) {
+    case BY_DISTANCE: {
+      if (!myAxis) {
+        myError = "Translation builder :: axis is invalid.";
+        return false;
+      }
+      if (!mySourceShape) {
+        myError = "Translation builder :: source shape is invalid.";
+        return false;
+      }
+      return true;
+    }
+    case BY_DIM: {
+      if (!mySourceShape) {
+        myError = "Translation builder :: source shape is invalid.";
+        return false;
+      }
+      return true;
+    }
+    case BY_POINTS: {
+      if (!myStartPoint) {
+        myError = "Translation builder :: start point is invalid.";
+        return false;
+      }
+      if (!myEndPoint) {
+        myError = "Translation builder :: start point is invalid.";
+        return false;
+      }
+      if (!mySourceShape) {
+        myError = "Translation builder :: source shape is invalid.";
+        return false;
+      }
+      return true;
+    }
+    default: {
+      myError = "Translation builder :: method not implemented.";
+      return false;
+    }
   }
+}
 
-  const TopoDS_Shape& aSourceShape = theSourceShape->impl<TopoDS_Shape>();
-  const gp_Ax1& anAxis = theAxis->impl<gp_Ax1>();
+//=================================================================================================
+void GeomAlgoAPI_Translation::build()
+{
+  gp_Trsf* aTrsf = new gp_Trsf();
+
+  switch (myMethodType) {
+    case BY_DISTANCE: {
+      const gp_Ax1& anAxis = myAxis->impl<gp_Ax1>();
+      aTrsf->SetTranslation(gp_Vec(anAxis.Direction()) * myDistance);
+      break;
+    }
+    case BY_DIM: {
+      aTrsf->SetTranslation(gp_Vec(myDx, myDy, myDz));
+      break;
+    }
+    case BY_POINTS: {
+      const gp_Pnt& aStartPoint = myStartPoint->impl<gp_Pnt>();
+      const gp_Pnt& aEndPoint = myEndPoint->impl<gp_Pnt>();
+      aTrsf->SetTranslation(aStartPoint, aEndPoint);
+      break;
+    }
+    default: {
+      myError = "Translation builder :: method not supported";
+      return;
+    }
+  }
+
+  const TopoDS_Shape& aSourceShape = mySourceShape->impl<TopoDS_Shape>();
 
   if(aSourceShape.IsNull()) {
+    myError = "Translation builder :: source shape does not contain any actual shape.";
     return;
   }
 
-  gp_Trsf* aTrsf = new gp_Trsf();
-  aTrsf->SetTranslation(gp_Vec(anAxis.Direction()) * theDistance);
-
-  // Transform the shape with copying it.
+  // Transform the shape while copying it.
   BRepBuilderAPI_Transform* aBuilder = new BRepBuilderAPI_Transform(aSourceShape, *aTrsf, true);
   if(!aBuilder) {
+    myError = "Translation builder :: transform initialization failed.";
     return;
   }
-  this->setImpl(aBuilder);
-  this->setBuilderType(OCCT_BRepBuilderAPI_MakeShape);
 
-  if(aBuilder->IsDone() != Standard_True) {
+  setImpl(aBuilder);
+  setBuilderType(OCCT_BRepBuilderAPI_MakeShape);
+
+  if(!aBuilder->IsDone()) {
+    myError = "Translation builder :: algorithm failed.";
     return;
   }
+
   TopoDS_Shape aResult = aBuilder->Shape();
 
   std::shared_ptr<GeomAPI_Shape> aShape(new GeomAPI_Shape());
   aShape->setImpl(new TopoDS_Shape(aResult));
-  this->setShape(aShape);
-  this->setDone(true);
-}
+  setShape(aShape);
+  setDone(true);
+}
\ No newline at end of file