-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File: GeomAlgoAPI_Revolution.cpp
-// Created: 12 May 2015
-// Author: Dmitry Bobylev
+// Copyright (C) 2014-2023 CEA, EDF
+//
+// 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, or (at your option) any later version.
+//
+// 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 "GeomAlgoAPI_Revolution.h"
/// \return solid.
static TopoDS_Shape findClosest(const TopoDS_Shape& theShape, const gp_Pnt& thePoint);
+/// \brief Create plane by 3 points. Return empty handle if failed.
+static Handle(Geom_Plane) makePlane(const gp_Pnt& theP1, const gp_Pnt& theP2, const gp_Pnt& theP3);
+
static void storeGenerationHistory(GeomAlgoAPI_Revolution* theRevolutionAlgo,
const TopoDS_Shape& theBase,
const TopAbs_ShapeEnum theType,
const TopoDS_Shape& theModifiedBaseShape,
const bool theIsFromFaceSet);
-//==================================================================================================
-GeomAlgoAPI_Revolution::GeomAlgoAPI_Revolution(const GeomShapePtr theBaseShape,
- const std::shared_ptr<GeomAPI_Ax1> theAxis,
- const double theToAngle,
- const double theFromAngle)
-{
- build(theBaseShape, theAxis, GeomShapePtr(), theToAngle, GeomShapePtr(), theFromAngle);
-}
-
//==================================================================================================
GeomAlgoAPI_Revolution::GeomAlgoAPI_Revolution(const GeomShapePtr theBaseShape,
const std::shared_ptr<GeomAPI_Ax1> theAxis,
const double theFromAngle)
{
if(!theBaseShape || !theAxis ||
- (((!theFromShape && !theToShape) ||
+ (((!theFromShape && !theToShape) ||
(theFromShape && theToShape && theFromShape->isEqual(theToShape)))
&& (theFromAngle == -theToAngle))) {
return;
aBasePlane = aFindPlane.Plane();
} else {
gp_Pnt aPnt1 = anAxis.Location();
- gp_Pnt aPnt2 = aPnt1;
- aPnt2.Translate(anAxis.Direction());
- gp_Pnt aPnt3;
-
- for(TopExp_Explorer anExp(aBaseShape, TopAbs_VERTEX); anExp.More(); anExp.Next()) {
- aPnt3 = BRep_Tool::Pnt(TopoDS::Vertex(anExp.Current()));
- GC_MakePlane aMkPlane(aPnt1, aPnt2, aPnt3);
- if(aMkPlane.IsDone() != Standard_True) {
- continue;
- }
+ TopExp_Explorer anExp(aBaseShape, TopAbs_VERTEX);
+ gp_Pnt aPnt2 = BRep_Tool::Pnt(TopoDS::Vertex(anExp.Current()));
+ gp_Pnt aPnt3 = aPnt1;
- aBasePlane = aMkPlane.Value();
- break;
+ for (anExp.Next(); anExp.More() && aBasePlane.IsNull(); anExp.Next()) {
+ aPnt3 = BRep_Tool::Pnt(TopoDS::Vertex(anExp.Current()));
+ aBasePlane = makePlane(aPnt1, aPnt2, aPnt3);
}
if(aBasePlane.IsNull()) {
- aPnt3 = centreOfMass(aBaseShape);
-
- GC_MakePlane aMkPlane(aPnt1, aPnt2, aPnt3);
- if(aMkPlane.IsDone() != Standard_True) {
- return;
- }
-
- aBasePlane = aMkPlane.Value();
+ gp_Pnt aPossiblePoints[] = { aPnt1.Translated(anAxis.Direction()), centreOfMass(aBaseShape) };
+ for (auto it = std::begin(aPossiblePoints);
+ it != std::end(aPossiblePoints) && aBasePlane.IsNull(); ++it)
+ aBasePlane = makePlane(aPnt1, aPnt2, *it);
}
}
}
} else if(theFromShape && theToShape) { // Case 2: When both bounding planes were set.
// Making revolution to the 360 angle.
- BRepPrimAPI_MakeRevol* aRevolBuilder =
+ BRepPrimAPI_MakeRevol* aRevolBuilder =
new BRepPrimAPI_MakeRevol(aBaseShape, anAxis, 2 * M_PI, Standard_True);
if(!aRevolBuilder) {
return;
// Rotating bounding planes to the specified angle.
gp_Trsf aFromTrsf;
gp_Trsf aToTrsf;
- double aFromRotAngle =
- ((aFromPln.Axis().Direction() * aBasePlane->Axis().Direction()) > 0) ? -theFromAngle :
+ double aFromRotAngle =
+ ((aFromPln.Axis().Direction() * aBasePlane->Axis().Direction()) > 0) ? -theFromAngle :
theFromAngle;
- double aToRotAngle =
+ double aToRotAngle =
((aToPln.Axis().Direction() * aBasePlane->Axis().Direction()) > 0) ? -theToAngle :
theToAngle;
aFromTrsf.SetRotation(anAxis,aFromRotAngle / 180.0 * M_PI);
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>();
}
- // If after cut we got more than one solids then take closest
+ // If after cut we got more than one solids then take closest
// to the center of mass of the base face.
aResult = findClosest(aResult, aBaseCentre);
}
} else { //Case 3: When only one bounding plane was set.
// Making revolution to the 360 angle.
- BRepPrimAPI_MakeRevol* aRevolBuilder =
+ BRepPrimAPI_MakeRevol* aRevolBuilder =
new BRepPrimAPI_MakeRevol(aBaseShape, anAxis, 2 * M_PI, Standard_True);
if(!aRevolBuilder) {
return;
for(TopTools_ListIteratorOfListOfShape anIt(aBndShapes); anIt.More(); anIt.Next()) {
GeomShapePtr aShape(new GeomAPI_Shape());
aShape->setImpl(new TopoDS_Shape(anIt.Value()));
+ fixOrientation(aShape);
isFromFaceSet ? this->addFromShape(aShape) : this->addToShape(aShape);
}
}
for(TopTools_ListIteratorOfListOfShape anIt(aBsShapes); anIt.More(); anIt.Next()) {
GeomShapePtr aShape(new GeomAPI_Shape());
aShape->setImpl(new TopoDS_Shape(anIt.Value()));
+ fixOrientation(aShape);
isFromFaceSet ? this->addToShape(aShape) : this->addFromShape(aShape);
}
}
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>();
}
- // If after cut we got more than one solids then take
+ // If after cut we got more than one solids then take
// closest to the center of mass of the base face.
aResult = findClosest(aResult, aBaseCentre);
// Setting naming.
if(aShapeTypeToExp == TopAbs_COMPOUND) {
- storeGenerationHistory(this, aResult, TopAbs_EDGE,
+ storeGenerationHistory(this, aResult, TopAbs_EDGE,
aRotatedBoundingFace, aModifiedBaseShape, isFromFaceSet);
- storeGenerationHistory(this, aResult, TopAbs_FACE,
+ storeGenerationHistory(this, aResult, TopAbs_FACE,
aRotatedBoundingFace, aModifiedBaseShape, isFromFaceSet);
} else {
- storeGenerationHistory(this, aResult, aShapeTypeToExp,
+ storeGenerationHistory(this, aResult, aShapeTypeToExp,
aRotatedBoundingFace, aModifiedBaseShape, isFromFaceSet);
}
}
return aResult;
}
+//================================================================================================
+Handle(Geom_Plane) makePlane(const gp_Pnt& theP1, const gp_Pnt& theP2, const gp_Pnt& theP3)
+{
+ Handle(Geom_Plane) aPlane;
+ GC_MakePlane aMkPlane(theP1, theP2, theP3);
+ if (aMkPlane.IsDone())
+ aPlane = aMkPlane.Value();
+ return aPlane;
+}
+
//================================================================================================
void storeGenerationHistory(GeomAlgoAPI_Revolution* theRevolutionAlgo,
const TopoDS_Shape& theBase,
GeomShapePtr aFromShape(new GeomAPI_Shape), aToShape(new GeomAPI_Shape);
aFromShape->setImpl(new TopoDS_Shape(theRevolBuilder->FirstShape(aShape)));
aToShape->setImpl(new TopoDS_Shape(theRevolBuilder->LastShape(aShape)));
+ theRevolutionAlgo->fixOrientation(aFromShape);
+ theRevolutionAlgo->fixOrientation(aToShape);
theRevolutionAlgo->addFromShape(aFromShape);
theRevolutionAlgo->addToShape(aToShape);
}
if(anIntTools.IsValidPointForFace(aPnt, TopoDS::Face(theToFace),
Precision::Confusion()) == Standard_True) {
aGeomSh->setImpl(new TopoDS_Shape(aShape));
+ theRevolutionAlgo->fixOrientation(aGeomSh);
theRevolutionAlgo->addToShape(aGeomSh);
}
if(anIntTools.IsValidPointForFace(aPnt, TopoDS::Face(theFromFace),
Precision::Confusion()) == Standard_True) {
aGeomSh->setImpl(new TopoDS_Shape(aShape));
+ theRevolutionAlgo->fixOrientation(aGeomSh);
theRevolutionAlgo->addFromShape(aGeomSh);
}
} else if(theType == TopAbs_EDGE) {
anEdgeCheck.Perform();
if(anEdgeCheck.MaxDistance() < Precision::Confusion()) {
aGeomSh->setImpl(new TopoDS_Shape(aShape));
+ theRevolutionAlgo->fixOrientation(aGeomSh);
theRevolutionAlgo->addToShape(aGeomSh);
}
anEdgeCheck.Init(anEdge, TopoDS::Face(theFromFace));
anEdgeCheck.Perform();
if(anEdgeCheck.MaxDistance() < Precision::Confusion()) {
aGeomSh->setImpl(new TopoDS_Shape(aShape));
+ theRevolutionAlgo->fixOrientation(aGeomSh);
theRevolutionAlgo->addFromShape(aGeomSh);
}
} else {
Handle(Geom_Surface) aToSurface = BRep_Tool::Surface(TopoDS::Face(theToFace));
if(aFaceSurface == aFromSurface) {
aGeomSh->setImpl(new TopoDS_Shape(aShape));
+ theRevolutionAlgo->fixOrientation(aGeomSh);
theRevolutionAlgo->addFromShape(aGeomSh);
}
if(aFaceSurface == aToSurface) {
aGeomSh->setImpl(new TopoDS_Shape(aShape));
+ theRevolutionAlgo->fixOrientation(aGeomSh);
theRevolutionAlgo->addToShape(aGeomSh);
}
}
if(theType == TopAbs_VERTEX) {
gp_Pnt aPnt = BRep_Tool::Pnt(TopoDS::Vertex(aShape));
IntTools_Context anIntTools;
- if(anIntTools.IsValidPointForFace(aPnt, TopoDS::Face(theRotatedBoundingFace),
+ if(anIntTools.IsValidPointForFace(aPnt, TopoDS::Face(theRotatedBoundingFace),
Precision::Confusion()) == Standard_True) {
aGeomSh->setImpl(new TopoDS_Shape(aShape));
- theIsFromFaceSet ? theRevolutionAlgo->addFromShape(aGeomSh) :
+ theRevolutionAlgo->fixOrientation(aGeomSh);
+ theIsFromFaceSet ? theRevolutionAlgo->addFromShape(aGeomSh) :
theRevolutionAlgo->addToShape(aGeomSh);
}
if(anIntTools.IsValidPointForFace(aPnt, TopoDS::Face(theModifiedBaseShape),
Precision::Confusion()) == Standard_True) {
aGeomSh->setImpl(new TopoDS_Shape(aShape));
- theIsFromFaceSet ? theRevolutionAlgo->addToShape(aGeomSh) :
+ theRevolutionAlgo->fixOrientation(aGeomSh);
+ theIsFromFaceSet ? theRevolutionAlgo->addToShape(aGeomSh) :
theRevolutionAlgo->addFromShape(aGeomSh);
}
} else if(theType == TopAbs_EDGE) {
anEdgeCheck.Perform();
if(anEdgeCheck.MaxDistance() < Precision::Confusion()) {
aGeomSh->setImpl(new TopoDS_Shape(aShape));
- theIsFromFaceSet ? theRevolutionAlgo->addFromShape(aGeomSh) :
+ theRevolutionAlgo->fixOrientation(aGeomSh);
+ theIsFromFaceSet ? theRevolutionAlgo->addFromShape(aGeomSh) :
theRevolutionAlgo->addToShape(aGeomSh);
}
anEdgeCheck.Init(anEdge, TopoDS::Face(theModifiedBaseShape));
anEdgeCheck.Perform();
if(anEdgeCheck.MaxDistance() < Precision::Confusion()) {
aGeomSh->setImpl(new TopoDS_Shape(aShape));
- theIsFromFaceSet ? theRevolutionAlgo->addToShape(aGeomSh) :
+ theRevolutionAlgo->fixOrientation(aGeomSh);
+ theIsFromFaceSet ? theRevolutionAlgo->addToShape(aGeomSh) :
theRevolutionAlgo->addFromShape(aGeomSh);
}
} else {
Handle(Geom_Surface) aFaceSurface = BRep_Tool::Surface(TopoDS::Face(aShape));
- Handle(Geom_Surface) aBoundingSurface =
+ Handle(Geom_Surface) aBoundingSurface =
BRep_Tool::Surface(TopoDS::Face(theRotatedBoundingFace));
Handle(Geom_Surface) aBaseSurface = BRep_Tool::Surface(TopoDS::Face(theModifiedBaseShape));
if(aFaceSurface == aBoundingSurface) {
aGeomSh->setImpl(new TopoDS_Shape(aShape));
- theIsFromFaceSet ? theRevolutionAlgo->addFromShape(aGeomSh) :
+ theRevolutionAlgo->fixOrientation(aGeomSh);
+ theIsFromFaceSet ? theRevolutionAlgo->addFromShape(aGeomSh) :
theRevolutionAlgo->addToShape(aGeomSh);
}
if(aFaceSurface == aBaseSurface) {
aGeomSh->setImpl(new TopoDS_Shape(aShape));
- theIsFromFaceSet ? theRevolutionAlgo->addToShape(aGeomSh) :
+ theRevolutionAlgo->fixOrientation(aGeomSh);
+ theIsFromFaceSet ? theRevolutionAlgo->addToShape(aGeomSh) :
theRevolutionAlgo->addFromShape(aGeomSh);
}
}
