OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

Rebased on current master.

Browse Source 
fix for the bug v2.0
This commit is contained in:
apn 2012-08-28 15:15:49 +04:00
parent 09121745ad
commit 615876eb63
13 changed files with 511 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/BOP/BOP_ShellSplitter.cxx
View File

@ -51,6 +51,7 @@
#include <BRep_Tool.hxx>
#include <BRep_Builder.hxx>
#include <BOPTColStd_ListIteratorOfListOfListOfShape.hxx>
static
void RemoveInternals(const TopoDS_Face& ,
@ -78,6 +79,10 @@ static
void CreateClosedShell(TopTools_SequenceOfShape& ,
const TopTools_MapOfShape& ,
const TopTools_IndexedDataMapOfShapeListOfShape& );
//DEBf
static
void Dump(const BOPTColStd_ListOfListOfShape& myShapes);
//DEBt
//
//=======================================================================
// function: BOP_ShellSplitter::BOP_ShellSplitter
@ -198,13 +203,37 @@ static
}
//
// 2. Split the Shell
Standard_Integer aNbSh;
TopoDS_Shape aShape;
SplitShell (aShell, aShape);
//
// 3. Post-pro the result aShape
// and filling the myShapes field .
//modified by NIZNHY-PKV Tue Aug 28 09:45:39 2012f
TopExp_Explorer aShellExp(aShape, TopAbs_SHELL);
for (aNbSh=0; aShellExp.More(); aShellExp.Next(), ++aNbSh) {
const TopoDS_Shape& aSh=aShellExp.Current();
}
//
if (aNbSh==1) {
Standard_Boolean bIsClosed;
//
bIsClosed=BRep_Tool::IsClosed(aShell);
if (bIsClosed) {
myShapes.Append(myFaces);
myIsDone=Standard_True;
Dump(myShapes);
return;
}
/*
myShapes.Append(myFaces);
myIsDone=Standard_True;
Dump(myShapes);
*/
}
//modified by NIZNHY-PKV Tue Aug 28 09:45:45 2012t
//
aShellExp.Init(aShape, TopAbs_SHELL);
for (; aShellExp.More(); aShellExp.Next()) {
const TopoDS_Shape& aSh= aShellExp.Current();
@ -221,9 +250,30 @@ static
myShapes.Append(aLF);
}
}
//
Dump(myShapes);
myIsDone=Standard_True;
}
//DEBf
//=======================================================================
//function : Dump
//purpose :
//=======================================================================
void Dump(const BOPTColStd_ListOfListOfShape& myShapes)
{
Standard_Integer i, aNbAreas, aNbFaces;
BOPTColStd_ListIteratorOfListOfListOfShape aIt;
//
aNbAreas=myShapes.Extent();
printf(" aNbAreas=%d\n", aNbAreas);
aIt.Initialize(myShapes);
for (i=1; aIt.More(); aIt.Next(), ++i) {
const TopTools_ListOfShape& aLF=aIt.Value();
aNbFaces=aLF.Extent();
printf(" Area #%d aNbFaces=%d\n", i, aNbFaces);
}
}
//DEBt
//=======================================================================
// function: RemoveInternals
@ -286,7 +336,7 @@ void RemoveInternals(const TopoDS_Face& aF,
done = Standard_False;
aNumMultShell =0;
aShellsOut = aShellIn;
TopoDS_Iterator iter(aShellIn);
for (; iter.More(); iter.Next()) {
Lface.Append(iter.Value());

25
src/BOPTools/BOPTools_PaveFiller.cdl
View File

@ -516,7 +516,6 @@ is
--- Try to put 3D-point <aP> (parameter aT) on the curve <aBC>
---
--modified by NIZNHY-PKV Thu Oct 20 07:17:11 2011f
PutClosingPaveOnCurve (me:out;
aBC :out Curve from BOPTools;
aFF :out SSInterference from BOPTools)
@ -525,7 +524,6 @@ is
--- Put paves on the curve <aBC> in case when <aBC>
-- is closed 3D-curve
---
--modified by NIZNHY-PKV Thu Oct 20 07:17:11 2011t
FindPave (me:out;
aP :Pnt from gp;
@ -595,8 +593,27 @@ is
nV : Integer from Standard;
aTolExt : out Real from Standard)
returns Boolean from Standard
is protected;
is protected;
--modified by NIZNHY-PKV Tue Aug 28 09:45:00 2012ft
TreatTechnoVertices(me:out;
aFF:out SSInterference from BOPTools)
is protected;
SplitPaveBlock(me:out;
aPB: PaveBlock from BOPTools;
nVT: Integer from Standard;
aPB1:out PaveBlock from BOPTools;
aPB2:out PaveBlock from BOPTools)
is protected;
CheckCoincidence(me:out;
aPB1: PaveBlock from BOPTools;
aPB2: PaveBlock from BOPTools)
returns Boolean from Standard
is protected;
--modified by NIZNHY-PKV Mon Jul 09 13:15:55 2012t
fields
myIntrPool : PInterferencePool from BOPTools

23
src/BOPTools/BOPTools_PaveFiller_3.cxx
View File

@ -538,8 +538,22 @@ static
if (aMap.Contains(nV1) && aMap.Contains(nV2)) {
//
const BOPTools_ListOfPaveBlock& aLPBExisting=aFFi.PaveBlocks();
bIsPaveBlock=IsPaveBlock(nV1, nV2, aLPBExisting);
//
//modified by NIZNHY-PKV Thu Jul 26 10:38:23 2012f
iCheckIntermediatePoint=1;
BOPTools_ListIteratorOfListOfPaveBlock anItLPB(aLPBExisting);
for (; anItLPB.More(); anItLPB.Next()) {
const BOPTools_PaveBlock& aPBR=anItLPB.Value();
iCheckIntermediatePoint=
CheckIntermediatePoint(aPBNew, aPBR, aTolR3D);
if (!iCheckIntermediatePoint) {
break;
}
}
bIsPaveBlock=(iCheckIntermediatePoint==0);
//
/*
bIsPaveBlock=IsPaveBlock(nV1, nV2, aLPBExisting);
iCheckIntermediatePoint=1;
if (bIsPaveBlock) {
BOPTools_ListIteratorOfListOfPaveBlock anItLPB(aLPBExisting);
@ -554,6 +568,8 @@ static
}
bIsPaveBlock=bIsPaveBlock && !iCheckIntermediatePoint;
}
*/
//modified by NIZNHY-PKV Thu Jul 26 10:38:32 2012t
//
if (bIsPaveBlock) {
continue;
@ -1741,7 +1757,10 @@ static
}
}
//wkar OCC334 t
}
//modified by NIZNHY-PKV Mon Jul 09 13:14:15 2012f
TreatTechnoVertices(aFFi);
//modified by NIZNHY-PKV Mon Jul 09 13:14:17 2012t
}//for (i=1; i<=aNbFFs; i++) {
}
//=======================================================================
// function: PrepareSetForFace

323
src/BOPTools/BOPTools_PaveFiller_5.cxx Normal file
View File

@ -0,0 +1,323 @@
// Created on: 2001-03-13
// Created by: Peter KURNEV
// Copyright (c) 2001-2012 OPEN CASCADE SAS
//
// The content of this file is subject to the Open CASCADE Technology Public
// License Version 6.5 (the "License"). You may not use the content of this file
// except in compliance with the License. Please obtain a copy of the License
// at http://www.opencascade.org and read it completely before using this file.
//
// The Initial Developer of the Original Code is Open CASCADE S.A.S., having its
// main offices at: 1, place des Freres Montgolfier, 78280 Guyancourt, France.
//
// The Original Code and all software distributed under the License is
// distributed on an "AS IS" basis, without warranty of any kind, and the
// Initial Developer hereby disclaims all such warranties, including without
// limitation, any warranties of merchantability, fitness for a particular
// purpose or non-infringement. Please see the License for the specific terms
// and conditions governing the rights and limitations under the License.
#include <BOPTools_PaveFiller.ixx>
#include <TColStd_ListOfInteger.hxx>
#include <TColStd_ListIteratorOfListOfInteger.hxx>
#include <TColStd_IndexedMapOfInteger.hxx>
#include <gp_Pnt.hxx>
#include <Geom_Curve.hxx>
#include <TopoDS_Edge.hxx>
#include <BRep_Builder.hxx>
#include <BooleanOperations_ShapesDataStructure.hxx>
#include <IntTools_Curve.hxx>
#include <IntTools_Tools.hxx>
#include <BOPTools_Tools.hxx>
#include <BOPTools_SequenceOfCurves.hxx>
#include <BOPTools_Curve.hxx>
#include <BOPTools_ListOfPaveBlock.hxx>
#include <BOPTools_ListIteratorOfListOfPaveBlock.hxx>
#include <BOPTools_Pave.hxx>
#include <BOPTools_ListOfCommonBlock.hxx>
#include <BOPTools_ListIteratorOfListOfCommonBlock.hxx>
#include <BOPTools_CommonBlock.hxx>
//modified by NIZNHY-PKV Tue Aug 28 09:45:19 2012ft
//=======================================================================
//function : TreatTechnoVertices
//purpose :
//=======================================================================
void BOPTools_PaveFiller::TreatTechnoVertices(BOPTools_SSInterference& aFFi)
{
Standard_Boolean bFlag, bSplitted;
Standard_Integer nF1, nF2, aBid, j, aNbCurves, aNbVT, aNbLPB, nE, nVT, iFlag;
Standard_Integer nF, nE1, nE2, k;
Standard_Real aT;
TColStd_IndexedMapOfInteger aMVT;
TColStd_ListIteratorOfListOfInteger aItLI;
BOPTools_Pave aPave;
BOPTools_ListOfPaveBlock aLPB, aLPBS;
BOPTools_ListIteratorOfListOfPaveBlock aItLPB, aItLPB1;
//
nF1=aFFi.Index1();
nF2=aFFi.Index2();
BOPTools_SequenceOfCurves& aBCs=aFFi.Curves();
//
aNbCurves=aBCs.Length();
for (j=1; j<=aNbCurves; j++) {
BOPTools_Curve& aBC=aBCs(j);
//Handle(Geom_Curve) aC3D= aBC.Curve().Curve(); //DEB
TColStd_ListOfInteger& aLVT=aBC.TechnoVertices();
aItLI.Initialize(aLVT);
for (; aItLI.More(); aItLI.Next()) {
nVT=aItLI.Value();
aMVT.Add(nVT);
}
}
//
aNbVT=aMVT.Extent();
if (!aNbVT) {// nothing to do
return;
}
//------------------------------
//
aBid=0;
SplitsInFace (aBid, nF1, nF2, aLPB);
SplitsInFace (aBid, nF2, nF1, aLPB);
SplitsOnFace (aBid, nF1, nF2, aLPB);
//
aNbLPB=aLPB.Extent();
if (!aNbLPB) {// nothing to do
return;
}
//
for (k=1; k<=aNbVT; ++k) {
nVT=aMVT(k);
const TopoDS_Vertex& aV=*((TopoDS_Vertex*)&(myDS->Shape(nVT)));
//
// 1.Collect Pave Blocks (pretenders) to split by nVT => aLPBS
aLPBS.Clear();
aItLPB.Initialize(aLPB);
for (; aItLPB.More(); aItLPB.Next()) {
const BOPTools_PaveBlock& aPB=aItLPB.Value();
nE=aPB.OriginalEdge();
const TopoDS_Edge& aE=*((TopoDS_Edge*)&(myDS->Shape(nE)));
//
iFlag=myContext->ComputeVE(aV, aE, aT);
if (iFlag) {
continue;
}
//
aPave.SetIndex(nVT);
aPave.SetParam(aT);
//
BOPTools_ListOfPaveBlock& aLPBE=mySplitShapesPool(myDS->RefEdge(nE));
aItLPB1.Initialize(aLPBE);
for (; aItLPB1.More(); aItLPB1.Next()) {
const BOPTools_PaveBlock& aPBE=aItLPB1.Value();
if (aPBE.IsInBlock(aPave)) {
aLPBS.Append(aPBE);
}
}
}//for (; aItLPB.More(); aItLPB.Next()) {
//
// 2.Split Pave Blocks [aLPBS] by the vertex [nVT]
BOPTools_ListIteratorOfListOfCommonBlock aItCB1, aItCB2;
BOPTools_PaveBlock aPB11, aPB12, aPB21, aPB22, aPB1, aPB2;
//
aItLPB.Initialize(aLPBS);
for (; aItLPB.More(); aItLPB.Next()) {
const BOPTools_PaveBlock& aPBS=aItLPB.Value();
nE=aPBS.OriginalEdge();
//
BOPTools_ListOfCommonBlock& aLCB1=myCommonBlockPool(myDS->RefEdge(nE));
aItCB1.Initialize(aLCB1);
for (; aItCB1.More(); aItCB1.Next()) {
BOPTools_CommonBlock& aCB1=aItCB1.Value();
aPB1=aCB1.PaveBlock1(nE);
nE1=aPB1.OriginalEdge();
//
if (aPB1.IsEqual(aPBS)) {
//
SplitPaveBlock(aPB1, nVT, aPB11, aPB12);
//
nF=aCB1.Face();
if (nF) {
BOPTools_CommonBlock aCBa, aCBb;
//
aLCB1.Remove(aItCB1);
//
aCBa.SetPaveBlock1(aPB11);
aCBa.SetFace(nF);
aCBb.SetPaveBlock2(aPB12);
aCBb.SetFace(nF);
//
aLCB1.Append(aCBa);
aLCB1.Append(aCBb);
//
break;
}// if (nF) {
else { // 1
BOPTools_CommonBlock aCBa, aCBb;
//
aPB2=aCB1.PaveBlock2(nE);
nE2=aPB2.OriginalEdge();
//
SplitPaveBlock(aPB2, nVT, aPB21, aPB22);
//
//aLCB1.Remove(aItCB1);
//
iFlag=0;
BOPTools_ListOfCommonBlock& aLCB2=myCommonBlockPool(myDS->RefEdge(nE2));
aItCB2.Initialize(aLCB2);
for (; aItCB2.More(); aItCB2.Next()) {
BOPTools_CommonBlock& aCB2=aItCB2.Value();
BOPTools_PaveBlock& aPBx=aCB2.PaveBlock1(nE2);
if (aPBx.IsEqual(aPB2)) {
aLCB2.Remove(aItCB2);
aLCB1.Remove(aItCB1);
//
bFlag=CheckCoincidence(aPB11, aPB21);
if (bFlag) {
aCBa.SetPaveBlock1(aPB11);
aCBa.SetPaveBlock2(aPB21);
aCBb.SetPaveBlock1(aPB12);
aCBb.SetPaveBlock2(aPB22);
}
else {
aCBa.SetPaveBlock1(aPB11);
aCBa.SetPaveBlock2(aPB22);
aCBb.SetPaveBlock1(aPB12);
aCBb.SetPaveBlock2(aPB21);
}
//
aLCB1.Append(aCBa);
aLCB1.Append(aCBb);
aLCB2.Append(aCBa);
aLCB2.Append(aCBb);
//
iFlag=1;
break;
}//if (aPB1.IsEqual(aPB2)) {
}//for (; aItCB2.More(); aItCB2.Next()) {
}//else { // 1
}//if (aPB1.IsEqual(aPBS)) {
if (iFlag) {
break;
}
}//for (; aItCB.More(); aItCB.Next()) {
}//for (; aItLPB.More(); aItLPB.Next()) {
}//for (k=1; k<=aNbVT; ++k) {
}
//=======================================================================
//function : SplitPaveBlock
//purpose :
//=======================================================================
void BOPTools_PaveFiller::SplitPaveBlock(const BOPTools_PaveBlock& aPBE,
const Standard_Integer nVT,
BOPTools_PaveBlock& aPB1,
BOPTools_PaveBlock& aPB2)
{
Standard_Integer nE, iFlag;
Standard_Real aT;
BOPTools_Pave aPave;
BOPTools_ListIteratorOfListOfPaveBlock aItLPB;
//
const TopoDS_Vertex& aVT=*((TopoDS_Vertex*)&(myDS->Shape(nVT)));
//
nE=aPBE.OriginalEdge();
const TopoDS_Edge& aE=*((TopoDS_Edge*)&(myDS->Shape(nE)));
//
BOPTools_ListOfPaveBlock& aLPB=mySplitShapesPool(myDS->RefEdge(nE));
//
aItLPB.Initialize(aLPB);
for (; aItLPB.More(); aItLPB.Next()) {
const BOPTools_PaveBlock& aPB=aItLPB.Value();
if (aPB.IsEqual(aPBE)) {
aLPB.Remove(aItLPB);
break;
}
}
//
iFlag=myContext->ComputeVE(aVT, aE, aT);
//
aPave.SetIndex(nVT);
aPave.SetParam(aT);
//
aPB1.SetOriginalEdge(nE);
aPB1.SetPave1(aPBE.Pave1());
aPB1.SetPave2(aPave);
//
aPB2.SetOriginalEdge(nE);
aPB2.SetPave1(aPave);
aPB2.SetPave2(aPBE.Pave2());
//
aLPB.Append(aPB1);
aLPB.Append(aPB2);
}
//=======================================================================
//function : CheckCoincidence
//purpose :
//=======================================================================
Standard_Boolean
BOPTools_PaveFiller::CheckCoincidence(const BOPTools_PaveBlock& aPB1,
const BOPTools_PaveBlock& aPB2)
{
Standard_Boolean bRet;
Standard_Integer nV11, nV12, nV21, nV22, nE1, nE2, iFlag;
Standard_Real aT11, aT12, aT21, aT22, aTM, aTN, aTolE1;
gp_Pnt aPM;
TopoDS_Vertex aVM;
BRep_Builder aBB;
//
const BOPTools_Pave& aPave11=aPB1.Pave1();
nV11=aPave11.Index();
aT11=aPave11.Param();
//
const BOPTools_Pave& aPave12=aPB1.Pave2();
aT12=aPave12.Param();
nV12=aPave12.Index();
//
const BOPTools_Pave& aPave21=aPB2.Pave1();
nV21=aPave21.Index();
aT21=aPave21.Param();
//
const BOPTools_Pave& aPave22=aPB2.Pave2();
nV22=aPave22.Index();
aT22=aPave22.Param();
//
bRet=((nV11==nV21 && nV12==nV22) || (nV11==nV22 && nV12==nV21));
if (!bRet) {
return bRet;
}
//
nE1=aPB1.OriginalEdge();
const TopoDS_Edge& aE1=*((TopoDS_Edge*)&(myDS->Shape(nE1)));
aTolE1=BRep_Tool::Tolerance(aE1);
//
nE2=aPB2.OriginalEdge();
const TopoDS_Edge& aE2=*((TopoDS_Edge*)&(myDS->Shape(nE2)));
//
aTM=IntTools_Tools::IntermediatePoint (aT11, aT12);
BOPTools_Tools::PointOnEdge(aE1, aTM, aPM);
//
aBB.MakeVertex (aVM, aPM, aTolE1);
//
iFlag=myContext->ComputeVE(aVM, aE2, aTN);
if (iFlag) {
bRet=!bRet; //False
}
//
if (aT21 <aT22) {
bRet=(aTN>aT21 && aTN<aT22);
}
else {
bRet=(aTN>aT22 && aTN<aT21);
}
return bRet;
}

1
src/BOPTools/FILES
View File

@ -4,3 +4,4 @@ BOPTools_PaveFiller_1.cxx
BOPTools_PaveFiller_2.cxx
BOPTools_PaveFiller_3.cxx
BOPTools_PaveFiller_4.cxx
BOPTools_PaveFiller_5.cxx

10
tests/boolean/bopcommon_complex/M7 Executable file
View File

@ -0,0 +1,10 @@
puts "OCC23270: Wrong result done by boolean operation algorithm for cylinder and torus"
restore [locate_data_file OCC23270-Cylinder_1.brep] b1
restore [locate_data_file OCC23270-Torus_1.brep] b2
bop b1 b2
bopcommon result
set square 210232.

11
tests/boolean/bopcommon_complex/M8 Executable file
View File

@ -0,0 +1,11 @@
puts "OCC23270: Wrong result done by boolean operation algorithm for cylinder and torus"
restore [locate_data_file OCC23270-Cylinder_1.brep] b1
restore [locate_data_file OCC23270-Torus_1.brep] b2
bop b2 b1
bopcommon result
set square 210232.

12
tests/boolean/bopcut_complex/P6 Executable file
View File

@ -0,0 +1,12 @@
puts "OCC23270: Wrong result done by boolean operation algorithm for cylinder and torus"
restore [locate_data_file OCC23270-Cylinder_1.brep] b1
restore [locate_data_file OCC23270-Torus_1.brep] b2
bop b1 b2
bopcut result
set square 421204.

12
tests/boolean/bopcut_complex/P7 Executable file
View File

@ -0,0 +1,12 @@
puts "OCC23270: Wrong result done by boolean operation algorithm for cylinder and torus"
restore [locate_data_file OCC23270-Cylinder_1.brep] b1
restore [locate_data_file OCC23270-Torus_1.brep] b2
bop b2 b1
bopcommon result
set square 210232.

12
tests/boolean/bopfuse_complex/O5 Executable file
View File

@ -0,0 +1,12 @@
puts "OCC23270: Wrong result done by boolean operation algorithm for cylinder and torus"
restore [locate_data_file OCC23270-Cylinder_1.brep] b1
restore [locate_data_file OCC23270-Torus_1.brep] b2
bop b1 b2
bopfuse result
set square 1.41394e+06

12
tests/boolean/bopfuse_complex/O6 Executable file
View File

@ -0,0 +1,12 @@
puts "OCC23270: Wrong result done by boolean operation algorithm for cylinder and torus"
restore [locate_data_file OCC23270-Cylinder_1.brep] b1
restore [locate_data_file OCC23270-Torus_1.brep] b2
bop b2 b1
bopfuse result
set square 1.41394e+06

12
tests/boolean/boptuc_complex/I3 Executable file
View File

@ -0,0 +1,12 @@
puts "OCC23270: Wrong result done by boolean operation algorithm for cylinder and torus"
restore [locate_data_file OCC23270-Cylinder_1.brep] b1
restore [locate_data_file OCC23270-Torus_1.brep] b2
bop b1 b2
boptuc result
set square 1.20297e+06

11
tests/boolean/boptuc_complex/I4 Executable file
View File

@ -0,0 +1,11 @@
puts "OCC23270: Wrong result done by boolean operation algorithm for cylinder and torus"
restore [locate_data_file OCC23270-Cylinder_1.brep] b1
restore [locate_data_file OCC23270-Torus_1.brep] b2
bop b2 b1
boptuc result
set square 421204.