Preparation of intermediate revision

[modules/geom.git] / src / GEOMImpl / GEOMImpl_RevolutionDriver.cxx

diff --git a/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx b/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx
index 1eb85b835c861beda4e8c1280d7b6115fdd8f276..f4e8026b14515b3a38d01565a1cbe82e3de3404a 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx
@@ -1,12 +1,35 @@
-
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  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
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 #include <Standard_Stream.hxx>
 
 #include <GEOMImpl_RevolutionDriver.hxx>
+
+#include <GEOMImpl_IShapesOperations.hxx>
 #include <GEOMImpl_IRevolution.hxx>
 #include <GEOMImpl_Types.hxx>
 #include <GEOM_Function.hxx>
 
 #include <BRepPrimAPI_MakeRevol.hxx>
+#include <BRepBuilderAPI_Transform.hxx>
 #include <BRep_Tool.hxx>
 #include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>
@@ -14,7 +37,7 @@
 #include <TopoDS_Vertex.hxx>
 #include <TopAbs.hxx>
 #include <TopExp.hxx>
-
+#include <gp_Trsf.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Lin.hxx>
 #include <gp_Dir.hxx>
@@ -56,7 +79,7 @@ Standard_Integer GEOMImpl_RevolutionDriver::Execute(TFunction_Logbook& log) cons
 
   TopoDS_Shape aShape;
 
-  if (aType == REVOLUTION_BASE_AXIS_ANGLE) {
+  if (aType == REVOLUTION_BASE_AXIS_ANGLE || aType == REVOLUTION_BASE_AXIS_ANGLE_2WAYS) {
     Handle(GEOM_Function) aRefBase = aCI.GetBase();
     Handle(GEOM_Function) aRefAxis = aCI.GetAxis();
     TopoDS_Shape aShapeBase = aRefBase->GetValue();
@@ -85,9 +108,17 @@ Standard_Integer GEOMImpl_RevolutionDriver::Execute(TFunction_Logbook& log) cons
        Standard_ConstructionError::Raise("Vertex to be rotated is too close to Revolution Axis");
       }
     }
-
+    double anAngle = aCI.GetAngle();
     gp_Ax1 anAxis (BRep_Tool::Pnt(V1), aV);
-    BRepPrimAPI_MakeRevol MR (aShapeBase, anAxis, aCI.GetAngle(), Standard_False);
+    if (aType == REVOLUTION_BASE_AXIS_ANGLE_2WAYS)
+      {
+       gp_Trsf aTrsf;
+       aTrsf.SetRotation(anAxis, ( -anAngle ));
+       BRepBuilderAPI_Transform aTransformation(aShapeBase, aTrsf, Standard_False);
+       aShapeBase = aTransformation.Shape();
+       anAngle = anAngle * 2;
+      }
+    BRepPrimAPI_MakeRevol MR (aShapeBase, anAxis, anAngle, Standard_False);
     if (!MR.IsDone()) MR.Build();
     if (!MR.IsDone()) StdFail_NotDone::Raise("Revolution algorithm has failed");
     aShape = MR.Shape();
@@ -95,11 +126,13 @@ Standard_Integer GEOMImpl_RevolutionDriver::Execute(TFunction_Logbook& log) cons
   }
 
   if (aShape.IsNull()) return 0;
-  aFunction->SetValue(aShape);
 
-  log.SetTouched(Label()); 
+  TopoDS_Shape aRes = GEOMImpl_IShapesOperations::CompsolidToCompound(aShape);
+  aFunction->SetValue(aRes);
+
+  log.SetTouched(Label());
 
-  return 1;    
+  return 1;
 }