X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAlgoAPI%2FGeomAlgoAPI_Prism.cpp;h=49204ee9032404f5fc90e19786ca27e61c2f2617;hb=f0cec241aae9ca16d86e166f45cb5c4987d2c792;hp=f800657de8cf7db66ecdfcfa4dea331e30918c17;hpb=5352bbb1915f98d1f02b1cb953a2de19b286a28c;p=modules%2Fshaper.git diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Prism.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_Prism.cpp index f800657de..49204ee90 100644 --- a/src/GeomAlgoAPI/GeomAlgoAPI_Prism.cpp +++ b/src/GeomAlgoAPI/GeomAlgoAPI_Prism.cpp @@ -1,144 +1,486 @@ // Copyright (C) 2014-20xx CEA/DEN, EDF R&D -// File: GeomAlgoAPI_Prism.h +// File: GeomAlgoAPI_Prism.cpp // Created: 5 May 2015 // Author: Dmitry Bobylev -#include +#include "GeomAlgoAPI_Prism.h" +#include +#include +#include +#include +#include #include +#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include #include -#include -#include +#include +#include +#include #include #include +#include +#include +#include +#include -GeomAlgoAPI_Prism::GeomAlgoAPI_Prism(std::shared_ptr theBasis, - std::shared_ptr theFromShape, - std::shared_ptr theToShape) -: myFromShape(theFromShape), - myToShape(theToShape), - myShape(new GeomAPI_Shape()), - myFirst(new GeomAPI_Shape()),myLast(new GeomAPI_Shape()) + +static void storeGenerationHistory(GeomAlgoAPI_Prism* thePrismAlgo, + const TopoDS_Shape& theBase, + const TopAbs_ShapeEnum theType, + BRepPrimAPI_MakePrism* thePrismBuilder); + +static void storeGenerationHistory(GeomAlgoAPI_Prism* thePrismAlgo, + const TopoDS_Shape& theResult, + const TopAbs_ShapeEnum theType, + const TopoDS_Face& theToFace, + const TopoDS_Face& theFromFace); + + +//================================================================================================== +GeomAlgoAPI_Prism::GeomAlgoAPI_Prism(const GeomShapePtr theBaseShape, + const double theToSize, + const double theFromSize) +{ + build(theBaseShape, std::shared_ptr(), GeomShapePtr(), theToSize, GeomShapePtr(), theFromSize); +} + +//================================================================================================== +GeomAlgoAPI_Prism::GeomAlgoAPI_Prism(const GeomShapePtr theBaseShape, + const std::shared_ptr 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(theBasis); + build(theBaseShape, std::shared_ptr(), theToShape, theToSize, theFromShape, theFromSize); } -//============================================================================ -void GeomAlgoAPI_Prism::build(const std::shared_ptr& theBasis) +//================================================================================================== +GeomAlgoAPI_Prism::GeomAlgoAPI_Prism(const GeomShapePtr theBaseShape, + const std::shared_ptr theDirection, + const GeomShapePtr theToShape, + const double theToSize, + const GeomShapePtr theFromShape, + const double theFromSize) { - TopoDS_Face aBasis = TopoDS::Face(theBasis->impl()); - Handle(Geom_Plane) aPlane = Handle(Geom_Plane)::DownCast( - BRep_Tool::Surface(aBasis)); - if(aPlane.IsNull()) { // non-planar shapes is not supported for extrusion yet + build(theBaseShape, theDirection, theToShape, theToSize, theFromShape, theFromSize); +} + +//================================================================================================== +void GeomAlgoAPI_Prism::build(const GeomShapePtr& theBaseShape, + const std::shared_ptr theDirection, + const GeomShapePtr& theToShape, + const double theToSize, + const GeomShapePtr& theFromShape, + const double theFromSize) +{ + if(!theBaseShape.get() || + (((!theFromShape.get() && !theToShape.get()) || (theFromShape.get() && theToShape.get() && theFromShape->isEqual(theToShape))) + && (theFromSize == -theToSize))) { return; } - const gp_Dir& aNormal = aPlane->Pln().Axis().Direction(); - BRepFeat_MakePrism* aBuilder = new BRepFeat_MakePrism(aBasis, aBasis, aBasis, aNormal, 2, Standard_True); - - if(aBuilder) { - setImpl(aBuilder); - TopoDS_Shape aFromShape = myFromShape->impl(); - TopoDS_Shape aToShape = myToShape->impl(); - aBuilder->Perform(myFromShape->impl(), myToShape->impl()); - myDone = aBuilder->IsDone(); - if (myDone) { - TopoDS_Shape aResult; - if(aBuilder->Shape().ShapeType() == TopAbs_COMPOUND) { - aResult = GeomAlgoAPI_DFLoader::refineResult(aBuilder->Shape()); - } - else { - aResult = aBuilder->Shape(); - } - TopExp_Explorer anExp(aResult, TopAbs_SOLID); - if(!anExp.More()) { + // Getting base shape. + const TopoDS_Shape& aBaseShape = theBaseShape->impl(); + TopAbs_ShapeEnum aShapeTypeToExp; + switch(aBaseShape.ShapeType()) { + case TopAbs_VERTEX: + aShapeTypeToExp = TopAbs_VERTEX; + break; + case TopAbs_EDGE: + case TopAbs_WIRE: + aShapeTypeToExp = TopAbs_EDGE; + break; + case TopAbs_FACE: + case TopAbs_SHELL: + aShapeTypeToExp = TopAbs_FACE; + break; + case TopAbs_COMPOUND: + aShapeTypeToExp = TopAbs_COMPOUND; + break; + default: + return; + } + + // Getting direction. + gp_Vec aDirVec; + std::shared_ptr aBaseLoc; + std::shared_ptr aBaseDir; + GeomShapePtr aBasePlane; + const bool isBoundingShapesSet = theFromShape.get() || theToShape.get(); + BRepBuilderAPI_FindPlane aFindPlane(aBaseShape); + if(theDirection.get()) { + aBaseDir = theDirection; + aDirVec = theDirection->impl(); + } else { + if(aBaseShape.ShapeType() == TopAbs_VERTEX + || aBaseShape.ShapeType() == TopAbs_EDGE + || aFindPlane.Found() == Standard_False) { + return; + } + + Handle(Geom_Plane) aPlane; + if(aBaseShape.ShapeType() == TopAbs_FACE || aBaseShape.ShapeType() == TopAbs_SHELL) { + TopExp_Explorer anExp(aBaseShape, TopAbs_FACE); + const TopoDS_Shape& aFace = anExp.Current(); + Handle(Geom_Surface) aSurface = BRep_Tool::Surface(TopoDS::Face(aFace)); + if(aSurface->DynamicType() == STANDARD_TYPE(Geom_RectangularTrimmedSurface)) { + Handle(Geom_RectangularTrimmedSurface) aTrimSurface = + Handle(Geom_RectangularTrimmedSurface)::DownCast(aSurface); + aSurface = aTrimSurface->BasisSurface(); + } + if(aSurface->DynamicType() != STANDARD_TYPE(Geom_Plane)) { return; } - // fill data map to keep correct orientation of sub-shapes - for (TopExp_Explorer Exp(aResult,TopAbs_FACE); Exp.More(); Exp.Next()) { - std::shared_ptr aCurrentShape(new GeomAPI_Shape()); - aCurrentShape->setImpl(new TopoDS_Shape(Exp.Current())); - myMap.bind(aCurrentShape, aCurrentShape); + aPlane = Handle(Geom_Plane)::DownCast(aSurface); + } else { + aPlane = aFindPlane.Plane(); + } + gp_Pnt aLoc = aPlane->Axis().Location(); + aDirVec = 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())); + } + if(!aBaseLoc.get()) { + gp_Pnt aLoc; + gp_XYZ aDirXYZ = aDirVec.XYZ(); + Standard_Real aMinParam = Precision::Infinite(); + for(TopExp_Explorer anExp(aBaseShape, TopAbs_VERTEX); anExp.More(); anExp.Next()) { + const TopoDS_Shape& aVertex = anExp.Current(); + gp_Pnt aPnt = BRep_Tool::Pnt(TopoDS::Vertex(aVertex)); + double aParam = aDirXYZ.Dot(aPnt.XYZ()); + if(aParam < aMinParam) { + aMinParam = aParam; + aLoc = aPnt; } - myShape->setImpl(new TopoDS_Shape(aResult)); - myFirst->setImpl(new TopoDS_Shape(aBuilder->Modified(aFromShape).First())); - myLast->setImpl(new TopoDS_Shape(aBuilder->Modified(aToShape).First())); - myMkShape = new GeomAlgoAPI_MakeShape (aBuilder); } + aBaseLoc.reset(new GeomAPI_Pnt(aLoc.X(), aLoc.Y(), aLoc.Z())); } -} + aBasePlane = GeomAlgoAPI_FaceBuilder::planarFace(aBaseLoc, aBaseDir); -//============================================================================ -const bool GeomAlgoAPI_Prism::isDone() const -{ - return myDone; -} + TopoDS_Shape aResult; + if(!isBoundingShapesSet) { + // Moving base shape. + gp_Trsf aTrsf; + aTrsf.SetTranslation(aDirVec * -theFromSize); + BRepBuilderAPI_Transform* aTransformBuilder = new BRepBuilderAPI_Transform(aBaseShape, aTrsf); + if(!aTransformBuilder) { + return; + } + this->appendAlgo(std::shared_ptr(new GeomAlgoAPI_MakeShape(aTransformBuilder))); + if(!aTransformBuilder->IsDone()) { + return; + } + TopoDS_Shape aMovedBase = aTransformBuilder->Shape(); -//============================================================================ -const bool GeomAlgoAPI_Prism::isValid() const -{ - BRepCheck_Analyzer aChecker(myShape->impl()); - return (aChecker.IsValid() == Standard_True); -} + // Making prism. + BRepPrimAPI_MakePrism* aPrismBuilder = new BRepPrimAPI_MakePrism(aMovedBase, aDirVec * (theFromSize + theToSize)); + if(!aPrismBuilder) { + return; + } + this->appendAlgo(std::shared_ptr(new GeomAlgoAPI_MakeShape(aPrismBuilder))); + if(!aPrismBuilder->IsDone()) { + return; + } + aResult = aPrismBuilder->Shape(); -//============================================================================ -const bool GeomAlgoAPI_Prism::hasVolume() const -{ - bool hasVolume(false); - if(isValid()) { - const TopoDS_Shape& aRShape = myShape->impl(); - GProp_GProps aGProp; - BRepGProp::VolumeProperties(aRShape, aGProp); - if(aGProp.Mass() > Precision::Confusion()) - hasVolume = true; - } - return hasVolume; -} + // Setting naming. + if(aShapeTypeToExp == TopAbs_COMPOUND) { + storeGenerationHistory(this, aMovedBase, TopAbs_EDGE, aPrismBuilder); + storeGenerationHistory(this, aMovedBase, TopAbs_FACE, aPrismBuilder); + } else { + storeGenerationHistory(this, aMovedBase, aShapeTypeToExp, aPrismBuilder); + } + } else { + GeomShapePtr aBoundingFromShape = theFromShape ? theFromShape : aBasePlane; + GeomShapePtr aBoundingToShape = theToShape ? theToShape : aBasePlane; -//============================================================================ -const std::shared_ptr& GeomAlgoAPI_Prism::shape () const -{ - return myShape; -} + // Moving prism bounding faces according to "from" and "to" sizes. + std::shared_ptr aFromPln = GeomAPI_Face(aBoundingFromShape).getPlane(); + std::shared_ptr aFromLoc = aFromPln->location(); + std::shared_ptr aFromDir = aFromPln->direction(); -//============================================================================ -const std::shared_ptr& GeomAlgoAPI_Prism::firstShape() -{ - return myFirst; -} + std::shared_ptr aToPln = GeomAPI_Face(aBoundingToShape).getPlane(); + std::shared_ptr aToLoc = aToPln->location(); + std::shared_ptr aToDir = aToPln->direction(); -//============================================================================ -const std::shared_ptr& GeomAlgoAPI_Prism::lastShape() -{ - return myLast; -} + bool aSign = aFromLoc->xyz()->dot(aBaseDir->xyz()) > aToLoc->xyz()->dot(aBaseDir->xyz()); -//============================================================================ -void GeomAlgoAPI_Prism::mapOfShapes (GeomAPI_DataMapOfShapeShape& theMap) const -{ - theMap = myMap; + std::shared_ptr aFromPnt(new GeomAPI_Pnt(aFromLoc->xyz()->added(aBaseDir->xyz()->multiplied( + aSign ? theFromSize : -theFromSize)))); + aBoundingFromShape = GeomAlgoAPI_FaceBuilder::planarFace(aFromPnt, aFromDir); + + std::shared_ptr aToPnt(new GeomAPI_Pnt(aToLoc->xyz()->added(aBaseDir->xyz()->multiplied( + aSign ? -theToSize : theToSize)))); + aBoundingToShape = GeomAlgoAPI_FaceBuilder::planarFace(aToPnt, aToDir); + + // Getting bounding box for base shape. + Bnd_Box aBndBox; + BRepBndLib::Add(aBaseShape, aBndBox); + Standard_Real aXArr[2] = {aBndBox.CornerMin().X(), aBndBox.CornerMax().X()}; + Standard_Real aYArr[2] = {aBndBox.CornerMin().Y(), aBndBox.CornerMax().Y()}; + Standard_Real aZArr[2] = {aBndBox.CornerMin().Z(), aBndBox.CornerMax().Z()}; + gp_Pnt aPoints[8]; + int aNum = 0; + for(int i = 0; i < 2; i++) { + for(int j = 0; j < 2; j++) { + for(int k = 0; k < 2; k++) { + aPoints[aNum] = gp_Pnt(aXArr[i], aYArr[j], aZArr[k]); + aNum++; + } + } + } + + // Project points to bounding planes. Search max distance to them. + IntAna_Quadric aBndToQuadric(gp_Pln(aToPnt->impl(), aToDir->impl())); + IntAna_Quadric aBndFromQuadric(gp_Pln(aFromPnt->impl(), aFromDir->impl())); + Standard_Real aMaxToDist = 0, aMaxFromDist = 0; + for(int i = 0; i < 8; i++) { + gp_Lin aLine(aPoints[i], aDirVec); + IntAna_IntConicQuad aToIntAna(aLine, aBndToQuadric); + IntAna_IntConicQuad aFromIntAna(aLine, aBndFromQuadric); + if(aToIntAna.NbPoints() == 0 || aFromIntAna.NbPoints() == 0) { + return; + } + const gp_Pnt& aPntOnToFace = aToIntAna.Point(1); + const gp_Pnt& aPntOnFromFace = aFromIntAna.Point(1); + if(aPoints[i].Distance(aPntOnToFace) > aMaxToDist) { + aMaxToDist = aPoints[i].Distance(aPntOnToFace); + } + if(aPoints[i].Distance(aPntOnFromFace) > aMaxFromDist) { + aMaxFromDist = aPoints[i].Distance(aPntOnFromFace); + } + } + + // We added 1 just to be sure that prism is long enough for boolean operation. + double aPrismLength = aMaxToDist + aMaxFromDist + 1; + + // Moving base shape. + gp_Trsf aTrsf; + aTrsf.SetTranslation(aDirVec * -aPrismLength); + BRepBuilderAPI_Transform* aTransformBuilder = new BRepBuilderAPI_Transform(aBaseShape, aTrsf); + if(!aTransformBuilder) { + return; + } + this->appendAlgo(std::shared_ptr(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) { + return; + } + this->appendAlgo(std::shared_ptr(new GeomAlgoAPI_MakeShape(aPrismBuilder))); + if(!aPrismBuilder->IsDone()) { + return; + } + aResult = aPrismBuilder->Shape(); + + // Orienting bounding planes. + std::shared_ptr aCentreOfMass = GeomAlgoAPI_ShapeTools::centreOfMass(theBaseShape); + const gp_Pnt& aCentrePnt = aCentreOfMass->impl(); + gp_Lin aLine(aCentrePnt, aDirVec); + 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(); + if((aVec * aDirVec) > 0) { + aToDir->setImpl(new gp_Dir(aVec.Reversed())); + aBoundingToShape = GeomAlgoAPI_FaceBuilder::planarFace(aToPnt, aToDir); + } + aVec = aFromDir->impl(); + if((aVec * aDirVec) < 0) { + aFromDir->setImpl(new gp_Dir(aVec.Reversed())); + aBoundingFromShape = GeomAlgoAPI_FaceBuilder::planarFace(aFromPnt, aFromDir); + } + } else { + gp_Vec aVec = aToDir->impl(); + if((aVec * aDirVec) < 0) { + aToDir->setImpl(new gp_Dir(aVec.Reversed())); + aBoundingToShape = GeomAlgoAPI_FaceBuilder::planarFace(aToPnt, aToDir); + } + aVec = aFromDir->impl(); + if((aVec * aDirVec) > 0) { + aFromDir->setImpl(new gp_Dir(aVec.Reversed())); + aBoundingFromShape = GeomAlgoAPI_FaceBuilder::planarFace(aFromPnt, aFromDir); + } + } + + // Making solids from bounding planes. + TopoDS_Shell aToShell, aFromShell; + TopoDS_Solid aToSolid, aFromSolid; + const TopoDS_Shape& aToShape = aBoundingToShape->impl(); + const TopoDS_Shape& aFromShape = aBoundingFromShape->impl(); + TopoDS_Face aToFace = TopoDS::Face(aToShape); + TopoDS_Face aFromFace = TopoDS::Face(aFromShape); + BRep_Builder aBoundingBuilder; + aBoundingBuilder.MakeShell(aToShell); + aBoundingBuilder.Add(aToShell, aToShape); + aBoundingBuilder.MakeShell(aFromShell); + aBoundingBuilder.Add(aFromShell, aFromShape); + aBoundingBuilder.MakeSolid(aToSolid); + aBoundingBuilder.Add(aToSolid, aToShell); + aBoundingBuilder.MakeSolid(aFromSolid); + aBoundingBuilder.Add(aFromSolid, aFromShell); + + // Cutting with to plane. + BRepAlgoAPI_Cut* aToCutBuilder = new BRepAlgoAPI_Cut(aResult, aToSolid); + aToCutBuilder->Build(); + if(!aToCutBuilder->IsDone()) { + return; + } + this->appendAlgo(std::shared_ptr(new GeomAlgoAPI_MakeShape(aToCutBuilder))); + aResult = aToCutBuilder->Shape(); + if(aResult.ShapeType() == TopAbs_COMPOUND) { + aResult = GeomAlgoAPI_DFLoader::refineResult(aResult); + } + if(aShapeTypeToExp == TopAbs_FACE || aShapeTypeToExp == TopAbs_COMPOUND) { + const TopTools_ListOfShape& aToShapes = aToCutBuilder->Modified(aToShape); + for(TopTools_ListIteratorOfListOfShape anIt(aToShapes); anIt.More(); anIt.Next()) { + GeomShapePtr aGeomSh(new GeomAPI_Shape()); + aGeomSh->setImpl(new TopoDS_Shape(anIt.Value())); + this->addToShape(aGeomSh); + } + } + + // Cutting with from plane. + BRepAlgoAPI_Cut* aFromCutBuilder = new BRepAlgoAPI_Cut(aResult, aFromSolid); + aFromCutBuilder->Build(); + if(!aFromCutBuilder->IsDone()) { + return; + } + this->appendAlgo(std::shared_ptr(new GeomAlgoAPI_MakeShape(aFromCutBuilder))); + aResult = aFromCutBuilder->Shape(); + TopoDS_Iterator aCheckIt(aResult); + if(!aCheckIt.More()) { + return; + } + if(aResult.ShapeType() == TopAbs_COMPOUND) { + aResult = GeomAlgoAPI_DFLoader::refineResult(aResult); + } + if(aShapeTypeToExp == TopAbs_FACE || aShapeTypeToExp == TopAbs_COMPOUND) { + const TopTools_ListOfShape& aFromShapes = aFromCutBuilder->Modified(aFromShape); + for(TopTools_ListIteratorOfListOfShape anIt(aFromShapes); anIt.More(); anIt.Next()) { + GeomShapePtr aGeomSh(new GeomAPI_Shape()); + aGeomSh->setImpl(new TopoDS_Shape(anIt.Value())); + this->addFromShape(aGeomSh); + } + } + + // Naming for extrusion from vertex, edge. + if(aShapeTypeToExp == TopAbs_COMPOUND) { + storeGenerationHistory(this, aResult, TopAbs_EDGE, aToFace, aFromFace); + storeGenerationHistory(this, aResult, TopAbs_FACE, aToFace, aFromFace); + } else { + storeGenerationHistory(this, aResult, aShapeTypeToExp, aToFace, aFromFace); + } + + if(aResult.ShapeType() == TopAbs_COMPOUND) { + std::shared_ptr aGeomShape(new GeomAPI_Shape); + aGeomShape->setImpl(new TopoDS_Shape(aResult)); + ListOfShape aCompSolids, aFreeSolids; + aGeomShape = GeomAlgoAPI_ShapeTools::combineShapes(aGeomShape, + GeomAPI_Shape::COMPSOLID, + aCompSolids, + aFreeSolids); + aResult = aGeomShape->impl(); + } + } + + // Setting result. + if(aResult.IsNull()) { + return; + } + aResult = GeomAlgoAPI_DFLoader::refineResult(aResult); + GeomShapePtr aGeomSh(new GeomAPI_Shape()); + aGeomSh->setImpl(new TopoDS_Shape(aResult)); + this->setShape(aGeomSh); + this->setDone(true); } -//============================================================================ -GeomAlgoAPI_MakeShape* GeomAlgoAPI_Prism::makeShape() const +// Auxilary functions: +//================================================================================================== +void storeGenerationHistory(GeomAlgoAPI_Prism* thePrismAlgo, + const TopoDS_Shape& theBase, + const TopAbs_ShapeEnum theType, + BRepPrimAPI_MakePrism* thePrismBuilder) { - return myMkShape; + for(TopExp_Explorer anExp(theBase, theType); anExp.More(); anExp.Next()) { + const TopoDS_Shape& aShape = anExp.Current(); + 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->addFromShape(aFromShape); + thePrismAlgo->addToShape(aToShape); + } } -//============================================================================ -GeomAlgoAPI_Prism::~GeomAlgoAPI_Prism() +//================================================================================================== +void storeGenerationHistory(GeomAlgoAPI_Prism* thePrismAlgo, + const TopoDS_Shape& theResult, + const TopAbs_ShapeEnum theType, + const TopoDS_Face& theToFace, + const TopoDS_Face& theFromFace) { - if (myImpl) { - myMap.clear(); + for(TopExp_Explorer anExp(theResult, theType); anExp.More(); anExp.Next()) { + const TopoDS_Shape& aShape = anExp.Current(); + GeomShapePtr aGeomSh(new GeomAPI_Shape()); + if(theType == TopAbs_VERTEX) { + gp_Pnt aPnt = BRep_Tool::Pnt(TopoDS::Vertex(aShape)); + IntTools_Context anIntTools; + if(anIntTools.IsValidPointForFace(aPnt, theToFace, Precision::Confusion()) == Standard_True) { + aGeomSh->setImpl(new TopoDS_Shape(aShape)); + thePrismAlgo->addToShape(aGeomSh); + } + if(anIntTools.IsValidPointForFace(aPnt, theFromFace, Precision::Confusion()) == Standard_True) { + aGeomSh->setImpl(new TopoDS_Shape(aShape)); + thePrismAlgo->addFromShape(aGeomSh); + } + } else if(theType == TopAbs_EDGE) { + TopoDS_Edge anEdge = TopoDS::Edge(aShape); + BRepLib_CheckCurveOnSurface anEdgeCheck(anEdge, theToFace); + anEdgeCheck.Perform(); + if(anEdgeCheck.MaxDistance() < Precision::Confusion()) { + aGeomSh->setImpl(new TopoDS_Shape(aShape)); + thePrismAlgo->addToShape(aGeomSh); + } + anEdgeCheck.Init(anEdge, theFromFace); + anEdgeCheck.Perform(); + if(anEdgeCheck.MaxDistance() < Precision::Confusion()) { + aGeomSh->setImpl(new TopoDS_Shape(aShape)); + thePrismAlgo->addFromShape(aGeomSh); + } + } else { + break; + } } -} \ No newline at end of file +}