X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAlgoAPI%2FGeomAlgoAPI_Pipe.cpp;h=819c8d70963bba7aa0da9d4016e3510a580e2c01;hb=fdd802da7683f66ca609cf12b1e11be9642149d6;hp=fb5f6e8b8016dbb7f76821cce0e8d193b9f9d7df;hpb=a94fc319f2aa64b43c9a73b5ff7063923648faec;p=modules%2Fshaper.git diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Pipe.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_Pipe.cpp index fb5f6e8b8..819c8d709 100644 --- a/src/GeomAlgoAPI/GeomAlgoAPI_Pipe.cpp +++ b/src/GeomAlgoAPI/GeomAlgoAPI_Pipe.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// Copyright (C) 2014-2020 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 @@ -12,10 +12,9 @@ // // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "GeomAlgoAPI_Pipe.h" @@ -25,8 +24,10 @@ #include #include #include +#include #include +#include #include #include #include @@ -34,15 +35,19 @@ #include #include #include +#include #include #include #include +#include static bool getBase(TopoDS_Shape& theBaseOut, TopAbs_ShapeEnum& theBaseTypeOut, const GeomShapePtr theBaseShape); static bool getPath(TopoDS_Wire& thePathOut, const GeomShapePtr thePathShape); +static gp_Trsf getPathToBaseTranslation(const TopoDS_Shape& theBase, + const TopoDS_Shape& thePath); static bool buildPipe(BRepOffsetAPI_MakePipeShell* thePipeBuilder); static ListOfShape getListFromShape(const TopoDS_Shape& theShape); @@ -93,6 +98,12 @@ void GeomAlgoAPI_Pipe::build(const GeomShapePtr theBaseShape, if(!getPath(aPathWire, thePathShape)) { return; } + GeomShapePtr anOldPath(new GeomAPI_Shape), aNewPath(new GeomAPI_Shape); + anOldPath->setImpl(new TopoDS_Shape(aPathWire)); + aPathWire.Move(getPathToBaseTranslation(aBaseShape, aPathWire)); + aNewPath->setImpl(new TopoDS_Shape(aPathWire)); + if (!anOldPath->isSame(aNewPath)) + addMovedPath(anOldPath, aNewPath); // Making pipe. BRepOffsetAPI_MakePipe* aPipeBuilder = new BRepOffsetAPI_MakePipe(aPathWire, aBaseShape); @@ -126,23 +137,24 @@ void GeomAlgoAPI_Pipe::build(const GeomShapePtr theBaseShape, const GeomShapePtr thePathShape, const GeomShapePtr theBiNormal) { - // Getting base shape. + // Getting base shape and path. TopoDS_Shape aBaseShape; TopAbs_ShapeEnum aBaseShapeType; - if(!getBase(aBaseShape, aBaseShapeType, theBaseShape)) { - return; - } - - // Getting path. TopoDS_Wire aPathWire; - if(!getPath(aPathWire, thePathShape)) { + if (!getBase(aBaseShape, aBaseShapeType, theBaseShape) || + !getPath(aPathWire, thePathShape) || + !theBiNormal.get()) { return; } + GeomShapePtr anOldPath(new GeomAPI_Shape), aNewPath(new GeomAPI_Shape); + anOldPath->setImpl(new TopoDS_Shape(aPathWire)); + aPathWire.Move(getPathToBaseTranslation(theBaseShape->impl(), aPathWire)); + aNewPath->setImpl(new TopoDS_Shape(aPathWire)); + if (!anOldPath->isSame(aNewPath)) + addMovedPath(anOldPath, aNewPath); + // Getting Bi-Normal. - if(!theBiNormal.get()) { - return; - } TopoDS_Shape aBiNormalShape = theBiNormal->impl(); if(aBiNormalShape.IsNull() || aBiNormalShape.ShapeType() != TopAbs_EDGE) { return; @@ -170,10 +182,8 @@ void GeomAlgoAPI_Pipe::build(const GeomShapePtr theBaseShape, this->initialize(aPipeBuilder); // Checking result. - if(aBaseShapeType == TopAbs_FACE) { - if(aPipeBuilder->MakeSolid() == Standard_False) { - return; - } + if(aBaseShapeType == TopAbs_FACE && !aPipeBuilder->MakeSolid()) { + return; } TopoDS_Shape aResult = aPipeBuilder->Shape(); if(aResult.IsNull()) { @@ -202,68 +212,114 @@ void GeomAlgoAPI_Pipe::build(const ListOfShape& theBaseShapes, return; } - bool aHasLocations = false; - if(!theLocations.empty()) { - aHasLocations = true; - } - - // Getting path. + // Getting base shape and path. + TopoDS_Shape aBaseShape; + TopAbs_ShapeEnum aBaseShapeType; TopoDS_Wire aPathWire; - if(!getPath(aPathWire, thePathShape)) { + if (!getBase(aBaseShape, aBaseShapeType, theBaseShapes.front()) || + !getPath(aPathWire, thePathShape)) { return; } - // Making pipe. - BRepOffsetAPI_MakePipeShell* aPipeBuilder = new BRepOffsetAPI_MakePipeShell(aPathWire); - if(!aPipeBuilder) { + TopoDS_Shape aReallyBase = theBaseShapes.front()->impl(); + gp_Trsf aTrsf = getPathToBaseTranslation(aReallyBase, aPathWire); + + GeomShapePtr anOldPath(new GeomAPI_Shape), aNewPath(new GeomAPI_Shape); + anOldPath->setImpl(new TopoDS_Shape(aPathWire)); + aPathWire.Move(aTrsf); + aNewPath->setImpl(new TopoDS_Shape(aPathWire)); + if (!anOldPath->isSame(aNewPath)) + addMovedPath(anOldPath, aNewPath); + + // Get locations after moving path shape. + std::list aLocations; + for (ListOfShape::const_iterator aLocIt = theLocations.cbegin(); + aLocIt != theLocations.cend(); + ++aLocIt) + { + GeomShapePtr aLocation = *aLocIt; + if (!aLocation.get() || aLocation->shapeType() != GeomAPI_Shape::VERTEX) { + return; + } + + TopoDS_Vertex aLocationVertex = aLocation->impl(); + TopoDS_Vertex aMovedVertex; + for (TopExp_Explorer anExp(aPathWire, TopAbs_VERTEX); anExp.More(); anExp.Next()) { + if (anExp.Current().IsPartner(aLocationVertex)) { + aMovedVertex = TopoDS::Vertex(anExp.Current()); + aLocations.push_back(aMovedVertex); + break; + } + } + if (aMovedVertex.IsNull()) { + return; + } + } + + if (theLocations.size() != aLocations.size()) { return; } + + bool aHasLocations = !aLocations.empty(); + + // Making pipe. + Standard_Boolean isDone = Standard_False; bool anIsSolidNeeded = false; - ListOfShape::const_iterator aBaseIt = theBaseShapes.cbegin(); - ListOfShape::const_iterator aLocIt = theLocations.cbegin(); - while(aBaseIt != theBaseShapes.cend()) { - GeomShapePtr aBase = *aBaseIt; - TopoDS_Shape aBaseShape; - TopAbs_ShapeEnum aBaseShapeType; - if(!getBase(aBaseShape, aBaseShapeType, aBase)) { - delete aPipeBuilder; + BRepOffsetAPI_MakePipeShell* aPipeBuilder; + for(int i = 0; i < 2; ++i) { + aPipeBuilder = new BRepOffsetAPI_MakePipeShell(aPathWire); + if(!aPipeBuilder) { return; } - ++aBaseIt; - if(aBaseShapeType == TopAbs_FACE) { - anIsSolidNeeded = true; - } - - if(aHasLocations) { - GeomShapePtr aLocation = *aLocIt; - if(!aLocation.get() || aLocation->shapeType() != GeomAPI_Shape::VERTEX) { + ListOfShape::const_iterator aBaseIt = theBaseShapes.cbegin(); + std::list::const_iterator aLocationsIt = aLocations.cbegin(); + while(aBaseIt != theBaseShapes.cend()) { + GeomShapePtr aBase = *aBaseIt; + if(!getBase(aBaseShape, aBaseShapeType, aBase)) { delete aPipeBuilder; return; } - TopoDS_Vertex aLocationVertex = aLocation->impl(); - ++aLocIt; - aPipeBuilder->Add(aBaseShape, aLocationVertex); - } else { - aPipeBuilder->Add(aBaseShape); + ++aBaseIt; + if(aBaseShapeType == TopAbs_FACE) { + anIsSolidNeeded = true; + } + + if(aHasLocations) { + aPipeBuilder->Add(aBaseShape, *aLocationsIt); + ++aLocationsIt; + } else { + aPipeBuilder->Add(aBaseShape); + } + } + + if(aPipeBuilder->IsReady() == Standard_False) { + delete aPipeBuilder; + return; + } + + if (i == 1) { + // Try to use Descrete Trihedron mode. + aPipeBuilder->SetDiscreteMode(); + } + aPipeBuilder->Build(); + isDone = aPipeBuilder->IsDone(); + + if (isDone) { + break; } - } - if(aPipeBuilder->IsReady() == Standard_False) { delete aPipeBuilder; - return; } - if(!buildPipe(aPipeBuilder)) { - delete aPipeBuilder; + if (!isDone) { return; } + this->initialize(aPipeBuilder); // Checking result. - if(anIsSolidNeeded) { - if(aPipeBuilder->MakeSolid() == Standard_False) { - return; - } + if(anIsSolidNeeded && !aPipeBuilder->MakeSolid()) { + return; } TopoDS_Shape aResult = aPipeBuilder->Shape(); @@ -271,6 +327,8 @@ void GeomAlgoAPI_Pipe::build(const ListOfShape& theBaseShapes, GeomShapePtr aFromShape(new GeomAPI_Shape), aToShape(new GeomAPI_Shape); aFromShape->setImpl(new TopoDS_Shape(aPipeBuilder->FirstShape())); aToShape->setImpl(new TopoDS_Shape(aPipeBuilder->LastShape())); + fixOrientation(aFromShape); + fixOrientation(aToShape); this->addFromShape(aFromShape); this->addToShape(aToShape); @@ -289,7 +347,10 @@ void GeomAlgoAPI_Pipe::build(const ListOfShape& theBaseShapes, void GeomAlgoAPI_Pipe::generated(const GeomShapePtr theShape, ListOfShape& theHistory) { - GeomAlgoAPI_MakeShape::generated(theShape, theHistory); + if (myMovedPath.isBound(theShape)) + GeomAlgoAPI_MakeShape::generated(myMovedPath.find(theShape), theHistory); + else + GeomAlgoAPI_MakeShape::generated(theShape, theHistory); } // Auxilary functions: @@ -324,8 +385,7 @@ bool getBase(TopoDS_Shape& theBaseOut, } //================================================================================================== -bool getPath(TopoDS_Wire& thePathOut, - const GeomShapePtr thePathShape) +bool getPath(TopoDS_Wire& thePathOut, const GeomShapePtr thePathShape) { if(!thePathShape.get()) { return false; @@ -348,6 +408,47 @@ bool getPath(TopoDS_Wire& thePathOut, return true; } +//================================================================================================== +gp_Trsf getPathToBaseTranslation(const TopoDS_Shape& theBase, const TopoDS_Shape& thePath) +{ + gp_Trsf aTranslation; + + BRepExtrema_DistShapeShape aDist(theBase, thePath); + aDist.Perform(); + if (aDist.IsDone() && aDist.Value() > Precision::Confusion()) { + gp_Pnt aPntBase = aDist.PointOnShape1(1); + gp_Pnt aPntPath = aDist.PointOnShape2(1); + // get the end point on the path nearest to the found point, + // because the path is almost usually started from the one of the sections + if (!BRep_Tool::IsClosed(thePath)) { + TopoDS_Wire aPathWire = TopoDS::Wire(thePath); + if (!aPathWire.IsNull()) { + TopoDS_Vertex aV1, aV2; + TopExp::Vertices(aPathWire, aV1, aV2); + + gp_Pnt aStart = BRep_Tool::Pnt(aV1); + gp_Pnt anEnd = BRep_Tool::Pnt(aV2); + + // compare 3 distances + double aDistToStart = aPntBase.Distance(aStart); + double aDistToEnd = aPntBase.Distance(anEnd); + double aMinDist = aPntBase.Distance(aPntPath); + + static const double THE_THRESHOLD = 0.01; // threshold for distance ratio + double aDeltaStart = Abs(aDistToStart - aMinDist); + double aDeltaEnd = Abs(aDistToEnd - aMinDist); + if (aDeltaStart < THE_THRESHOLD * aDeltaEnd) + aPntPath = aStart; + else if (aDeltaEnd < THE_THRESHOLD * aDeltaStart) + aPntPath = anEnd; + } + } + aTranslation.SetTranslation(aPntPath, aPntBase); + } + + return aTranslation; +} + //================================================================================================== bool buildPipe(BRepOffsetAPI_MakePipeShell* thePipeBuilder) { @@ -385,3 +486,14 @@ ListOfShape getListFromShape(const TopoDS_Shape& theShape) return aList; } + +//================================================================================================== +void GeomAlgoAPI_Pipe::addMovedPath(GeomShapePtr thePath, GeomShapePtr theMoved) +{ + myMovedPath.clear(); + GeomAPI_ShapeExplorer anOldExp(thePath, GeomAPI_Shape::EDGE); + GeomAPI_ShapeExplorer aNewExp(theMoved, GeomAPI_Shape::EDGE); + for(; anOldExp.more(); anOldExp.next(), aNewExp.next()) { + myMovedPath.bind(anOldExp.current(), aNewExp.current()); + } +}