OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0025202: Incorrect value of IsClosed flag in shapes produced by some algorithms

Browse Source 
Method BRep_Tool::IsClosed() extended to analyze closure of wires in addition to shells and solids.
External and Internal edges and vertices are ignored in this check.
Analysis of compounds is disabled.

Update of flag Closed according to actual state is added in most places where new shells are constructed.

Draw-command and test case for issue CR25202
This commit is contained in:
abv 2014-10-08 18:52:07 +04:00 committed by bugmaster
parent 2bc75a1bce
commit ab860031bd
53 changed files with 330 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/AIS/AIS_ColoredShape.cxx
View File

@ -369,6 +369,7 @@ Standard_Boolean AIS_ColoredShape::dispatchColors (const TopoDS_Shape& th
// iterate on sub-shapes
BRep_Builder aBBuilder;
TopoDS_Shape aShapeCopy = theSubshapeToParse.EmptyCopied();
aShapeCopy.Closed (theSubshapeToParse.Closed());
Standard_Boolean isSubOverride = Standard_False;
Standard_Integer nbDef = 0;
for (TopoDS_Iterator it (theSubshapeToParse); it.More(); it.Next())

2
src/BOPAlgo/BOPAlgo_BuilderSolid.cxx
View File

@ -559,6 +559,7 @@ void BOPAlgo_BuilderSolid::PerformLoops()
}
}
}
aShell.Closed (BRep_Tool::IsClosed (aShell));
myLoopsInternal.Append(aShell);
}
}
@ -1018,6 +1019,7 @@ void MakeInternalShells(const BOPCol_MapOfShape& theMF,
}
}
}
aShell.Closed (BRep_Tool::IsClosed (aShell));
theShells.Append(aShell);
}
}

1
src/BOPAlgo/BOPAlgo_Builder_3.cxx
View File

@ -475,6 +475,7 @@ void BOPAlgo_Builder::BuildDraftSolid(const TopoDS_Shape& theSolid,
} //for (; aIt2.More(); aIt2.Next()) {
//
if (iFlag) {
aShD.Closed (BRep_Tool::IsClosed (aShD));
aBB.Add(theDraftSolid, aShD);
}
} //for (; aIt1.More(); aIt1.Next()) {

58
src/BOPAlgo/BOPAlgo_ShellSplitter.cxx
View File

@ -38,9 +38,6 @@
#include <BOPTools_AlgoTools.hxx>
#include <BOPTools_CoupleOfShape.hxx>
//
static
Standard_Boolean IsClosedShell(const TopoDS_Shell& );
//
static
void MakeShell(const BOPCol_ListOfShape& ,
@ -444,12 +441,14 @@ void BOPAlgo_ShellSplitter::SplitBlock(BOPTools_ConnexityBlock& aCB)
} // for (; aExp.More(); aExp.Next()) {
} // for (; aItS.More(); aItS.Next()) {
//
if (IsClosedShell(aShell)) {
if (BRep_Tool::IsClosed(aShell)) {
aShell.Closed (Standard_True);
myLoops.Append(aShell);
}
else {
RefineShell(aShell);
if (IsClosedShell(aShell)) {
if (BRep_Tool::IsClosed(aShell)) {
aShell.Closed (Standard_True);
myLoops.Append(aShell);
}
}
@ -556,48 +555,7 @@ void RefineShell(TopoDS_Shell& theShell)
aBB.Remove(theShell, aFB);
}
}
//=======================================================================
//function : IsClosedShell
//purpose :
//=======================================================================
Standard_Boolean IsClosedShell(const TopoDS_Shell& theShell)
{
Standard_Integer i, aNbE;
Standard_Boolean bRet;
TopoDS_Iterator aIt;
TopExp_Explorer aExp;
BOPCol_MapOfShape aM;
//
bRet=Standard_False;
//
aIt.Initialize(theShell);
for(i=0; aIt.More(); aIt.Next(), ++i) {
const TopoDS_Shape& aF=aIt.Value();
//
aExp.Init(aF, TopAbs_EDGE);
for (; aExp.More(); aExp.Next()) {
const TopoDS_Edge& aE=(*(TopoDS_Edge*)(&aExp.Current()));
if (BRep_Tool::Degenerated(aE)) {
continue;
}
//
if (aE.Orientation()==TopAbs_INTERNAL) {
continue;
}
if (!aM.Add(aE)) {
aM.Remove(aE);
}
}
}
//
if(i) {
aNbE=aM.Extent();
if (!aNbE) {
bRet=!bRet;
}
}
return bRet;
}
//=======================================================================
//function : MakeShells
//purpose :
@ -622,7 +580,7 @@ void BOPAlgo_ShellSplitter::MakeShells()
//
const BOPCol_ListOfShape& aLF=aCB.Shapes();
MakeShell(aLF, aShell);
aShell.TShape()->Closed(Standard_True);
aShell.Closed(Standard_True);
myShells.Append(aShell);
}
else {
@ -641,8 +599,8 @@ void BOPAlgo_ShellSplitter::MakeShells()
const BOPCol_ListOfShape& aLS=aCB.Loops();
aIt.Initialize(aLS);
for (; aIt.More(); aIt.Next()) {
const TopoDS_Shape& aShell=aIt.Value();
aShell.TShape()->Closed(Standard_True);
TopoDS_Shape& aShell=aIt.ChangeValue();
aShell.Closed(Standard_True);
myShells.Append(aShell);
}
}

10
src/BRep/BRep_Tool.cdl
View File

@ -53,10 +53,10 @@ is
-----------------------------------------------------------
-----------------------------------------------------------
IsClosed (myclass; S : Shape from TopoDS) returns Boolean from Standard;
---Purpose: Returns <True> if S if flaged Closed, if S is a
-- Solid,Shell or Compound returns <True> is S has no free boundaries.
---Purpose: If S is Solid or Shell, returns True if it has no free boundaries (edges).
-- If S is Wire, returns True if it has no free ends (vertices).
-- (Internal and External sub-shepes are ignored in this check.)
-- For other shape types returns S.Closed().
-----------------------------------------------------------
-----------------------------------------------------------
@ -603,7 +603,5 @@ is
raises
NullObject from Standard;
end Tool;

45
src/BRep/BRep_Tool.cxx
View File

@ -32,6 +32,7 @@
#include <BRep_PolygonOnClosedTriangulation.hxx>
#include <TopoDS.hxx>
#include <TopoDS_Iterator.hxx>
#include <TopoDS_Wire.hxx>
#include <TopExp_Explorer.hxx>
#include <TopExp.hxx>
#include <TopTools_MapOfShape.hxx>
@ -52,6 +53,10 @@
#include <Poly_Polygon2D.hxx>
#include <Poly_PolygonOnTriangulation.hxx>
#include <NCollection_Map.hxx>
#include <NCollection_IncAllocator.hxx>
#include <TopTools_ShapeMapHasher.hxx>
//modified by NIZNHY-PKV Fri Oct 17 14:13:29 2008f
static
Standard_Boolean IsPlane(const Handle(Geom_Surface)& aS);
@ -1446,24 +1451,37 @@ gp_Pnt2d BRep_Tool::Parameters(const TopoDS_Vertex& V,
}
//=======================================================================
//function : IsClosed
//purpose : Returns <True> if S if flaged Closed, if S is a
// Solid,Shell or Compound returns <True> is S has no free boundaries.
//purpose :
//=======================================================================
Standard_Boolean BRep_Tool::IsClosed(const TopoDS_Shape& S)
Standard_Boolean BRep_Tool::IsClosed (const TopoDS_Shape& theShape)
{
if (S.ShapeType() == TopAbs_SHELL || S.ShapeType() == TopAbs_SOLID ||
S.ShapeType() == TopAbs_COMPOUND) {
TopTools_MapOfShape M;
TopExp_Explorer exp;
for (exp.Init(S,TopAbs_EDGE); exp.More(); exp.Next()) {
// for (TopExp_Explorer exp(S,TopAbs_EDGE); exp.More(); exp.Next()) {
if (theShape.ShapeType() == TopAbs_SHELL || theShape.ShapeType() == TopAbs_SOLID)
{
NCollection_Map<TopoDS_Shape, TopTools_ShapeMapHasher> aMap (101, new NCollection_IncAllocator);
for (TopExp_Explorer exp (theShape, TopAbs_EDGE); exp.More(); exp.Next())
{
const TopoDS_Edge& E = TopoDS::Edge(exp.Current());
if (BRep_Tool::Degenerated(E)) continue;
if (!M.Add(E)) M.Remove(E);
if (BRep_Tool::Degenerated(E) || E.Orientation() == TopAbs_INTERNAL || E.Orientation() == TopAbs_EXTERNAL)
continue;
if (!aMap.Add(E))
aMap.Remove(E);
}
if ( M.IsEmpty()) return 1;
return aMap.IsEmpty();
}
return (S.Closed());
else if (theShape.ShapeType() == TopAbs_WIRE)
{
NCollection_Map<TopoDS_Shape, TopTools_ShapeMapHasher> aMap (101, new NCollection_IncAllocator);
for (TopExp_Explorer exp (theShape, TopAbs_VERTEX); exp.More(); exp.Next())
{
const TopoDS_Shape& V = exp.Current();
if (V.Orientation() == TopAbs_INTERNAL || V.Orientation() == TopAbs_EXTERNAL)
continue;
if (!aMap.Add(V))
aMap.Remove(V);
}
return aMap.IsEmpty();
}
return theShape.Closed();
}
//modified by NIZNHY-PKV Fri Oct 17 14:09:58 2008 f
@ -1495,3 +1513,4 @@ Standard_Boolean IsPlane(const Handle(Geom_Surface)& aS)
//
return bRet;
}

3
src/BRepAlgo/BRepAlgo_Loop.cxx
View File

@ -658,7 +658,10 @@ void BRepAlgo_Loop::Perform()
}
if (VF.IsSame(CV) && SamePnt2d(VF,EF,CE,myFace))
{
NW.Closed (Standard_True);
myNewWires.Append (NW);
}
#ifdef DEBUG_ALGO
else {
cout <<"BRepAlgo_Loop: Open Wire"<<endl;

9
src/BRepCheck/BRepCheck_Shell.cxx
View File

@ -919,10 +919,11 @@ Standard_Integer BRepCheck_Shell::NbConnectedSet(TopTools_ListOfShape& theSets)
}
}
if (!newCur) {
theSets.Append(CurShell);
CurShell.Nullify();
newCur=Standard_True;
BRB.MakeShell(CurShell);
CurShell.Closed (BRep_Tool::IsClosed (CurShell));
theSets.Append(CurShell);
CurShell.Nullify();
newCur=Standard_True;
BRB.MakeShell(CurShell);
}
}
if (theFaces.IsEmpty()) break;

2
src/BRepFeat/BRepFeat_MakeLinearForm.cxx
View File

@ -707,6 +707,7 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase,
if(Sliding) {
TopoDS_Face F;
BB.MakeFace(F, myPln, myTol);
w.Closed (BRep_Tool::IsClosed (w));
BB.Add(F, w);
// BRepLib_MakeFace F(myPln->Pln(),w, Standard_True);
mySkface = F;
@ -768,6 +769,7 @@ void BRepFeat_MakeLinearForm::Init(const TopoDS_Shape& Sbase,
for(; it.More(); it.Next()) {
BB.Add(comp, it.Value());
}
comp.Closed (BRep_Tool::IsClosed (comp));
mySUntil = comp;

3
src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx
View File

@ -831,6 +831,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
if(Sliding) {
TopoDS_Face F;
BB.MakeFace(F, myPln, myTol);
w.Closed (BRep_Tool::IsClosed (w));
BB.Add(F, w);
mySkface = F;
myPbase = mySkface;
@ -914,6 +915,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
break;
}
}
Wiwiwi.Closed (BRep_Tool::IsClosed (Wiwiwi));
BRepLib_MakeFace newbndface(myPln->Pln(), Wiwiwi, Standard_True);
TopoDS_Face NewBndFace = TopoDS::Face(newbndface.Shape());
@ -993,6 +995,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase,
for(; it.More(); it.Next()) {
BB.Add(comp, it.Value());
}
comp.Closed (BRep_Tool::IsClosed (comp));
mySUntil = comp;

1
src/BRepFeat/BRepFeat_RibSlot.cxx
View File

@ -2297,6 +2297,7 @@ Standard_Boolean BRepFeat_RibSlot::NoSlidingProfile(TopoDS_Face& Prof,
BB.Add(w, e);
}
w.Closed (BRep_Tool::IsClosed (w));
BRepLib_MakeFace fa(myPln->Pln(), w, Standard_True);
TopoDS_Face fac = TopoDS::Face(fa.Shape());

4
src/BRepFill/BRepFill.cxx
View File

@ -122,6 +122,7 @@ static void MakeWire(const TopTools_Array1OfShape& Edges,
}
}
newwire.Orientation(TopAbs_FORWARD);
newwire.Closed (Standard_True);
}
static void CutEdge(const TopoDS_Edge& CurrentEdge,
@ -349,6 +350,7 @@ TopoDS_Face BRepFill::Face(const TopoDS_Edge& Edge1,
B.Add(W,Edge4);
B.Add(W,Edge2.Reversed());
B.Add(W,Edge3);
W.Closed (Standard_True);
B.Add(Face,W);
@ -562,6 +564,7 @@ TopoDS_Shell BRepFill::Shell(const TopoDS_Wire& Wire1,
B.Add(W,Edge4);
B.Add(W,Edge2.Reversed());
B.Add(W,Edge3);
W.Closed (Standard_True);
B.Add(Face,W);
@ -617,6 +620,7 @@ TopoDS_Shell BRepFill::Shell(const TopoDS_Wire& Wire1,
B.SameRange(Edge4,Standard_False);
}
Shell.Closed (BRep_Tool::IsClosed (Shell));
BRepLib::SameParameter(Shell);
return Shell;
}

1
src/BRepFill/BRepFill_Draft.cxx
View File

@ -616,6 +616,7 @@ static Standard_Boolean GoodOrientation(const Bnd_Box& B,
TopoDS_Shell S;
B.MakeShell(S);
B.Add(S, StopShape);
S.Closed (BRep_Tool::IsClosed (S));
B.MakeSolid(Sol2);
B.Add(Sol2, S); // shell => solid (for fusion)
break;

4
src/BRepFill/BRepFill_Generator.cxx
View File

@ -381,14 +381,10 @@ void CreateKPart(const TopoDS_Edge& Edge1,const TopoDS_Edge& Edge2,
}
// create the new surface
TopoDS_Shell shell;
TopoDS_Face face;
TopoDS_Wire W;
TopoDS_Edge edge1, edge2, edge3, edge4, couture;
BRep_Builder B;
B.MakeShell(shell);
TopoDS_Wire newW1, newW2;
BRep_Builder BW1, BW2;
BW1.MakeWire(newW1);

2
src/BRepFill/BRepFill_Pipe.cxx
View File

@ -589,6 +589,7 @@ TopoDS_Shape BRepFill_Pipe::MakeShape(const TopoDS_Shape& S,
W.Closed(LastShape.Closed());
TheLast = W;
}
result.Closed (BRep_Tool::IsClosed (result));
break;
}
@ -603,6 +604,7 @@ TopoDS_Shape BRepFill_Pipe::MakeShape(const TopoDS_Shape& S,
if ( !mySpine.Closed() && !TheFirst.IsNull()) {
B.Add(result, TheFirst.Reversed());
}
result.Closed (BRep_Tool::IsClosed (result));
break;
}

1
src/BRepFill/BRepFill_TrimShellCorner.cxx
View File

@ -285,6 +285,7 @@ void BRepFill_TrimShellCorner::Perform()
for(ii = myFaces->LowerRow(); ii <= myFaces->UpperRow(); ii++) {
aBB.Add(aShell, myFaces->Value(ii, jj));
}
aShell.Closed (BRep_Tool::IsClosed (aShell));
if(jj == myFaces->LowerCol()) {
myShape1 = aShell;

1
src/BRepLib/BRepLib_MakeShell.cxx
View File

@ -353,6 +353,7 @@ void BRepLib_MakeShell::Init(const Handle(Geom_Surface)& S,
// codage des courbes 3d et regularites.
BRepLib::BuildCurves3d(myShape,tol);
BRepLib::EncodeRegularity(myShape);
myShape.Closed (BRep_Tool::IsClosed (myShape));
myError = BRepLib_ShellDone;
Done();

1
src/BRepLib/BRepLib_MakeSolid.cxx
View File

@ -63,6 +63,7 @@ BRepLib_MakeSolid::BRepLib_MakeSolid(const TopoDS_CompSolid& S)
for(; aFaceIter.More(); aFaceIter.Next()) {
B.Add(aShell, aFaceIter.Key());
}
aShell.Closed (BRep_Tool::IsClosed (aShell));
B.Add(myShape,aShell);

1
src/BRepPrim/BRepPrim_GWedge.cxx
View File

@ -318,6 +318,7 @@ const TopoDS_Shell& BRepPrim_GWedge::Shell() {
if (HasFace(BRepPrim_ZMax))
myBuilder.AddShellFace(myShell,Face(BRepPrim_ZMax));
myShell.Closed (BRep_Tool::IsClosed (myShell));
myBuilder.CompleteShell(myShell);
ShellBuilt = Standard_True;
}

1
src/BRepPrim/BRepPrim_OneAxis.cxx
View File

@ -291,6 +291,7 @@ const TopoDS_Shell& BRepPrim_OneAxis::Shell()
myBuilder.AddShellFace(myShell,EndFace());
}
myShell.Closed (BRep_Tool::IsClosed (myShell));
myBuilder.CompleteShell(myShell);
ShellBuilt = Standard_True;
}

2
src/BRepSweep/BRepSweep_NumLinearRegularSweep.cxx
View File

@ -337,6 +337,7 @@ TopoDS_Shape BRepSweep_NumLinearRegularSweep::Shape (const TopoDS_Shape& aGenS,
SetContinuity(aGenS,aDirS);
}
if (aGenSType==TopAbs_FACE){
newShell.Closed (BRep_Tool::IsClosed (newShell));
TopoDS_Shape temp = SplitShell(newShell);
TopAbs_Orientation Or = DirectSolid(aGenS,aDirS);
Lt.Init(temp);
@ -392,6 +393,7 @@ TopoDS_Shape BRepSweep_NumLinearRegularSweep::Shape (const TopoDS_Shape& aGenS,
}
myBuiltShapes(iGenS,iDirS) = Standard_True;
}
myShapes(iGenS,iDirS).Closed (BRep_Tool::IsClosed (myShapes(iGenS,iDirS)));
return myShapes(iGenS,iDirS);
}

4
src/BRepTest/BRepTest_FeatureCommands.cxx
View File

@ -433,6 +433,7 @@ static Standard_Integer PRW(Draw_Interpretor& theCommands,
for (it.Initialize(lleft);it.More();it.Next()) {
B.Add(Sh,TopoDS::Face(it.Value()));
}
Sh.Closed (BRep_Tool::IsClosed (Sh));
thePFace.Init(S,Sh,F,V,fuse,Standard_True);
ToPrism = Sh;
}
@ -590,6 +591,7 @@ static Standard_Integer PRF(Draw_Interpretor& theCommands,
B.Add(She,F);
}
}
She.Closed (BRep_Tool::IsClosed (She));
thePFace.Init(S,She,TopoDS_Face(),V,fuse,Standard_False);
ToPrism = She;
}
@ -1197,6 +1199,7 @@ static Standard_Integer ROW(Draw_Interpretor& theCommands,
for (it.Initialize(lleft);it.More();it.Next()) {
B.Add(Sh,TopoDS::Face(it.Value()));
}
Sh.Closed (BRep_Tool::IsClosed (Sh));
theRFace.Init(S,Sh,F,theAxis,fuse,Standard_True);
ToRotate = Sh;
}
@ -1341,6 +1344,7 @@ static Standard_Integer ROF(Draw_Interpretor& theCommands,
B.Add(She,F);
}
}
She.Closed (BRep_Tool::IsClosed (She));
theRFace.Init(S,She,TopoDS_Face(),theAxis,fuse,Standard_False);
ToRotate = She;
}

15
src/BRepTools/BRepTools_ReShape.cxx
View File

@ -371,9 +371,14 @@ TopoDS_Shape BRepTools_ReShape::Apply (const TopoDS_Shape& shape,
B.Add (S,newsh);
}
}
if ( (modif < 0 && buildmode < 2) || (modif == 0 && buildmode < 1) )
return C;
else return S;
else
{
S.Closed (BRep_Tool::IsClosed (S));
return S;
}
}
if (st == TopAbs_SHELL) {
@ -406,7 +411,11 @@ TopoDS_Shape BRepTools_ReShape::Apply (const TopoDS_Shape& shape,
}
if ( (modif < 0 && buildmode < 2) || (modif == 0 && buildmode < 1) )
return C;
else return S;
else
{
S.Closed (BRep_Tool::IsClosed (S));
return S;
}
}
cout<<"BRepTools_ReShape::Apply NOT YET IMPLEMENTED"<<endl;
return shape;
@ -543,8 +552,10 @@ TopoDS_Shape BRepTools_ReShape::Apply (const TopoDS_Shape& shape,
}
result.Orientation(orien);
result.Closed (BRep_Tool::IsClosed (result));
myStatus = locStatus;
Replace ( shape, result );
return result;
}

3
src/DBRep/DBRep.cxx
View File

@ -688,8 +688,9 @@ static Standard_Integer invert(Draw_Interpretor& ,
BRep_Builder B;
TopoDS_Shape NS = S.EmptyCopied();
TopoDS_Iterator itr(S);
NS.Closed (S.Closed());
TopoDS_Iterator itr(S);
while (itr.More()) {
B.Add(NS,itr.Value().Reversed());
itr.Next();

1
src/LocOpe/LocOpe_BuildShape.cxx
View File

@ -150,6 +150,7 @@ void LocOpe_BuildShape::Perform(const TopTools_ListOfShape& L)
B.Add(newSh,FaceRef);
Propagate(FaceRef,newSh,mapF,mapIf);
}
newSh.Closed (BRep_Tool::IsClosed (newSh));
if (!Manifold) {
lshell.Append(newSh.Oriented(TopAbs_INTERNAL));
}

1
src/LocOpe/LocOpe_SplitShape.cxx
View File

@ -1233,6 +1233,7 @@ Standard_Boolean LocOpe_SplitShape::Rebuild(const TopoDS_Shape& S)
B.Add(result,itr.Value().Oriented(orient));
}
}
result.Closed (BRep_Tool::IsClosed(result));
myMap(S).Append(result);
}
else {

1
src/QABugs/QABugs_13.cxx
View File

@ -301,6 +301,7 @@ static Standard_Integer OCC332bug (Draw_Interpretor& di, Standard_Integer argc,
B.Add(TubeShell,Face1.Reversed());
B.Add(TubeShell,Face2);
TubeShell.Closed (BRep_Tool::IsClosed (TubeShell));
B.MakeSolid(wallSolid);
B.Add(wallSolid,TubeShell);

1
src/QABugs/QABugs_14.cxx
View File

@ -260,6 +260,7 @@ static Standard_Integer BUC60854 (Draw_Interpretor& /*di*/, Standard_Integer arg
BB.MakeShell(TopoDS::Shell(aShell));
TopTools_ListIteratorOfListOfShape anIter(aLeftPart);
for(; anIter.More(); anIter.Next()) BB.Add(aShell, anIter.Value());
aShell.Closed (BRep_Tool::IsClosed (aShell));
DBRep::Set(argv[1],aShell);
return 0;
}

84
src/QABugs/QABugs_19.cxx
View File

@ -2778,6 +2778,89 @@ static Standard_Integer OCC23010 (Draw_Interpretor& di, Standard_Integer argc, c
return 0;
}
//=======================================================================
//function : OCC25202
//purpose :
//=======================================================================
#include <ShapeBuild_ReShape.hxx>
static Standard_Integer OCC25202 ( Draw_Interpretor& theDI,
Standard_Integer theArgN,
const char** theArgVal)
{
// 0 1 2 3 4 5 6
//reshape res shape numF1 face1 numF2 face2
if(theArgN < 7)
{
theDI << "Use: reshape res shape numF1 face1 numF2 face2\n";
return 1;
}
TopoDS_Shape aShape = DBRep::Get(theArgVal[2]);
const Standard_Integer aNumOfRE1 = Draw::Atoi(theArgVal[3]),
aNumOfRE2 = Draw::Atoi(theArgVal[5]);
TopoDS_Face aShapeForRepl1 = TopoDS::Face(DBRep::Get(theArgVal[4])),
aShapeForRepl2 = TopoDS::Face(DBRep::Get(theArgVal[6]));
if(aShape.IsNull())
{
theDI << theArgVal[2] << " is null shape\n";
return 1;
}
if(aShapeForRepl1.IsNull())
{
theDI << theArgVal[4] << " is not a replaced type\n";
return 1;
}
if(aShapeForRepl2.IsNull())
{
theDI << theArgVal[6] << " is not a replaced type\n";
return 1;
}
TopoDS_Shape aReplacedShape;
ShapeBuild_ReShape aReshape;
//////////////////// explode (begin)
TopTools_MapOfShape M;
M.Add(aShape);
Standard_Integer aNbShapes = 0;
for (TopExp_Explorer ex(aShape,TopAbs_FACE); ex.More(); ex.Next())
{
const TopoDS_Shape& Sx = ex.Current();
Standard_Boolean added = M.Add(Sx);
if (added)
{
aNbShapes++;
if(aNbShapes == aNumOfRE1)
{
aReplacedShape = Sx;
aReshape.Replace(aReplacedShape, aShapeForRepl1);
}
if(aNbShapes == aNumOfRE2)
{
aReplacedShape = Sx;
aReshape.Replace(aReplacedShape, aShapeForRepl2);
}
}
}
//////////////////// explode (end)
if(aReplacedShape.IsNull())
{
theDI << "There is not any shape for replacing.\n";
}
DBRep::Set (theArgVal[1],aReshape.Apply (aShape,TopAbs_WIRE,2));
return 0;
}
/*****************************************************************************/
void QABugs::Commands_19(Draw_Interpretor& theCommands) {
@ -2834,5 +2917,6 @@ void QABugs::Commands_19(Draw_Interpretor& theCommands) {
theCommands.Add ("OCC23010", "OCC23010 STEP_file", __FILE__, OCC23010, group);
theCommands.Add ("OCC25043", "OCC25043 shape", __FILE__, OCC25043, group);
theCommands.Add ("OCC24606", "OCC24606 : Tests ::FitAll for V3d view ('vfit' is for NIS view)", __FILE__, OCC24606, group);
theCommands.Add ("OCC25202", "OCC25202 res shape numF1 face1 numF2 face2", __FILE__, OCC25202, group);
return;
}

2
src/QABugs/QABugs_3.cxx
View File

@ -734,6 +734,7 @@ static Standard_Integer BUC60811(Draw_Interpretor& di, Standard_Integer argc, co
TopoDS_Shell shell;
B.MakeShell(shell);
B.Add(shell, bzf1);
shell.Closed (BRep_Tool::IsClosed (shell));
B.MakeSolid(solid);
B.Add(solid,shell);
gp_Dir D(0, 0, 1.0f);
@ -1775,6 +1776,7 @@ static Standard_Integer BUC60951_(Draw_Interpretor& di, Standard_Integer argc, c
TopoDS_Face face = TopoDS::Face(list.FindKey(i));
builder.Add(shell, face);
}
shell.Closed (BRep_Tool::IsClosed (shell));
BRepPrimAPI_MakeHalfSpace half(shell, gp_Pnt(0, 0, 20));
TopoDS_Solid sol = half.Solid();

7
src/ShapeBuild/ShapeBuild_ReShape.cxx
View File

@ -21,6 +21,7 @@
#include <TopoDS_Iterator.hxx>
#include <TopExp_Explorer.hxx>
#include <BRep_Builder.hxx>
#include <BRep_Tool.hxx>
#include <ShapeExtend.hxx>
#include <ShapeBuild_Edge.hxx>
#include <TopoDS.hxx>
@ -69,8 +70,8 @@ TopoDS_Shape ShapeBuild_ReShape::Apply (const TopoDS_Shape& shape,
// if shape replaced, apply modifications to the result recursively
Standard_Boolean aConsLoc = ModeConsiderLocation();
if ( (aConsLoc && ! newsh.IsPartner (shape)) ||
(!aConsLoc &&! newsh.IsSame ( shape )) ) {
(!aConsLoc &&! newsh.IsSame ( shape )) )
{
TopoDS_Shape res = Apply ( newsh, until );
myStatus |= ShapeExtend::EncodeStatus ( ShapeExtend_DONE1 );
return res;
@ -124,8 +125,10 @@ TopoDS_Shape ShapeBuild_ReShape::Apply (const TopoDS_Shape& shape,
sbe.CopyRanges ( TopoDS::Edge ( result ), TopoDS::Edge ( shape ));
}
result.Orientation(orient);
result.Closed (BRep_Tool::IsClosed (result));
myStatus = locStatus;
Replace ( shape, result );
return result;
}

1
src/ShapeFix/ShapeFix_FaceConnect.cxx
View File

@ -543,6 +543,7 @@ ShapeFix_FaceConnect::ShapeFix_FaceConnect() {}
if (SFF->FixOrientation(MapWires)) EmpFace = SFF->Face();
theBuilder.Add(theShell,EmpFace);
}
theShell.Closed (BRep_Tool::IsClosed (theShell));
result = theShell;
if (!theRepVertices.IsEmpty()) {

3
src/ShapeFix/ShapeFix_Shell.cxx
View File

@ -269,11 +269,12 @@ static Standard_Boolean GetShells(TopTools_SequenceOfShape& Lface,
}
j++;
B.Add(nshell,F1);
nshell.Closed (BRep_Tool::IsClosed (nshell));
aMapFaceShells.Bind(F1,nshell);
Lface.Remove(i);
// if closed shell is obtained it adds to sequence of shells and new shell begin to construct.
if(isMultiConnex && BRep_Tool::IsClosed(nshell)) {
if(isMultiConnex && nshell.Closed()) {
aSeqShells.Append(nshell);
TopoDS_Shell nshellnext;
B.MakeShell(nshellnext);

6
src/ShapeProcess/ShapeProcess_ShapeContext.cxx
View File

@ -208,7 +208,11 @@ static void RecModif (const TopoDS_Shape &S,
}
else B.Add ( result, sh );
}
if ( modif ) res = result;
if ( modif )
{
result.Closed (BRep_Tool::IsClosed (result));
res = result;
}
}
if ( res != r ) map.Bind ( S.Located(aNullLoc), res );

3
src/ShapeUpgrade/ShapeUpgrade_FaceDivideArea.cxx
View File

@ -96,7 +96,10 @@ ShapeUpgrade_FaceDivideArea::ShapeUpgrade_FaceDivideArea(const TopoDS_Face& F)
aB.Add(aCopyRes,aFace);
}
if(isModified)
{
aCopyRes.Closed (BRep_Tool::IsClosed (aCopyRes));
Context()->Replace(aResult,aCopyRes);
}
myStatus |= aStatus;
myResult = Context()->Apply ( aResult );
return Status ( ShapeExtend_DONE );

21
src/ShapeUpgrade/ShapeUpgrade_RemoveLocations.cxx
View File

@ -190,11 +190,9 @@ Standard_Boolean ShapeUpgrade_RemoveLocations::MakeNewShape(const TopoDS_Shape&
aNewShape.Location(aL);
}
if(shtype != TopAbs_EDGE) {
theNewShape = aNewShape;
return Standard_True;
}
return Standard_True;
}
}
@ -251,8 +249,12 @@ Standard_Boolean ShapeUpgrade_RemoveLocations::MakeNewShape(const TopoDS_Shape&
//Removing location from sub-shapes in dependance of LevelRemoving and re-building shape.
if(!isBound) {
if(!aRebuild)
aNewShape = theShape.EmptyCopied();
if(!aRebuild)
{
aNewShape = theShape.EmptyCopied();
// it is safe to simply copy Closed flag since this operation does not change topology
aNewShape.Closed (theShape.Closed());
}
TopLoc_Location oldLoc,nullloc;
oldLoc = theShape.Location();
if(!oldLoc.IsIdentity())
@ -266,19 +268,18 @@ Standard_Boolean ShapeUpgrade_RemoveLocations::MakeNewShape(const TopoDS_Shape&
Standard_Boolean isDoneSubShape = MakeNewShape(subshape,anAncShape,anewsubshape,isRemoveLoc);
isDone = (isDone || isDoneSubShape);
aB.Add(aNewShape,anewsubshape);
}
if(isDone)
aNewShape.Orientation(orient);
else aNewShape = aShape;
else
aNewShape = aShape;
myMapNewShapes.Bind(aShape,aNewShape);
if(!theRemoveLoc && !oldLoc.IsIdentity())
aNewShape.Location(oldLoc);
}
theNewShape = aNewShape;
return (isDone || isBound);
}

20
src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.cxx
View File

@ -708,21 +708,6 @@ static Standard_Boolean MergeEdges(const TopTools_SequenceOfShape& SeqEdges,
cout<<"can not make analitical union => make approximation"<<endl;
#endif
TopoDS_Edge E = GlueEdgesWithPCurves(aChain, VF, VL);
/*
TopoDS_Wire W;
B.MakeWire(W);
for(j=1; j<=aChain.Length(); j++) {
TopoDS_Edge edge = TopoDS::Edge(aChain.Value(j));
B.Add(W,edge);
}
Handle(BRepAdaptor_HCompCurve) Adapt = new BRepAdaptor_HCompCurve(W);
Approx_Curve3d Conv(Adapt,Tol,GeomAbs_C1,9,1000);
Handle(Geom_BSplineCurve) bc = Conv.Curve();
TopoDS_Edge E;
B.MakeEdge (E,bc,Precision::Confusion());
B.Add (E,VF);
B.Add (E,VL);
*/
aChain.SetValue(1,E);
}
else {
@ -936,10 +921,9 @@ void ShapeUpgrade_UnifySameDomain::UnifyFaces()
} while (isNewFound);
// sorting any type of edges
//aWire = TopoDS::Wire(aContext->Apply(aWire));
aWire.Closed (BRep_Tool::IsClosed (aWire));
aWire = TopoDS::Wire(myContext->Apply(aWire));
//TopoDS_Face tmpF = TopoDS::Face(aContext->Apply(faces(1).Oriented(TopAbs_FORWARD)));
TopoDS_Face tmpF = TopoDS::Face(myContext->Apply(faces(1).Oriented(TopAbs_FORWARD)));
Handle(ShapeFix_Wire) sfw = new ShapeFix_Wire(aWire,tmpF,Precision::Confusion());
sfw->FixReorder();
@ -1021,6 +1005,7 @@ void ShapeUpgrade_UnifySameDomain::UnifyFaces()
TopoDS_Wire aW;
B.MakeWire(aW);
B.Add(aW,E);
aW.Closed (Standard_True);
B.Add(aResult,aW);
}
}
@ -1091,6 +1076,7 @@ void ShapeUpgrade_UnifySameDomain::UnifyFaces()
B.MakeShell ( S );
for ( i=1; i <= parts.Length(); i++ )
B.Add ( S, parts(i) );
S.Closed (BRep_Tool::IsClosed (S));
CompRes = S;
}
else CompRes = parts(1);

4
src/ShapeUpgrade/ShapeUpgrade_WireDivide.cxx
View File

@ -714,13 +714,17 @@ void ShapeUpgrade_WireDivide::Perform ()
V1 = V;
}
if(numE)
{
resWire.Closed (BRep_Tool::IsClosed (resWire));
Context()->Replace(E,resWire);
}
else
Context()->Remove(E);
}
}
if ( Status ( ShapeExtend_DONE ) ) {
//smh#8
newWire.Closed (BRep_Tool::IsClosed (newWire));
TopoDS_Shape tmpW = Context()->Apply ( newWire ).Oriented(myWire.Orientation());
myWire = TopoDS::Wire (tmpW );
}

2
src/StepToTopoDS/StepToTopoDS_Builder.cxx
View File

@ -614,6 +614,7 @@ void StepToTopoDS_Builder::Init (const Handle(StepShape_EdgeBasedWireframeModel)
B.Add ( W, E );
}
if ( W.IsNull() ) continue;
W.Closed (BRep_Tool::IsClosed (W));
B.Add ( C, W );
if ( myResult.IsNull() ) myResult = W;
else myResult = C;
@ -675,6 +676,7 @@ void StepToTopoDS_Builder::Init (const Handle(StepShape_FaceBasedSurfaceModel)&
B.Add ( S, F );
}
if ( S.IsNull() ) continue;
S.Closed (BRep_Tool::IsClosed (S));
B.Add ( C, S );
if ( myResult.IsNull() ) myResult = S;
else myResult = C;

1
src/StepToTopoDS/StepToTopoDS_TranslateEdgeLoop.cxx
View File

@ -675,6 +675,7 @@ void StepToTopoDS_TranslateEdgeLoop::Init(const Handle(StepShape_FaceBound)& Fac
TP->AddFail(EL,"At least one edge failed : wire not done");
return;
}
W.Closed (BRep_Tool::IsClosed (W));
aTool.Bind(EL, W);
// ----------------------------------------------

1
src/StepToTopoDS/StepToTopoDS_TranslatePolyLoop.cxx
View File

@ -170,6 +170,7 @@ void StepToTopoDS_TranslatePolyLoop::Init(const Handle(StepShape_PolyLoop)& PL,
GP1 = GP2;
V1 = V2;
}
W.Closed (BRep_Tool::IsClosed (W));
aTool.Bind(PL, W);
myResult = W;
myError = StepToTopoDS_TranslatePolyLoopDone;

1
src/StepToTopoDS/StepToTopoDS_TranslateShell.cxx
View File

@ -103,6 +103,7 @@ void StepToTopoDS_TranslateShell::Init
TP->AddWarning(StepFace," Face is not of FaceSurface Type; not mapped to TopoDS");
}
}
Sh.Closed (BRep_Tool::IsClosed (Sh));
myResult = Sh;
aTool.Bind(CFS, myResult);
myError = StepToTopoDS_TranslateShellDone;

1
src/StepToTopoDS/StepToTopoDS_TranslateVertexLoop.cxx
View File

@ -89,6 +89,7 @@ void StepToTopoDS_TranslateVertexLoop::Init(const Handle(StepShape_VertexLoop)&
B.Degenerated(E, Standard_True);
B.MakeWire(W);
W.Closed (Standard_True);
B.Add(W, E);
aTool.Bind(VL, W);
myResult = W;

1
src/TNaming/TNaming_Name.cxx
View File

@ -465,6 +465,7 @@ static TopoDS_Shape ShapeWithType(const TopoDS_Shape theShape,
TopoDS_Shell aShell;
aShellBuilder.MakeShell(aShell);
for(;aListIter.More();aListIter.Next()) aShellBuilder.Add(aShell,TopoDS::Face(aListIter.Value()));
aShell.Closed (BRep_Tool::IsClosed (aShell));
if (theType == TopAbs_SHELL) return aShell;
aShapes.Clear(); // don't break: we can do something more of it
aShapes.Append(aShell);

1
src/TestTopOpe/TestTopOpe_OtherCommands.cxx
View File

@ -187,6 +187,7 @@ Standard_Integer MKSOLSHE(Draw_Interpretor&, Standard_Integer narg, const char**
if (S.IsNull()) continue;
if (S.ShapeType() == TopAbs_FACE) {
BB.Add(she,S);
she.Closed (BRep_Tool::IsClosed (she));
yaface = Standard_True;
}
}

1
src/TopOpeBRep/TopOpeBRep_ShapeIntersector.cxx
View File

@ -1283,6 +1283,7 @@ static TopoDS_Solid GetNewSolid(const TopoDS_Shape& S, TopoDS_Face& F)
newShellBuilder.MakeShell( newShell );
newShellBuilder.Add( newShell, hsFace );
newShellBuilder.Add( newShell, infFace );
newShell.Closed (BRep_Tool::IsClosed (newShell));
BRep_Builder newSolidBuilder;
newSolidBuilder.MakeSolid( newSolid );

3
src/TopOpeBRepBuild/TopOpeBRepBuild_Builder1_2.cxx
View File

@ -140,6 +140,7 @@ Standard_Integer TopOpeBRepBuild_Builder1::CorrectResult2d(TopoDS_Shape& aResult
}
// Add wires
aWire.Orientation(Wori);
aWire.Closed (BRep_Tool::IsClosed (aWire));
BB.Add (aFace, aWire);
}
@ -148,8 +149,10 @@ Standard_Integer TopOpeBRepBuild_Builder1::CorrectResult2d(TopoDS_Shape& aResult
}
aShell.Orientation(S.Orientation());
aShell.Closed (BRep_Tool::IsClosed(aShell));
BB.Add (aSolid, aShell);
}
aSolid.Closed (BRep_Tool::IsClosed(aSolid));
aResult=aSolid;
//update section curves

1
src/XCAFPrs/XCAFPrs.cxx
View File

@ -250,6 +250,7 @@ Standard_Boolean XCAFPrs::DispatchStyles (const TopoDS_Shape &shape,
// iterate on subshapes
BRep_Builder B;
TopoDS_Shape copy = shape.EmptyCopied();
copy.Closed (shape.Closed());
Standard_Boolean suboverride = Standard_False;
Standard_Integer nbDef = 0;
for ( TopoDS_Iterator it(shape); it.More(); it.Next() ) {

1
src/XSControl/XSControl_Utils.cxx
View File

@ -429,6 +429,7 @@ static const Standard_ExtString voidext = { 0 };
TopoDS_Shell S;
B.MakeShell (S);
B.Add (S,shape); // ne passe pas ! : TopoDS::Face(shape));
S.Closed (BRep_Tool::IsClosed (S));
return S;
}

33
tests/bugs/moddata_3/bug25202_1 Executable file
View File

@ -0,0 +1,33 @@
puts "========"
puts "CR25202"
puts "========"
puts ""
#########################################
## Incorrect value of IsClosed flag in shapes produced by some algorithms
#########################################
pload QAcommands
box b 100 100 100
vertex v1 0 0 50
explode b v
edge ee1 b_2 v1
edge ee2 v1 b_1
explode b e
wire ww1 ee1 ee2 b_2 b_3 b_4
wire ww2 ee1 ee2 b_9 b_10 b_5
mkplane ff1 ww1
mkplane ff2 ww2
explode b f
#Replaced edge lies between b_1 and b_3 faces.
OCC25202 result b 1 ff1 3 ff2
set info [whatis result]
if { [regexp {Closed} ${info}] } {
puts "OK : value of IsClosed flag is correct"
} else {
puts "Error : value of IsClosed flag is not correct"
}
set 2dviewer 1

21
tests/bugs/moddata_3/bug25202_2 Executable file
View File

@ -0,0 +1,21 @@
puts "========"
puts "CR25202"
puts "========"
puts ""
#########################################
## Incorrect value of IsClosed flag in shapes produced by some algorithms
#########################################
box b 100 100 100
explode b sh
trotate b_1 0 0 0 1 0 0 45
removeloc result b_1
set info [whatis result]
if { [regexp {Closed} ${info}] } {
puts "OK : value of IsClosed flag is correct"
} else {
puts "Error : value of IsClosed flag is not correct"
}
set 2dviewer 1

21
tests/bugs/moddata_3/bug25202_3 Executable file
View File

@ -0,0 +1,21 @@
puts "========"
puts "CR25202"
puts "========"
puts ""
#########################################
## Incorrect value of IsClosed flag in shapes produced by some algorithms
#########################################
plane pp 0 0 0 0 0 1
trim pp pp 0 100 0 100
mkface ff pp
prism result ff 0 0 20
set info [whatis result]
if { [regexp {Closed} ${info}] } {
puts "OK : value of IsClosed flag is correct"
} else {
puts "Error : value of IsClosed flag is not correct"
}
set 2dviewer 1

22
tests/bugs/moddata_3/bug25202_4 Executable file
View File

@ -0,0 +1,22 @@
puts "========"
puts "CR25202"
puts "========"
puts ""
#########################################
## Incorrect value of IsClosed flag in shapes produced by some algorithms
#########################################
circle cc 0 100 0 20
mkedge ee cc
wire ww ee
mkplane ff ww
revol result ff 0 0 0 1 0 0 90
set info [whatis result]
if { [regexp {Closed} ${info}] } {
puts "OK : value of IsClosed flag is correct"
} else {
puts "Error : value of IsClosed flag is not correct"
}
set 2dviewer 1