-// 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_Pipe.h"
#include <GeomAPI_Dir.h>
#include <GeomAPI_Edge.h>
#include <GeomAPI_Lin.h>
+#include <GeomAPI_ShapeExplorer.h>
#include <BRep_Tool.hxx>
+#include <BRepExtrema_DistShapeShape.hxx>
#include <BRepOffsetAPI_MakePipe.hxx>
#include <BRepOffsetAPI_MakePipeShell.hxx>
#include <BRepBuilderAPI_MakeWire.hxx>
#include <TopExp_Explorer.hxx>
#include <TopoDS.hxx>
#include <TopoDS_Shape.hxx>
+#include <Precision.hxx>
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);
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);
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<TopoDS_Shape>(), 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<TopoDS_Shape>();
if(aBiNormalShape.IsNull() || aBiNormalShape.ShapeType() != TopAbs_EDGE) {
return;
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()) {
return;
}
- bool aHasLocations = false;
- if(!theLocations.empty()) {
- aHasLocations = true;
+ // Getting base shape and path.
+ TopoDS_Shape aBaseShape;
+ TopAbs_ShapeEnum aBaseShapeType;
+ TopoDS_Wire aPathWire;
+ if (!getBase(aBaseShape, aBaseShapeType, theBaseShapes.front()) ||
+ !getPath(aPathWire, thePathShape)) {
+ return;
}
- // Getting path.
- TopoDS_Wire aPathWire;
- if(!getPath(aPathWire, thePathShape)) {
+ TopoDS_Shape aReallyBase = theBaseShapes.front()->impl<TopoDS_Shape>();
+ 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<TopoDS_Vertex> 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>();
+ 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;
return;
}
ListOfShape::const_iterator aBaseIt = theBaseShapes.cbegin();
- ListOfShape::const_iterator aLocIt = theLocations.cbegin();
+ std::list<TopoDS_Vertex>::const_iterator aLocationsIt = aLocations.cbegin();
while(aBaseIt != theBaseShapes.cend()) {
GeomShapePtr aBase = *aBaseIt;
- TopoDS_Shape aBaseShape;
- TopAbs_ShapeEnum aBaseShapeType;
if(!getBase(aBaseShape, aBaseShapeType, aBase)) {
delete aPipeBuilder;
return;
}
if(aHasLocations) {
- GeomShapePtr aLocation = *aLocIt;
- if(!aLocation.get() || aLocation->shapeType() != GeomAPI_Shape::VERTEX) {
- delete aPipeBuilder;
- return;
- }
- TopoDS_Vertex aLocationVertex = aLocation->impl<TopoDS_Vertex>();
- ++aLocIt;
- aPipeBuilder->Add(aBaseShape, aLocationVertex);
+ aPipeBuilder->Add(aBaseShape, *aLocationsIt);
+ ++aLocationsIt;
} else {
aPipeBuilder->Add(aBaseShape);
}
this->initialize(aPipeBuilder);
// Checking result.
- if(anIsSolidNeeded) {
- if(aPipeBuilder->MakeSolid() == Standard_False) {
- return;
- }
+ if(anIsSolidNeeded && !aPipeBuilder->MakeSolid()) {
+ return;
}
TopoDS_Shape aResult = aPipeBuilder->Shape();
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);
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:
}
//==================================================================================================
-bool getPath(TopoDS_Wire& thePathOut,
- const GeomShapePtr thePathShape)
+bool getPath(TopoDS_Wire& thePathOut, const GeomShapePtr thePathShape)
{
if(!thePathShape.get()) {
return false;
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);
+ aTranslation.SetTranslation(aPntPath, aPntBase);
+ }
+
+ return aTranslation;
+}
+
//==================================================================================================
bool buildPipe(BRepOffsetAPI_MakePipeShell* thePipeBuilder)
{
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());
+ }
+}
