ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-30 13:50:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Bug 20423: fix Same Parameter after the chamfer operation.

Browse Source
This commit is contained in:
jfa 2009-09-18 09:34:25 +00:00
parent 52739f4c69
commit 1ba0a9935e
1 changed files with 107 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

195
src/GEOMImpl/GEOMImpl_ChamferDriver.cxx
View File

@ -18,20 +18,25 @@
// 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 <Standard_Stream.hxx> #include <Standard_Stream.hxx>
#include <GEOMImpl_ChamferDriver.hxx> #include <GEOMImpl_ChamferDriver.hxx>
#include <GEOMImpl_IChamfer.hxx> #include <GEOMImpl_IChamfer.hxx>
#include <GEOMImpl_Types.hxx> #include <GEOMImpl_Types.hxx>
#include <GEOMImpl_ILocalOperations.hxx> #include <GEOMImpl_ILocalOperations.hxx>
#include <GEOM_Function.hxx>
#include <GEOMImpl_Block6Explorer.hxx> #include <GEOMImpl_Block6Explorer.hxx>
#include <GEOM_Function.hxx>
#include <BRepLib.hxx>
#include <BRep_Tool.hxx> #include <BRep_Tool.hxx>
#include <BRepTools.hxx> #include <BRepTools.hxx>
#include <BRepFilletAPI_MakeChamfer.hxx> #include <BRepFilletAPI_MakeChamfer.hxx>
#include <ShapeFix_Shape.hxx>
#include <ShapeFix_ShapeTolerance.hxx>
#include <TopAbs.hxx> #include <TopAbs.hxx>
#include <TopoDS.hxx> #include <TopoDS.hxx>
#include <TopoDS_Edge.hxx> #include <TopoDS_Edge.hxx>
@ -133,46 +138,47 @@ Standard_Integer GEOMImpl_ChamferDriver::Execute(TFunction_Logbook& log) const
M.FindFromIndex(i).Extent() == 2) M.FindFromIndex(i).Extent() == 2)
fill.Add(aD, E, F); fill.Add(aD, E, F);
} }
}else if (aType == CHAMFER_SHAPE_EDGE || aType == CHAMFER_SHAPE_EDGE_AD) { }
else if (aType == CHAMFER_SHAPE_EDGE || aType == CHAMFER_SHAPE_EDGE_AD) {
// chamfer on edges, common to two faces, with D1 on the first face // chamfer on edges, common to two faces, with D1 on the first face
TopoDS_Shape aFace1, aFace2; TopoDS_Shape aFace1, aFace2;
if (GEOMImpl_ILocalOperations::GetSubShape(aShapeBase, aCI.GetFace1(), aFace1) && if (GEOMImpl_ILocalOperations::GetSubShape(aShapeBase, aCI.GetFace1(), aFace1) &&
GEOMImpl_ILocalOperations::GetSubShape(aShapeBase, aCI.GetFace2(), aFace2)) GEOMImpl_ILocalOperations::GetSubShape(aShapeBase, aCI.GetFace2(), aFace2))
{ {
TopoDS_Face F = TopoDS::Face(aFace1); TopoDS_Face F = TopoDS::Face(aFace1);
// fill map of edges of the second face // fill map of edges of the second face
TopTools_MapOfShape aMap; TopTools_MapOfShape aMap;
TopExp_Explorer Exp2 (aFace2, TopAbs_EDGE); TopExp_Explorer Exp2 (aFace2, TopAbs_EDGE);
for (; Exp2.More(); Exp2.Next()) { for (; Exp2.More(); Exp2.Next()) {
aMap.Add(Exp2.Current()); aMap.Add(Exp2.Current());
}
// find edges of the first face, common with the second face
TopExp_Explorer Exp (aFace1, TopAbs_EDGE);
for (; Exp.More(); Exp.Next()) {
if (aMap.Contains(Exp.Current())) {
TopoDS_Edge E = TopoDS::Edge(Exp.Current());
if (!BRepTools::IsReallyClosed(E, F) && !BRep_Tool::Degenerated(E))
{
if ( aType == CHAMFER_SHAPE_EDGE )
{
double aD1 = aCI.GetD1();
double aD2 = aCI.GetD2();
fill.Add(aD1, aD2, E, F);
}
else
{
double aD = aCI.GetD();
double anAngle = aCI.GetAngle();
if ( (anAngle > 0) && (anAngle < (Standard_PI/2)) )
fill.AddDA(aD, anAngle, E, F);
}
}
}
}
} }
// find edges of the first face, common with the second face
TopExp_Explorer Exp (aFace1, TopAbs_EDGE);
for (; Exp.More(); Exp.Next()) {
if (aMap.Contains(Exp.Current())) {
TopoDS_Edge E = TopoDS::Edge(Exp.Current());
if (!BRepTools::IsReallyClosed(E, F) && !BRep_Tool::Degenerated(E))
{
if ( aType == CHAMFER_SHAPE_EDGE )
{
double aD1 = aCI.GetD1();
double aD2 = aCI.GetD2();
fill.Add(aD1, aD2, E, F);
}
else
{
double aD = aCI.GetD();
double anAngle = aCI.GetAngle();
if ( (anAngle > 0) && (anAngle < (Standard_PI/2)) )
fill.AddDA(aD, anAngle, E, F);
}
}
}
}
}
} }
else if (aType == CHAMFER_SHAPE_FACES || aType == CHAMFER_SHAPE_FACES_AD) { else if (aType == CHAMFER_SHAPE_FACES || aType == CHAMFER_SHAPE_FACES_AD) {
// chamfer on all edges of the selected faces, with D1 on the selected face // chamfer on all edges of the selected faces, with D1 on the selected face
@ -187,35 +193,37 @@ Standard_Integer GEOMImpl_ChamferDriver::Execute(TFunction_Logbook& log) const
{ {
TopoDS_Shape aShapeFace; TopoDS_Shape aShapeFace;
if (GEOMImpl_ILocalOperations::GetSubShape(aShapeBase, aCI.GetFace(ind), aShapeFace)) if (GEOMImpl_ILocalOperations::GetSubShape(aShapeBase, aCI.GetFace(ind), aShapeFace))
{ {
TopoDS_Face F = TopoDS::Face(aShapeFace); TopoDS_Face F = TopoDS::Face(aShapeFace);
TopExp_Explorer Exp (F, TopAbs_EDGE); TopExp_Explorer Exp (F, TopAbs_EDGE);
for (; Exp.More(); Exp.Next()) { for (; Exp.More(); Exp.Next()) {
if (!aMap.Contains(Exp.Current())) if (!aMap.Contains(Exp.Current()))
{ {
TopoDS_Edge E = TopoDS::Edge(Exp.Current()); TopoDS_Edge E = TopoDS::Edge(Exp.Current());
if (!BRepTools::IsReallyClosed(E, F) && if (!BRepTools::IsReallyClosed(E, F) &&
!BRep_Tool::Degenerated(E) && !BRep_Tool::Degenerated(E) &&
M.FindFromKey(E).Extent() == 2) M.FindFromKey(E).Extent() == 2)
if (aType == CHAMFER_SHAPE_FACES) {
{ if (aType == CHAMFER_SHAPE_FACES)
double aD1 = aCI.GetD1(); {
double aD2 = aCI.GetD2(); double aD1 = aCI.GetD1();
fill.Add(aD1, aD2, E, F); double aD2 = aCI.GetD2();
} fill.Add(aD1, aD2, E, F);
else }
{ else
double aD = aCI.GetD(); {
double anAngle = aCI.GetAngle(); double aD = aCI.GetD();
if ( (anAngle > 0) && (anAngle < (Standard_PI/2)) ) double anAngle = aCI.GetAngle();
fill.AddDA(aD, anAngle, E, F); if ( (anAngle > 0) && (anAngle < (Standard_PI/2)) )
} fill.AddDA(aD, anAngle, E, F);
} }
} }
} }
}
}
} }
} }
else if (aType == CHAMFER_SHAPE_EDGES || aType == CHAMFER_SHAPE_EDGES_AD) else if (aType == CHAMFER_SHAPE_EDGES || aType == CHAMFER_SHAPE_EDGES_AD)
{ {
// chamfer on selected edges with lenght param D1 & D2. // chamfer on selected edges with lenght param D1 & D2.
@ -228,25 +236,25 @@ else if (aType == CHAMFER_SHAPE_EDGES || aType == CHAMFER_SHAPE_EDGES_AD)
{ {
TopoDS_Shape aShapeEdge; TopoDS_Shape aShapeEdge;
if (GEOMImpl_ILocalOperations::GetSubShape(aShapeBase, aCI.GetEdge(ind), aShapeEdge)) if (GEOMImpl_ILocalOperations::GetSubShape(aShapeBase, aCI.GetEdge(ind), aShapeEdge))
{ {
TopoDS_Edge E = TopoDS::Edge(aShapeEdge); TopoDS_Edge E = TopoDS::Edge(aShapeEdge);
const TopTools_ListOfShape& aFacesList = M.FindFromKey(E); const TopTools_ListOfShape& aFacesList = M.FindFromKey(E);
TopoDS_Face F = TopoDS::Face( aFacesList.First() ); TopoDS_Face F = TopoDS::Face( aFacesList.First() );
if (aType == CHAMFER_SHAPE_EDGES) if (aType == CHAMFER_SHAPE_EDGES)
{ {
double aD1 = aCI.GetD1(); double aD1 = aCI.GetD1();
double aD2 = aCI.GetD2(); double aD2 = aCI.GetD2();
fill.Add(aD1, aD2, E, F); fill.Add(aD1, aD2, E, F);
} }
else else
{ {
double aD = aCI.GetD(); double aD = aCI.GetD();
double anAngle = aCI.GetAngle(); double anAngle = aCI.GetAngle();
if ( (anAngle > 0) && (anAngle < (Standard_PI/2)) ) if ( (anAngle > 0) && (anAngle < (Standard_PI/2)) )
fill.AddDA(aD, anAngle, E, F); fill.AddDA(aD, anAngle, E, F);
} }
} }
} }
} }
else { else {
} }
@ -259,6 +267,17 @@ else if (aType == CHAMFER_SHAPE_EDGES || aType == CHAMFER_SHAPE_EDGES_AD)
if (aShape.IsNull()) return 0; if (aShape.IsNull()) return 0;
// reduce tolerances
ShapeFix_ShapeTolerance aSFT;
aSFT.LimitTolerance(aShape, Precision::Confusion(),
Precision::Confusion(), TopAbs_SHAPE);
Handle(ShapeFix_Shape) aSfs = new ShapeFix_Shape(aShape);
aSfs->Perform();
aShape = aSfs->Shape();
// fix SameParameter flag
BRepLib::SameParameter(aShape, 1.E-5, Standard_True);
aFunction->SetValue(aShape); aFunction->SetValue(aShape);
log.SetTouched(Label()); log.SetTouched(Label());
@ -284,10 +303,10 @@ Standard_EXPORT Handle_Standard_Type& GEOMImpl_ChamferDriver_Type_()
static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL}; static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
static Handle_Standard_Type _aType = new Standard_Type("GEOMImpl_ChamferDriver", static Handle_Standard_Type _aType = new Standard_Type("GEOMImpl_ChamferDriver",
sizeof(GEOMImpl_ChamferDriver), sizeof(GEOMImpl_ChamferDriver),
1, 1,
(Standard_Address)_Ancestors, (Standard_Address)_Ancestors,
(Standard_Address)NULL); (Standard_Address)NULL);
return _aType; return _aType;
} }
@ -306,5 +325,5 @@ const Handle(GEOMImpl_ChamferDriver) Handle(GEOMImpl_ChamferDriver)::DownCast(co
} }
} }
return _anOtherObject ; return _anOtherObject;
} }