X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAlgoAPI%2FGeomAlgoAPI_Pipe.cpp;h=067a249bd592d27e11cf924b8923f6dcee1b48d2;hb=f813e863f0a60ee69846227f99f0dd6a84f8498c;hp=84a09ea1029e1ad2410ac0bbf9411c5a1fc16d55;hpb=6b8c715fb1dd0c821ba1b898b0533ace4f85698a;p=modules%2Fshaper.git diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Pipe.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_Pipe.cpp index 84a09ea10..067a249bd 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-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 @@ -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,6 +24,7 @@ #include #include #include +#include #include #include @@ -97,7 +97,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); @@ -131,25 +136,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; } - aPathWire.Move(getPathToBaseTranslation(aBaseShape, aPathWire)); + 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; @@ -177,10 +181,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()) { @@ -209,25 +211,55 @@ 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; - if (!getBase(aBaseShape, aBaseShapeType, theBaseShapes.front())) { + TopoDS_Wire aPathWire; + if (!getBase(aBaseShape, aBaseShapeType, theBaseShapes.front()) || + !getPath(aPathWire, thePathShape)) { return; } - TopoDS_Wire aPathWire; - if(!getPath(aPathWire, thePathShape)) { + 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; } - gp_Trsf aTrsf = getPathToBaseTranslation(aBaseShape, aPathWire); - aPathWire.Move(aTrsf); + bool aHasLocations = !aLocations.empty(); // Making pipe. Standard_Boolean isDone = Standard_False; @@ -239,7 +271,7 @@ void GeomAlgoAPI_Pipe::build(const ListOfShape& theBaseShapes, return; } ListOfShape::const_iterator aBaseIt = theBaseShapes.cbegin(); - ListOfShape::const_iterator aLocIt = theLocations.cbegin(); + std::list::const_iterator aLocationsIt = aLocations.cbegin(); while(aBaseIt != theBaseShapes.cend()) { GeomShapePtr aBase = *aBaseIt; if(!getBase(aBaseShape, aBaseShapeType, aBase)) { @@ -252,15 +284,8 @@ void GeomAlgoAPI_Pipe::build(const ListOfShape& theBaseShapes, } if(aHasLocations) { - GeomShapePtr aLocation = *aLocIt; - if(!aLocation.get() || aLocation->shapeType() != GeomAPI_Shape::VERTEX) { - delete aPipeBuilder; - return; - } - TopoDS_Vertex aLocationVertex = aLocation->impl(); - aLocationVertex.Move(aTrsf); - ++aLocIt; - aPipeBuilder->Add(aBaseShape, aLocationVertex); + aPipeBuilder->Add(aBaseShape, *aLocationsIt); + ++aLocationsIt; } else { aPipeBuilder->Add(aBaseShape); } @@ -292,10 +317,8 @@ void GeomAlgoAPI_Pipe::build(const ListOfShape& theBaseShapes, this->initialize(aPipeBuilder); // Checking result. - if(anIsSolidNeeded) { - if(aPipeBuilder->MakeSolid() == Standard_False) { - return; - } + if(anIsSolidNeeded && !aPipeBuilder->MakeSolid()) { + return; } TopoDS_Shape aResult = aPipeBuilder->Shape(); @@ -303,6 +326,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); @@ -321,7 +346,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: @@ -432,3 +460,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()); + } +}