//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-// File: BlockFix_CheckTool.cxx
-// Created: 17.12.04 11:15:25
-// Author: Sergey KUUL
-//
+// File: BlockFix_CheckTool.cxx
+// Created: 17.12.04 11:15:25
+// Author: Sergey KUUL
+
#include <BlockFix_CheckTool.ixx>
#include <BRep_Tool.hxx>
myNbUF=0;
myNbUE=0;
myNbUFUE=0;
- TopExp_Explorer exps;
- for(exps.Init(myShape, TopAbs_SOLID); exps.More(); exps.Next()) {
+
+ TopExp_Explorer exps (myShape, TopAbs_SOLID);
+ TopTools_MapOfShape mapS;
+ for (; exps.More(); exps.Next()) {
TopoDS_Solid aSolid = TopoDS::Solid(exps.Current());
+ if (!mapS.Add(aSolid)) continue;
myNbSolids++;
Standard_Boolean IsBlock=Standard_True;
Standard_Boolean MayBeUF=Standard_False;
Standard_Boolean MayBeUE=Standard_False;
Standard_Integer nf=0;
- TopExp_Explorer expf;
- for(expf.Init(aSolid, TopAbs_FACE); expf.More(); expf.Next()) nf++;
+ TopExp_Explorer expf (aSolid, TopAbs_FACE);
+ TopTools_MapOfShape mapF;
+ for (; expf.More(); expf.Next()) {
+ if (mapF.Add(expf.Current()))
+ nf++;
+ }
- if(nf<6) {
- IsBlock=Standard_False;
+ if (nf < 6) {
+ IsBlock = Standard_False;
}
- else if(nf>6) {
- IsBlock=Standard_False;
+ else if (nf > 6) {
+ IsBlock = Standard_False;
// check faces unification
TopTools_SequenceOfShape faces;
- for( expf.Init(aSolid, TopAbs_FACE); expf.More(); expf.Next()) {
- TopoDS_Face aFace = TopoDS::Face(expf.Current());
- faces.Append(aFace);
+ mapF.Clear();
+ for (expf.Init(aSolid, TopAbs_FACE); expf.More(); expf.Next()) {
+ if (mapF.Add(expf.Current())) {
+ TopoDS_Face aFace = TopoDS::Face(expf.Current());
+ faces.Append(aFace);
+ }
}
Standard_Boolean HasFacesForUnification = Standard_False;
- for(Standard_Integer i=1; i<faces.Length() && !HasFacesForUnification; i++) {
+ for (Standard_Integer i=1; i<faces.Length() && !HasFacesForUnification; i++) {
TopoDS_Face F1 = TopoDS::Face(faces.Value(i));
TopTools_MapOfShape Edges;
- for(TopExp_Explorer expe(F1,TopAbs_EDGE); expe.More(); expe.Next())
+ for (TopExp_Explorer expe(F1,TopAbs_EDGE); expe.More(); expe.Next())
Edges.Add(expe.Current().Oriented(TopAbs_FORWARD));
TopLoc_Location L1;
Handle(Geom_Surface) S1 = BRep_Tool::Surface(F1,L1);
}
}
}
- if(HasFacesForUnification) {
+ if (HasFacesForUnification) {
MayBeUF=Standard_True;
}
}
Standard_Integer nbe=0;
TopTools_MapOfShape DegenEdges;
- TopExp_Explorer expe;
- for(expe.Init(aSolid, TopAbs_EDGE); expe.More(); expe.Next()) {
+ TopExp_Explorer expe (aSolid, TopAbs_EDGE);
+ TopTools_MapOfShape mapE;
+ for (; expe.More(); expe.Next()) {
TopoDS_Edge E = TopoDS::Edge(expe.Current());
- if(BRep_Tool::Degenerated(E)) {
- if(!DegenEdges.Contains(E)) {
- DegenEdges.Add(E);
- }
+ if (!mapE.Add(E)) continue;
+ if (BRep_Tool::Degenerated(E)) {
+ DegenEdges.Add(E);
}
else {
nbe++;
}
}
- if( nbe==24 && DegenEdges.Extent()>0 ) {
- IsBlock=Standard_False;
+ if (nbe == 12 && DegenEdges.Extent() > 0) {
+ IsBlock = Standard_False;
myNbDegen++;
myPossibleBlocks.Append(aSolid);
continue;
}
- if(nbe<24)
- IsBlock=Standard_False;
- if(nbe>24) {
- IsBlock=Standard_False;
+ if (nbe < 12)
+ IsBlock = Standard_False;
+ if (nbe > 12) {
+ IsBlock = Standard_False;
// check edges unification
// creating map of edge faces
TopTools_IndexedDataMapOfShapeListOfShape aMapEdgeFaces;
TopExp::MapShapesAndAncestors(aSolid, TopAbs_EDGE, TopAbs_FACE, aMapEdgeFaces);
- for(expf.Init(aSolid, TopAbs_FACE); expf.More(); expf.Next()) {
+
+ mapF.Clear();
+ for (expf.Init(aSolid, TopAbs_FACE); expf.More(); expf.Next()) {
TopoDS_Face aFace = TopoDS::Face(expf.Current());
+ if (!mapF.Add(aFace)) continue;
TopTools_IndexedDataMapOfShapeListOfShape aMapFacesEdges;
- for(expe.Init(aFace,TopAbs_EDGE); expe.More(); expe.Next()) {
+
+ TopTools_MapOfShape mapEe;
+ for (expe.Init(aFace, TopAbs_EDGE); expe.More(); expe.Next()) {
TopoDS_Edge edge = TopoDS::Edge(expe.Current());
- if(!aMapEdgeFaces.Contains(edge)) continue;
+ if (!mapEe.Add(edge)) continue;
+ if (!aMapEdgeFaces.Contains(edge)) continue;
const TopTools_ListOfShape& aList = aMapEdgeFaces.FindFromKey(edge);
- TopTools_ListIteratorOfListOfShape anIter(aList);
- for( ; anIter.More(); anIter.Next()) {
+ TopTools_ListIteratorOfListOfShape anIter (aList);
+ for (; anIter.More(); anIter.Next()) {
TopoDS_Face face = TopoDS::Face(anIter.Value());
- if(face.IsSame(aFace)) continue;
- if(aMapFacesEdges.Contains(face)) {
+ if (face.IsSame(aFace)) continue;
+ if (aMapFacesEdges.Contains(face)) {
aMapFacesEdges.ChangeFromKey(face).Append(edge);
}
else {
}
}
}
- Standard_Integer i=1;
- for(; i<=aMapFacesEdges.Extent(); i++) {
+ Standard_Integer i = 1;
+ for (; i <= aMapFacesEdges.Extent(); i++) {
const TopTools_ListOfShape& ListEdges = aMapFacesEdges.FindFromIndex(i);
- if(ListEdges.Extent()>1) break;
+ if (ListEdges.Extent() > 1) break;
}
- if(i<=aMapFacesEdges.Extent()) {
- MayBeUE=Standard_True;
+ if (i <= aMapFacesEdges.Extent()) {
+ MayBeUE = Standard_True;
break;
}
}
}
- if(IsBlock)
+ if (IsBlock)
myNbBlocks++;
else {
- if(MayBeUF) {
+ if (MayBeUF) {
myPossibleBlocks.Append(aSolid);
- if(MayBeUE)
+ if (MayBeUE)
myNbUFUE++;
else
myNbUF++;
}
- else if(MayBeUE) {
+ else if (MayBeUE) {
myNbUE++;
myPossibleBlocks.Append(aSolid);
}
}
-
}
myHasCheck = Standard_True;
// processing each solid
TopExp_Explorer exps;
- for(exps.Init(Shape, TopAbs_SOLID); exps.More(); exps.Next()) {
+ for (exps.Init(Shape, TopAbs_SOLID); exps.More(); exps.Next()) {
TopoDS_Solid aSolid = TopoDS::Solid(exps.Current());
// creating map of edge faces
// map of processed shapes
TopTools_MapOfShape aProcessed;
-
+
Handle(ShapeBuild_ReShape) aContext = new ShapeBuild_ReShape;
- Standard_Integer NbModif=0;
+ Standard_Integer NbModif = 0;
Standard_Boolean hasFailed = Standard_False;
- Standard_Real tol = Min(Max(Precision::Confusion(), myTolerance/10.),0.1);
- // processing each face
+ Standard_Real tol = Min(Max(Precision::Confusion(), myTolerance/10.), 0.1);
+
+ // count faces
+ int nbf = 0;
TopExp_Explorer exp;
- //for( exp.Init(Shape, TopAbs_FACE); exp.More(); exp.Next()) {
- for( exp.Init(aSolid, TopAbs_FACE); exp.More(); exp.Next()) {
+ TopTools_MapOfShape mapF;
+ for (exp.Init(aSolid, TopAbs_FACE); exp.More(); exp.Next()) {
+ if (mapF.Add(exp.Current()))
+ nbf++;
+ }
+
+ // processing each face
+ mapF.Clear();
+ for (exp.Init(aSolid, TopAbs_FACE); exp.More() && nbf > 6; exp.Next()) {
TopoDS_Face aFace = TopoDS::Face(exp.Current().Oriented(TopAbs_FORWARD));
-
- if(aProcessed.Contains(aFace))
+
+ if (aProcessed.Contains(aFace))
continue;
-
+
Standard_Integer dummy;
TopTools_SequenceOfShape edges;
AddOrdinaryEdges(edges,aFace,dummy);
-
+
TopTools_SequenceOfShape faces;
faces.Append(aFace);
-
+
//surface and location to construct result
TopLoc_Location aBaseLocation;
Handle(Geom_Surface) aBaseSurface = BRep_Tool::Surface(aFace,aBaseLocation);
// find adjacent faces to union
Standard_Integer i;
- for( i = 1; i <= edges.Length(); i++) {
+ for (i = 1; i <= edges.Length(); i++) {
TopoDS_Edge edge = TopoDS::Edge(edges(i));
- if(BRep_Tool::Degenerated(edge))
+ if (BRep_Tool::Degenerated(edge))
continue;
const TopTools_ListOfShape& aList = aMapEdgeFaces.FindFromKey(edge);
TopTools_ListIteratorOfListOfShape anIter(aList);
- for( ; anIter.More(); anIter.Next()) {
+ for (; anIter.More(); anIter.Next()) {
TopoDS_Face anCheckedFace = TopoDS::Face(anIter.Value().Oriented(TopAbs_FORWARD));
- if(anCheckedFace.IsSame(aFace))
+ if (anCheckedFace.IsSame(aFace))
continue;
- if(aProcessed.Contains(anCheckedFace))
+ if (aProcessed.Contains(anCheckedFace))
continue;
- if(IsSameDomain(aFace,anCheckedFace)) {
+ if (IsSameDomain(aFace,anCheckedFace)) {
- if(aList.Extent() != 2) {
+ if (aList.Extent() != 2) {
// non mainfold case is not processed
continue;
}
B.MakeFace(aMockUpFace,aBaseSurface,aBaseLocation,0.);
MovePCurves(aMockUpFace,anCheckedFace);
- if(AddOrdinaryEdges(edges,aMockUpFace,dummy)) {
+ if (AddOrdinaryEdges(edges,aMockUpFace,dummy)) {
// sequence edges is modified
i = dummy;
}
}
// all faces collected in the sequence. Perform union of faces
- if(faces.Length() > 1) {
+ if (faces.Length() > 1) {
NbModif++;
TopoDS_Face aResult;
BRep_Builder B;
Standard_Integer nbWires = 0;
// connecting wires
- while(edges.Length()>0) {
+ while (edges.Length()>0) {
Standard_Boolean isEdge3d = Standard_False;
nbWires++;
B.Add(aW,E);
B.Add(aResult,aW);
}
-
}
-
+
// perform substitution of face
aContext->Replace(aContext->Apply(aFace),aResult);
-
-
+
ShapeFix_Face sff (aResult);
//Intializing by tolerances
sff.SetPrecision(myTolerance);
// breaking down to several faces
TopoDS_Shape theResult = aContext->Apply(aResult);
- for(TopExp_Explorer aFaceExp(theResult,TopAbs_FACE);aFaceExp.More();aFaceExp.Next()) {
+ for (TopExp_Explorer aFaceExp (theResult,TopAbs_FACE); aFaceExp.More(); aFaceExp.Next()) {
TopoDS_Face aCurrent = TopoDS::Face(aFaceExp.Current().Oriented(TopAbs_FORWARD));
Handle(TColGeom_HArray2OfSurface) grid = new TColGeom_HArray2OfSurface ( 1, 1, 1, 1 );
grid->SetValue ( 1, 1, aBaseSurface );
for(i = 2; i <= faces.Length(); i++)
aContext->Remove(faces(i));
}
- }
-
+ } // end processing each face
+
//TopoDS_Shape aResult = Shape;
- if(NbModif>0) {
- TopoDS_Shape aResult = aSolid;
- if(!hasFailed) {
- aResult = aContext->Apply(aSolid);
-
- ShapeFix_Edge sfe;
- for(exp.Init(aResult,TopAbs_EDGE); exp.More(); exp.Next()) {
- TopoDS_Edge E = TopoDS::Edge(exp.Current());
- sfe.FixVertexTolerance (E);
- // ptv add fix same parameter
- sfe.FixSameParameter(E, myTolerance);
- }
-
- myContext->Replace(aSolid,aResult);
+ if (NbModif > 0 && !hasFailed) {
+ TopoDS_Shape aResult = aContext->Apply(aSolid);
+
+ ShapeFix_Edge sfe;
+ for (exp.Init(aResult,TopAbs_EDGE); exp.More(); exp.Next()) {
+ TopoDS_Edge E = TopoDS::Edge(exp.Current());
+ sfe.FixVertexTolerance (E);
+ // ptv add fix same parameter
+ sfe.FixSameParameter(E, myTolerance);
}
+
+ myContext->Replace(aSolid, aResult);
}
-// else {
- for( exp.Init(aSolid, TopAbs_FACE); exp.More(); exp.Next()) {
+ //else
+ {
+ for (exp.Init(aSolid, TopAbs_FACE); exp.More(); exp.Next()) {
TopoDS_Face aFace = TopoDS::Face(exp.Current().Oriented(TopAbs_FORWARD));
Handle(ShapeFix_Wire) sfw = new ShapeFix_Wire;
sfw->SetContext(myContext);
sfw->SetMinTolerance(myTolerance);
sfw->SetMaxTolerance(Max(1.,myTolerance*1000.));
sfw->SetFace(aFace);
- for ( TopoDS_Iterator iter(aFace,Standard_False); iter.More(); iter.Next()) {
- TopoDS_Wire wire = TopoDS::Wire ( iter.Value() );
+ for (TopoDS_Iterator iter (aFace,Standard_False); iter.More(); iter.Next()) {
+ TopoDS_Wire wire = TopoDS::Wire(iter.Value());
sfw->Load(wire);
sfw->FixReorder();
sfw->FixShifted();
}
}
-// }
-
+ }
} // end processing each solid
aResShape = myContext->Apply(Shape);
