X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAlgoAPI%2FGeomAlgoAPI_EdgeBuilder.cpp;h=d6ba70d19919110cfe07087731d15cd75995457f;hb=1c3738ae81b02ba62136ac03a53a81a532b95141;hp=0de55a60f36502506bd813eb21528fe3398daf64;hpb=3ee83c7b4a29bfb47ad40090dea7cc27f80c2b47;p=modules%2Fshaper.git diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_EdgeBuilder.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_EdgeBuilder.cpp index 0de55a60f..d6ba70d19 100644 --- a/src/GeomAlgoAPI/GeomAlgoAPI_EdgeBuilder.cpp +++ b/src/GeomAlgoAPI/GeomAlgoAPI_EdgeBuilder.cpp @@ -1,8 +1,22 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: GeomAlgoAPI_EdgeBuilder.cpp -// Created: 23 Apr 2014 -// Author: Mikhail PONIKAROV +// Copyright (C) 2014-2017 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 +// 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 #include @@ -13,9 +27,13 @@ #include #include #include +#include #include #include +#include +#include +#include std::shared_ptr GeomAlgoAPI_EdgeBuilder::line( std::shared_ptr theStart, std::shared_ptr theEnd) @@ -33,6 +51,38 @@ std::shared_ptr GeomAlgoAPI_EdgeBuilder::line( aRes->setImpl(new TopoDS_Shape(anEdge)); return aRes; } +std::shared_ptr GeomAlgoAPI_EdgeBuilder::line( + double theDX, double theDY, double theDZ) +{ + + const gp_Pnt& aStart = gp_Pnt(0, 0, 0); + const gp_Pnt& anEnd = gp_Pnt(theDX, theDY, theDZ); + + if (aStart.IsEqual(anEnd, Precision::Confusion())) + return std::shared_ptr(); + if (Abs(aStart.SquareDistance(anEnd)) > 1.e+100) + return std::shared_ptr(); + BRepBuilderAPI_MakeEdge anEdgeBuilder(aStart, anEnd); + std::shared_ptr aRes(new GeomAPI_Edge); + TopoDS_Edge anEdge = anEdgeBuilder.Edge(); + aRes->setImpl(new TopoDS_Shape(anEdge)); + return aRes; +} + +std::shared_ptr GeomAlgoAPI_EdgeBuilder::line( + const std::shared_ptr theLin) +{ + if(!theLin.get()) { + return std::shared_ptr(); + } + + const gp_Lin& aLin = theLin->impl(); + BRepBuilderAPI_MakeEdge anEdgeBuilder(aLin); + std::shared_ptr aRes(new GeomAPI_Edge()); + TopoDS_Edge anEdge = anEdgeBuilder.Edge(); + aRes->setImpl(new TopoDS_Shape(anEdge)); + return aRes; +} std::shared_ptr GeomAlgoAPI_EdgeBuilder::cylinderAxis( std::shared_ptr theCylindricalFace) @@ -48,18 +98,61 @@ std::shared_ptr GeomAlgoAPI_EdgeBuilder::cylinderAxis( Handle(Geom_Surface) aSurf = BRep_Tool::Surface(aFace, aLoc); if (aSurf.IsNull()) return aResult; + Handle(Geom_RectangularTrimmedSurface) aTrimmed = + Handle(Geom_RectangularTrimmedSurface)::DownCast(aSurf); + if (!aTrimmed.IsNull()) + aSurf = aTrimmed->BasisSurface(); Handle(Geom_CylindricalSurface) aCyl = Handle(Geom_CylindricalSurface)::DownCast(aSurf); if (aCyl.IsNull()) return aResult; gp_Ax1 anAxis = aCyl->Axis(); + // compute the start and the end points of the resulting edge by the bounding box of the face + // (vertices projected to the axis) plus 10% + Bnd_Box aFaceBnd; + BRepBndLib::Add(aFace, aFaceBnd); + gp_Pnt aBoxMin(aFaceBnd.CornerMin()), aBoxMax(aFaceBnd.CornerMax()); + bool isFirst = true; + double aParamMin = 0, aParamMax = 0; + for(int aX = 0; aX < 2; aX++) { + for(int aY = 0; aY < 2; aY++) { + for(int aZ = 0; aZ < 2; aZ++) { + gp_XYZ aBoxVertex(aX == 0 ? aBoxMin.X() : aBoxMax.X(), + aY == 0 ? aBoxMin.Y() : aBoxMax.Y(), aZ == 0 ? aBoxMin.Z() : aBoxMax.Z()); + gp_XYZ aVec(aBoxVertex - anAxis.Location().XYZ()); + double aProjParam = aVec.Dot(anAxis.Direction().XYZ()); + if (isFirst) { + isFirst = false; + aParamMin = aProjParam; + aParamMax = aProjParam; + } else { + if (aParamMin > aProjParam) + aParamMin = aProjParam; + else if (aParamMax < aProjParam) + aParamMax = aProjParam; + } + } + } + } + // add 10% + double aDelta = aParamMax - aParamMin; + if (aDelta < 1.e-4) aDelta = 1.e-4; + aParamMin -= aDelta * 0.1; + aParamMax += aDelta * 0.1; + + gp_Pnt aStart(aParamMin * anAxis.Direction().XYZ() + anAxis.Location().XYZ()); + gp_Pnt anEnd(aParamMax * anAxis.Direction().XYZ() + anAxis.Location().XYZ()); + /* gp_Pnt aStart(anAxis.Location().Transformed(aLoc.Transformation())); // edge length is 100, "-" because cylinder of extrusion has negative direction with the cylinder gp_Pnt anEnd(anAxis.Location().XYZ() - anAxis.Direction().XYZ() * 100.); anEnd.Transform(aLoc.Transformation()); - + */ + BRepBuilderAPI_MakeEdge anEdgeBuilder(aStart, anEnd); std::shared_ptr aRes(new GeomAPI_Edge); TopoDS_Edge anEdge = anEdgeBuilder.Edge(); + // an axis is an infinite object + anEdge.Infinite(Standard_True); aRes->setImpl(new TopoDS_Shape(anEdge)); return aRes; } @@ -80,32 +173,73 @@ std::shared_ptr GeomAlgoAPI_EdgeBuilder::lineCircle( return aRes; } +std::shared_ptr GeomAlgoAPI_EdgeBuilder::lineCircle( + std::shared_ptr theCircle) +{ + if(!theCircle.get()) { + return std::shared_ptr(); + } + + const gp_Circ& aCirc = theCircle->impl(); + BRepBuilderAPI_MakeEdge anEdgeBuilder(aCirc); + std::shared_ptr aRes(new GeomAPI_Edge()); + TopoDS_Edge anEdge = anEdgeBuilder.Edge(); + aRes->setImpl(new TopoDS_Shape(anEdge)); + return aRes; +} + std::shared_ptr GeomAlgoAPI_EdgeBuilder::lineCircleArc( std::shared_ptr theCenter, std::shared_ptr theStartPoint, std::shared_ptr theEndPoint, std::shared_ptr theNormal) { + std::shared_ptr aRes; + const gp_Pnt& aCenter = theCenter->impl(); const gp_Dir& aDir = theNormal->impl(); + /// OCCT creates an edge on a circle with empty radius, but visualization + /// is not able to process it + if (theCenter->isEqual(theStartPoint) || theCenter->isEqual(theEndPoint)) + return aRes; + double aRadius = theCenter->distance(theStartPoint); gp_Circ aCircle(gp_Ax2(aCenter, aDir), aRadius); const gp_Pnt& aStart = theStartPoint->impl(); - const gp_Pnt& anEnd = theEndPoint->impl(); + const gp_Pnt& anEndInter = theEndPoint->impl(); + + // project end point to a circle + gp_XYZ aEndDir = anEndInter.XYZ() - aCenter.XYZ(); + gp_Pnt anEnd(aCenter.XYZ() + aEndDir.Normalized() * aRadius); BRepBuilderAPI_MakeEdge anEdgeBuilder; - if (aStart.IsEqual(anEnd, Precision::Confusion()) - || gp_Pnt(0, 0, 0).IsEqual(anEnd, Precision::Confusion())) - anEdgeBuilder = BRepBuilderAPI_MakeEdge(aCircle); - else - anEdgeBuilder = BRepBuilderAPI_MakeEdge(aCircle, aStart, anEnd); + anEdgeBuilder = BRepBuilderAPI_MakeEdge(aCircle, aStart, anEnd); - std::shared_ptr aRes(new GeomAPI_Edge); anEdgeBuilder.Build(); - if (anEdgeBuilder.IsDone()) + if (anEdgeBuilder.IsDone()) { + aRes = std::shared_ptr(new GeomAPI_Edge); aRes->setImpl(new TopoDS_Shape(anEdgeBuilder.Edge())); - else - aRes = std::shared_ptr(); + } + return aRes; +} + +std::shared_ptr GeomAlgoAPI_EdgeBuilder::ellipse( + const std::shared_ptr& theCenter, + const std::shared_ptr& theNormal, + const std::shared_ptr& theMajorAxis, + const double theMajorRadius, + const double theMinorRadius) +{ + const gp_Pnt& aCenter = theCenter->impl(); + const gp_Dir& aNormal = theNormal->impl(); + const gp_Dir& aMajorAxis = theMajorAxis->impl(); + + gp_Elips anEllipse(gp_Ax2(aCenter, aNormal, aMajorAxis), theMajorRadius, theMinorRadius); + + BRepBuilderAPI_MakeEdge anEdgeBuilder(anEllipse); + std::shared_ptr aRes(new GeomAPI_Edge); + TopoDS_Edge anEdge = anEdgeBuilder.Edge(); + aRes->setImpl(new TopoDS_Shape(anEdge)); return aRes; }