Update copyrights

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

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Prism.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_Prism.cpp
index 2576423e74ceb37811b60bbd5cd556b347a1cf96..df1b159766611e80ea2d6b0631ae3a0ba6e9d1c0 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_Prism.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_Prism.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -12,10 +12,9 @@
 //
 // You should have received a copy of the GNU Lesser General Public
 // License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #include "GeomAlgoAPI_Prism.h"
@@ -66,35 +65,6 @@ static void storeGenerationHistory(GeomAlgoAPI_Prism* thePrismAlgo,
                                    const TopoDS_Face& theFromFace);
 
 
-//==================================================================================================
-GeomAlgoAPI_Prism::GeomAlgoAPI_Prism(const GeomShapePtr theBaseShape,
-                                     const double       theToSize,
-                                     const double       theFromSize)
-{
-  build(theBaseShape, std::shared_ptr<GeomAPI_Dir>(), GeomShapePtr(),
-    theToSize, GeomShapePtr(), theFromSize);
-}
-
-//==================================================================================================
-GeomAlgoAPI_Prism::GeomAlgoAPI_Prism(const GeomShapePtr                 theBaseShape,
-                                     const std::shared_ptr<GeomAPI_Dir> theDirection,
-                                     const double                       theToSize,
-                                     const double                       theFromSize)
-{
-  build(theBaseShape, theDirection, GeomShapePtr(), theToSize, GeomShapePtr(), theFromSize);
-}
-
-//==================================================================================================
-GeomAlgoAPI_Prism::GeomAlgoAPI_Prism(const GeomShapePtr theBaseShape,
-                                     const GeomShapePtr theToShape,
-                                     const double       theToSize,
-                                     const GeomShapePtr theFromShape,
-                                     const double       theFromSize)
-{
-  build(theBaseShape, std::shared_ptr<GeomAPI_Dir>(), theToShape,
-        theToSize, theFromShape, theFromSize);
-}
-
 //==================================================================================================
 GeomAlgoAPI_Prism::GeomAlgoAPI_Prism(const GeomShapePtr                 theBaseShape,
                                      const std::shared_ptr<GeomAPI_Dir> theDirection,
@@ -222,27 +192,21 @@ void GeomAlgoAPI_Prism::build(const GeomShapePtr&                theBaseShape,
     aTrsf.SetTranslation(anExtVec * -theFromSize);
     BRepBuilderAPI_Transform* aTransformBuilder =
       new BRepBuilderAPI_Transform(aBaseShape, aTrsf);
-    if(!aTransformBuilder) {
+    if(!aTransformBuilder || !aTransformBuilder->IsDone()) {
       return;
     }
     this->appendAlgo(std::shared_ptr<GeomAlgoAPI_MakeShape>(
       new GeomAlgoAPI_MakeShape(aTransformBuilder)));
-    if(!aTransformBuilder->IsDone()) {
-      return;
-    }
     TopoDS_Shape aMovedBase = aTransformBuilder->Shape();
 
     // Making prism.
     BRepPrimAPI_MakePrism* aPrismBuilder =
       new BRepPrimAPI_MakePrism(aMovedBase, anExtVec * (theFromSize + theToSize));
-    if(!aPrismBuilder) {
+    if(!aPrismBuilder || !aPrismBuilder->IsDone()) {
       return;
     }
     this->appendAlgo(std::shared_ptr<GeomAlgoAPI_MakeShape>(
       new GeomAlgoAPI_MakeShape(aPrismBuilder)));
-    if(!aPrismBuilder->IsDone()) {
-      return;
-    }
     aResult = aPrismBuilder->Shape();
 
     // Setting naming.
@@ -322,27 +286,21 @@ void GeomAlgoAPI_Prism::build(const GeomShapePtr&                theBaseShape,
     gp_Trsf aTrsf;
     aTrsf.SetTranslation(anExtVec * -aPrismLength);
     BRepBuilderAPI_Transform* aTransformBuilder = new BRepBuilderAPI_Transform(aBaseShape, aTrsf);
-    if(!aTransformBuilder) {
+    if(!aTransformBuilder || !aTransformBuilder->IsDone()) {
       return;
     }
     this->appendAlgo(std::shared_ptr<GeomAlgoAPI_MakeShape>(
       new GeomAlgoAPI_MakeShape(aTransformBuilder)));
-    if(!aTransformBuilder->IsDone()) {
-      return;
-    }
     TopoDS_Shape aMovedBase = aTransformBuilder->Shape();
 
     // Making prism.
     BRepPrimAPI_MakePrism* aPrismBuilder =
       new BRepPrimAPI_MakePrism(aMovedBase, anExtVec * 2 * aPrismLength);
-    if(!aPrismBuilder) {
+    if(!aPrismBuilder || !aPrismBuilder->IsDone()) {
       return;
     }
     this->appendAlgo(std::shared_ptr<GeomAlgoAPI_MakeShape>(
       new GeomAlgoAPI_MakeShape(aPrismBuilder)));
-    if(!aPrismBuilder->IsDone()) {
-      return;
-    }
     aResult = aPrismBuilder->Shape();
 
     // Orienting bounding planes.
@@ -411,6 +369,7 @@ void GeomAlgoAPI_Prism::build(const GeomShapePtr&                theBaseShape,
       for(TopTools_ListIteratorOfListOfShape anIt(aToShapes); anIt.More(); anIt.Next()) {
         GeomShapePtr aGeomSh(new GeomAPI_Shape());
         aGeomSh->setImpl(new TopoDS_Shape(anIt.Value()));
+        fixOrientation(aGeomSh);
         this->addToShape(aGeomSh);
       }
     }
@@ -436,6 +395,7 @@ void GeomAlgoAPI_Prism::build(const GeomShapePtr&                theBaseShape,
       for(TopTools_ListIteratorOfListOfShape anIt(aFromShapes); anIt.More(); anIt.Next()) {
         GeomShapePtr aGeomSh(new GeomAPI_Shape());
         aGeomSh->setImpl(new TopoDS_Shape(anIt.Value()));
+        fixOrientation(aGeomSh);
         this->addFromShape(aGeomSh);
       }
     }
@@ -451,24 +411,22 @@ void GeomAlgoAPI_Prism::build(const GeomShapePtr&                theBaseShape,
     if(aResult.ShapeType() == TopAbs_COMPOUND) {
       std::shared_ptr<GeomAPI_Shape> aGeomShape(new GeomAPI_Shape);
       aGeomShape->setImpl(new TopoDS_Shape(aResult));
-      ListOfShape aCompSolids, aFreeSolids;
+      ListOfShape aResults;
       aGeomShape = GeomAlgoAPI_ShapeTools::combineShapes(aGeomShape,
                                                          GeomAPI_Shape::COMPSOLID,
-                                                         aCompSolids,
-                                                         aFreeSolids);
+                                                         aResults);
       aResult = aGeomShape->impl<TopoDS_Shape>();
     }
   }
 
   // Setting result.
-  if(aResult.IsNull()) {
-    return;
+  if (!aResult.IsNull()) {
+    aResult = GeomAlgoAPI_DFLoader::refineResult(aResult);
+    GeomShapePtr aGeomSh(new GeomAPI_Shape());
+    aGeomSh->setImpl(new TopoDS_Shape(aResult));
+    this->setShape(aGeomSh);
+    this->setDone(true);
   }
-  aResult = GeomAlgoAPI_DFLoader::refineResult(aResult);
-  GeomShapePtr aGeomSh(new GeomAPI_Shape());
-  aGeomSh->setImpl(new TopoDS_Shape(aResult));
-  this->setShape(aGeomSh);
-  this->setDone(true);
 }
 
 // Auxilary functions:
@@ -483,6 +441,8 @@ void storeGenerationHistory(GeomAlgoAPI_Prism* thePrismAlgo,
     GeomShapePtr aFromShape(new GeomAPI_Shape), aToShape(new GeomAPI_Shape);
     aFromShape->setImpl(new TopoDS_Shape(thePrismBuilder->FirstShape(aShape)));
     aToShape->setImpl(new TopoDS_Shape(thePrismBuilder->LastShape(aShape)));
+    thePrismAlgo->fixOrientation(aFromShape);
+    thePrismAlgo->fixOrientation(aToShape);
     thePrismAlgo->addFromShape(aFromShape);
     thePrismAlgo->addToShape(aToShape);
   }
@@ -504,11 +464,13 @@ void storeGenerationHistory(GeomAlgoAPI_Prism* thePrismAlgo,
       if(anIntTools.IsValidPointForFace(aPnt,
           theToFace, Precision::Confusion()) == Standard_True) {
         aGeomSh->setImpl(new TopoDS_Shape(aShape));
+        thePrismAlgo->fixOrientation(aGeomSh);
         thePrismAlgo->addToShape(aGeomSh);
       }
       if(anIntTools.IsValidPointForFace(aPnt,
           theFromFace, Precision::Confusion()) == Standard_True) {
         aGeomSh->setImpl(new TopoDS_Shape(aShape));
+        thePrismAlgo->fixOrientation(aGeomSh);
         thePrismAlgo->addFromShape(aGeomSh);
       }
     } else if(theType == TopAbs_EDGE) {
@@ -517,12 +479,14 @@ void storeGenerationHistory(GeomAlgoAPI_Prism* thePrismAlgo,
       anEdgeCheck.Perform();
       if(anEdgeCheck.MaxDistance() < Precision::Confusion()) {
         aGeomSh->setImpl(new TopoDS_Shape(aShape));
+        thePrismAlgo->fixOrientation(aGeomSh);
         thePrismAlgo->addToShape(aGeomSh);
       }
       anEdgeCheck.Init(anEdge, theFromFace);
       anEdgeCheck.Perform();
       if(anEdgeCheck.MaxDistance() < Precision::Confusion()) {
         aGeomSh->setImpl(new TopoDS_Shape(aShape));
+        thePrismAlgo->fixOrientation(aGeomSh);
         thePrismAlgo->addFromShape(aGeomSh);
       }
     } else {