Skip to content
Snippets Groups Projects
Commit 41dec6b1 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

Merge branch 'master' of http://gitlab.onelab.info/gmsh/gmsh

parents 43ecb5b8 131e4239
No related branches found
No related tags found
No related merge requests found
...@@ -2972,7 +2972,7 @@ void OCC_Internals::_healShape(TopoDS_Shape &myshape, double tolerance, ...@@ -2972,7 +2972,7 @@ void OCC_Internals::_healShape(TopoDS_Shape &myshape, double tolerance,
for(exp1.Init(myshape, TopAbs_EDGE); exp1.More(); exp1.Next()){ for(exp1.Init(myshape, TopAbs_EDGE); exp1.More(); exp1.Next()){
TopoDS_Edge edge = TopoDS::Edge(exp1.Current()); TopoDS_Edge edge = TopoDS::Edge(exp1.Current());
if(BRep_Tool::Degenerated(edge)) if(BRep_Tool::Degenerated(edge))
rebuild->Remove(edge, false); rebuild->Remove(edge);
} }
myshape = rebuild->Apply(myshape); myshape = rebuild->Apply(myshape);
} }
...@@ -3016,7 +3016,7 @@ void OCC_Internals::_healShape(TopoDS_Shape &myshape, double tolerance, ...@@ -3016,7 +3016,7 @@ void OCC_Internals::_healShape(TopoDS_Shape &myshape, double tolerance,
Msg::Info(" (natural bounds added)"); Msg::Info(" (natural bounds added)");
TopoDS_Face newface = sff->Face(); TopoDS_Face newface = sff->Face();
rebuild->Replace(face, newface, Standard_False); rebuild->Replace(face, newface);
} }
} }
myshape = rebuild->Apply(myshape); myshape = rebuild->Apply(myshape);
...@@ -3028,7 +3028,7 @@ void OCC_Internals::_healShape(TopoDS_Shape &myshape, double tolerance, ...@@ -3028,7 +3028,7 @@ void OCC_Internals::_healShape(TopoDS_Shape &myshape, double tolerance,
for(exp1.Init(myshape, TopAbs_EDGE); exp1.More(); exp1.Next()){ for(exp1.Init(myshape, TopAbs_EDGE); exp1.More(); exp1.Next()){
TopoDS_Edge edge = TopoDS::Edge(exp1.Current()); TopoDS_Edge edge = TopoDS::Edge(exp1.Current());
if(BRep_Tool::Degenerated(edge)) if(BRep_Tool::Degenerated(edge))
rebuild->Remove(edge, false); rebuild->Remove(edge);
} }
myshape = rebuild->Apply(myshape); myshape = rebuild->Apply(myshape);
} }
...@@ -3080,7 +3080,7 @@ void OCC_Internals::_healShape(TopoDS_Shape &myshape, double tolerance, ...@@ -3080,7 +3080,7 @@ void OCC_Internals::_healShape(TopoDS_Shape &myshape, double tolerance,
replace = sfw->FixLacking(Standard_True) || replace; replace = sfw->FixLacking(Standard_True) || replace;
if(replace){ if(replace){
TopoDS_Wire newwire = sfw->Wire(); TopoDS_Wire newwire = sfw->Wire();
rebuild->Replace(oldwire, newwire, Standard_False); rebuild->Replace(oldwire, newwire);
} }
} }
} }
...@@ -3108,7 +3108,7 @@ void OCC_Internals::_healShape(TopoDS_Shape &myshape, double tolerance, ...@@ -3108,7 +3108,7 @@ void OCC_Internals::_healShape(TopoDS_Shape &myshape, double tolerance,
Msg::Info(" removing degenerated edge %d from vertex %d to vertex %d", Msg::Info(" removing degenerated edge %d from vertex %d to vertex %d",
_emap.FindIndex(edge), _vmap.FindIndex(TopExp::FirstVertex(edge)), _emap.FindIndex(edge), _vmap.FindIndex(TopExp::FirstVertex(edge)),
_vmap.FindIndex(TopExp::LastVertex(edge))); _vmap.FindIndex(TopExp::LastVertex(edge)));
rebuild->Remove(edge, false); rebuild->Remove(edge);
} }
} }
} }
...@@ -3121,7 +3121,7 @@ void OCC_Internals::_healShape(TopoDS_Shape &myshape, double tolerance, ...@@ -3121,7 +3121,7 @@ void OCC_Internals::_healShape(TopoDS_Shape &myshape, double tolerance,
for(exp1.Init(myshape, TopAbs_EDGE); exp1.More(); exp1.Next()){ for(exp1.Init(myshape, TopAbs_EDGE); exp1.More(); exp1.Next()){
TopoDS_Edge edge = TopoDS::Edge(exp1.Current()); TopoDS_Edge edge = TopoDS::Edge(exp1.Current());
if(BRep_Tool::Degenerated(edge)) if(BRep_Tool::Degenerated(edge))
rebuild->Remove(edge, false); rebuild->Remove(edge);
} }
myshape = rebuild->Apply(myshape); myshape = rebuild->Apply(myshape);
} }
...@@ -3194,7 +3194,7 @@ void OCC_Internals::_healShape(TopoDS_Shape &myshape, double tolerance, ...@@ -3194,7 +3194,7 @@ void OCC_Internals::_healShape(TopoDS_Shape &myshape, double tolerance,
for(exp1.Init(myshape, TopAbs_EDGE); exp1.More(); exp1.Next()){ for(exp1.Init(myshape, TopAbs_EDGE); exp1.More(); exp1.Next()){
TopoDS_Edge edge = TopoDS::Edge(exp1.Current()); TopoDS_Edge edge = TopoDS::Edge(exp1.Current());
if(BRep_Tool::Degenerated(edge)) if(BRep_Tool::Degenerated(edge))
rebuild->Remove(edge, false); rebuild->Remove(edge);
} }
myshape = rebuild->Apply(myshape); myshape = rebuild->Apply(myshape);
} }
...@@ -3228,7 +3228,7 @@ void OCC_Internals::_healShape(TopoDS_Shape &myshape, double tolerance, ...@@ -3228,7 +3228,7 @@ void OCC_Internals::_healShape(TopoDS_Shape &myshape, double tolerance,
BRepLib::OrientClosedSolid(newsolid); BRepLib::OrientClosedSolid(newsolid);
Handle_ShapeBuild_ReShape rebuild = new ShapeBuild_ReShape; Handle_ShapeBuild_ReShape rebuild = new ShapeBuild_ReShape;
// rebuild->Apply(myshape); // rebuild->Apply(myshape);
rebuild->Replace(solid, newsolid, Standard_False); rebuild->Replace(solid, newsolid);
TopoDS_Shape newshape = rebuild->Apply(myshape, TopAbs_COMPSOLID);//, 1); TopoDS_Shape newshape = rebuild->Apply(myshape, TopAbs_COMPSOLID);//, 1);
// TopoDS_Shape newshape = rebuild->Apply(myshape); // TopoDS_Shape newshape = rebuild->Apply(myshape);
myshape = newshape; myshape = newshape;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment