-// Copyright (C) 2009 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// 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.
-//
-// 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.
+// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
//
-// 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
+// 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.
//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// 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 <Standard_Stream.hxx>
#include <GEOMImpl_IFillet1d.hxx>
#include <GEOMImpl_Types.hxx>
#include <GEOMImpl_ILocalOperations.hxx>
+#include <GEOMImpl_IShapesOperations.hxx>
#include <GEOM_Function.hxx>
#include <gp_Pln.hxx>
Handle(GEOM_Function) aRefShape = aCI.GetShape();
TopoDS_Shape aShape = aRefShape->GetValue();
+ if (aShape.IsNull())
+ return 0;
if (aShape.ShapeType() != TopAbs_WIRE)
Standard_ConstructionError::Raise("Wrong arguments: polyline as wire must be given");
double rad = aCI.GetR();
+ if ( rad < Precision::Confusion())
+ return 0;
+
// collect vertices for make fillet
TopTools_ListOfShape aVertexList;
+ TopTools_MapOfShape mapShape;
int aLen = aCI.GetLength();
- if ( aLen > 0 )
- {
+ if ( aLen > 0 ) {
for (int ind = 1; ind <= aLen; ind++) {
TopoDS_Shape aShapeVertex;
if (GEOMImpl_ILocalOperations::GetSubShape
- (aWire, aCI.GetVertex(ind), aShapeVertex))
- aVertexList.Append( aShapeVertex );
+ (aWire, aCI.GetVertex(ind), aShapeVertex))
+ if (mapShape.Add(aShapeVertex))
+ aVertexList.Append( aShapeVertex );
+ }
+ } else { // get all vertices from wire
+ TopExp_Explorer anExp( aWire, TopAbs_VERTEX );
+ for ( ; anExp.More(); anExp.Next() ) {
+ if (mapShape.Add(anExp.Current()))
+ aVertexList.Append( anExp.Current() );
}
- }
- else
- {
- // get all vertices from wire
- TopExp_Explorer anExp( aWire, TopAbs_VERTEX );
- for ( ; anExp.More(); anExp.Next() )
- aVertexList.Append( anExp.Current() );
}
if (aVertexList.IsEmpty())
Standard_ConstructionError::Raise("Invalid input no vertices to make fillet");
- bool res = false;
//INFO: this algorithm implemented in assumption that user can select both
// vertices of some edges to make fillet. In this case we should remember
// already modified initial edges to take care in next fillet step
TopTools_IndexedDataMapOfShapeListOfShape aMapVToEdges;
TopExp::MapShapesAndAncestors( aWire, TopAbs_VERTEX, TopAbs_EDGE, aMapVToEdges );
TopTools_ListIteratorOfListOfShape anIt( aVertexList );
- for ( ; anIt.More(); anIt.Next() )
- {
+ for ( ; anIt.More(); anIt.Next() ) {
TopoDS_Vertex aV = TopoDS::Vertex( anIt.Value() );
if ( aV.IsNull() || !aMapVToEdges.Contains( aV ) )
continue;
if (aNewE.IsNull())
continue; // no result found
- res |= true;
// add new created edges and take modified edges
aListOfNewEdge.Append( aNewE );
// check if face edges modified,
- // if yes, than map to original edges (from vertex-edges list), because edges can be modified before
- if (!aModifE1.IsNull() || !aModifE1.IsSame( anEdge1 ))
+ // if yes, than map to original edges (from vertex-edges list), because edges can be modified before
+ if (!aModifE1.IsNull() && !aModifE1.IsSame( anEdge1 ))
addEdgeRelation( anEdgeToEdgeMap, TopoDS::Edge(aVertexEdges.First()), aModifE1 );
- if (!aModifE2.IsNull() || !aModifE2.IsSame( anEdge2 ))
+ if (!aModifE2.IsNull() && !aModifE2.IsSame( anEdge2 ))
addEdgeRelation( anEdgeToEdgeMap, TopoDS::Edge(aVertexEdges.Last()), aModifE2 );
}
- if ( !res && anEdgeToEdgeMap.IsEmpty() && aListOfNewEdge.IsEmpty() )
- {
+ if ( anEdgeToEdgeMap.IsEmpty() && aListOfNewEdge.IsEmpty() ) {
StdFail_NotDone::Raise("1D Fillet can't be computed on the given shape with the given radius");
- return 0; // nothing done :(
+ return 0;
}
// create new wire instead of original
- for ( TopExp_Explorer anExp( aWire, TopAbs_EDGE ); anExp.More(); anExp.Next() )
- {
- TopoDS_Shape anEdge = anExp.Current();
+ for ( TopExp_Explorer anExp( aWire, TopAbs_EDGE ); anExp.More(); anExp.Next() ) {
+ TopoDS_Shape anEdge = anExp.Current();
if ( !anEdgeToEdgeMap.IsBound( anEdge ) )
aListOfNewEdge.Append( anEdge );
else
aListOfNewEdge.Append( anEdgeToEdgeMap.Find( anEdge ) );
}
+
+ GEOMImpl_IShapesOperations::SortShapes( aListOfNewEdge );
+
BRepBuilderAPI_MakeWire aWireTool;
aWireTool.Add( aListOfNewEdge );
aWireTool.Build();
static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
static Handle_Standard_Type _aType = new Standard_Type("GEOMImpl_Fillet1dDriver",
- sizeof(GEOMImpl_Fillet1dDriver),
- 1,
- (Standard_Address)_Ancestors,
- (Standard_Address)NULL);
+ sizeof(GEOMImpl_Fillet1dDriver),
+ 1,
+ (Standard_Address)_Ancestors,
+ (Standard_Address)NULL);
return _aType;
}
