-// 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
//
// 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"
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,
}
// Getting direction.
- gp_Vec aDirVec;
+ gp_Vec aBaseVec;
std::shared_ptr<GeomAPI_Pnt> aBaseLoc;
std::shared_ptr<GeomAPI_Dir> aBaseDir;
- GeomShapePtr aBasePlane;
- const bool isBoundingShapesSet = theFromShape.get() || theToShape.get();
BRepBuilderAPI_FindPlane aFindPlane(aBaseShape);
- if ((aBaseShape.ShapeType() == TopAbs_VERTEX || aBaseShape.ShapeType() == TopAbs_EDGE)
- && theDirection.get())
+ if(aFindPlane.Found() == Standard_True)
{
- aBaseDir = theDirection;
- aDirVec = theDirection->impl<gp_Dir>();
- } else {
- if(aFindPlane.Found() == Standard_False) {
- return;
- }
-
Handle(Geom_Plane) aPlane;
if(aBaseShape.ShapeType() == TopAbs_FACE || aBaseShape.ShapeType() == TopAbs_SHELL) {
TopExp_Explorer anExp(aBaseShape, TopAbs_FACE);
aPlane = aFindPlane.Plane();
}
gp_Pnt aLoc = aPlane->Axis().Location();
- aDirVec = aPlane->Axis().Direction();
+ aBaseVec = aPlane->Axis().Direction();
aBaseLoc.reset(new GeomAPI_Pnt(aLoc.X(), aLoc.Y(), aLoc.Z()));
- aBaseDir.reset(new GeomAPI_Dir(aDirVec.X(), aDirVec.Y(), aDirVec.Z()));
+ aBaseDir.reset(new GeomAPI_Dir(aBaseVec.X(), aBaseVec.Y(), aBaseVec.Z()));
}
+ else if (theDirection.get())
+ {
+ aBaseDir = theDirection;
+ aBaseVec = theDirection->impl<gp_Dir>();
+ }
+ else
+ {
+ return;
+ }
+
if(!aBaseLoc.get()) {
gp_Pnt aLoc;
- gp_XYZ aDirXYZ = aDirVec.XYZ();
+ gp_XYZ aDirXYZ = aBaseVec.XYZ();
Standard_Real aMinParam = Precision::Infinite();
for(TopExp_Explorer anExp(aBaseShape, TopAbs_VERTEX); anExp.More(); anExp.Next()) {
const TopoDS_Shape& aVertex = anExp.Current();
}
aBaseLoc.reset(new GeomAPI_Pnt(aLoc.X(), aLoc.Y(), aLoc.Z()));
}
- aBasePlane = GeomAlgoAPI_FaceBuilder::planarFace(aBaseLoc, aBaseDir);
+
+ GeomShapePtr aBasePlane = GeomAlgoAPI_FaceBuilder::planarFace(aBaseLoc, aBaseDir);
+
+ gp_Vec anExtVec;
+ std::shared_ptr<GeomAPI_Dir> anExtDir;
+ if (theDirection.get())
+ {
+ anExtDir = theDirection;
+ anExtVec = theDirection->impl<gp_Dir>();
+ }
+ else
+ {
+ anExtDir = aBaseDir;
+ anExtVec = aBaseDir->impl<gp_Dir>();
+ }
+
TopoDS_Shape aResult;
+ const bool isBoundingShapesSet = theFromShape.get() || theToShape.get();
if(!isBoundingShapesSet) {
// Moving base shape.
gp_Trsf aTrsf;
- aTrsf.SetTranslation(aDirVec * -theFromSize);
+ 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, aDirVec * (theFromSize + theToSize));
- if(!aPrismBuilder) {
+ new BRepPrimAPI_MakePrism(aMovedBase, anExtVec * (theFromSize + theToSize));
+ 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.
std::shared_ptr<GeomAPI_Pnt> aToLoc = aToPln->location();
std::shared_ptr<GeomAPI_Dir> aToDir = aToPln->direction();
- bool aSign = aFromLoc->xyz()->dot(aBaseDir->xyz()) > aToLoc->xyz()->dot(aBaseDir->xyz());
+ bool aSign = aFromLoc->xyz()->dot(anExtDir->xyz()) > aToLoc->xyz()->dot(anExtDir->xyz());
std::shared_ptr<GeomAPI_Pnt> aFromPnt(
- new GeomAPI_Pnt(aFromLoc->xyz()->added(aBaseDir->xyz()->multiplied(
+ new GeomAPI_Pnt(aFromLoc->xyz()->added(anExtDir->xyz()->multiplied(
aSign ? theFromSize : -theFromSize))));
aBoundingFromShape = GeomAlgoAPI_FaceBuilder::planarFace(aFromPnt, aFromDir);
std::shared_ptr<GeomAPI_Pnt> aToPnt(
- new GeomAPI_Pnt(aToLoc->xyz()->added(aBaseDir->xyz()->multiplied(
+ new GeomAPI_Pnt(aToLoc->xyz()->added(anExtDir->xyz()->multiplied(
aSign ? -theToSize : theToSize))));
aBoundingToShape = GeomAlgoAPI_FaceBuilder::planarFace(aToPnt, aToDir);
IntAna_Quadric aBndFromQuadric(gp_Pln(aFromPnt->impl<gp_Pnt>(), aFromDir->impl<gp_Dir>()));
Standard_Real aMaxToDist = 0, aMaxFromDist = 0;
for(int i = 0; i < 8; i++) {
- gp_Lin aLine(aPoints[i], aDirVec);
+ gp_Lin aLine(aPoints[i], anExtVec);
IntAna_IntConicQuad aToIntAna(aLine, aBndToQuadric);
IntAna_IntConicQuad aFromIntAna(aLine, aBndFromQuadric);
if(aToIntAna.NbPoints() == 0 || aFromIntAna.NbPoints() == 0) {
// Moving base shape.
gp_Trsf aTrsf;
- aTrsf.SetTranslation(aDirVec * -aPrismLength);
+ 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, aDirVec * 2 * aPrismLength);
- if(!aPrismBuilder) {
+ new BRepPrimAPI_MakePrism(aMovedBase, anExtVec * 2 * aPrismLength);
+ 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.
std::shared_ptr<GeomAPI_Pnt> aCentreOfMass = GeomAlgoAPI_ShapeTools::centreOfMass(theBaseShape);
const gp_Pnt& aCentrePnt = aCentreOfMass->impl<gp_Pnt>();
- gp_Lin aLine(aCentrePnt, aDirVec);
+ gp_Lin aLine(aCentrePnt, anExtVec);
IntAna_IntConicQuad aToIntAna(aLine, aBndToQuadric);
IntAna_IntConicQuad aFromIntAna(aLine, aBndFromQuadric);
Standard_Real aToParameter = aToIntAna.ParamOnConic(1);
Standard_Real aFromParameter = aFromIntAna.ParamOnConic(1);
if(aToParameter > aFromParameter) {
gp_Vec aVec = aToDir->impl<gp_Dir>();
- if((aVec * aDirVec) > 0) {
+ if((aVec * anExtVec) > 0) {
aToDir->setImpl(new gp_Dir(aVec.Reversed()));
aBoundingToShape = GeomAlgoAPI_FaceBuilder::planarFace(aToPnt, aToDir);
}
aVec = aFromDir->impl<gp_Dir>();
- if((aVec * aDirVec) < 0) {
+ if((aVec * anExtVec) < 0) {
aFromDir->setImpl(new gp_Dir(aVec.Reversed()));
aBoundingFromShape = GeomAlgoAPI_FaceBuilder::planarFace(aFromPnt, aFromDir);
}
} else {
gp_Vec aVec = aToDir->impl<gp_Dir>();
- if((aVec * aDirVec) < 0) {
+ if((aVec * anExtVec) < 0) {
aToDir->setImpl(new gp_Dir(aVec.Reversed()));
aBoundingToShape = GeomAlgoAPI_FaceBuilder::planarFace(aToPnt, aToDir);
}
aVec = aFromDir->impl<gp_Dir>();
- if((aVec * aDirVec) > 0) {
+ if((aVec * anExtVec) > 0) {
aFromDir->setImpl(new gp_Dir(aVec.Reversed()));
aBoundingFromShape = GeomAlgoAPI_FaceBuilder::planarFace(aFromPnt, aFromDir);
}
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);
}
}
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);
}
}
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:
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);
}
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) {
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 {
