mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-04 18:06:22 +03:00
0d0481c787
When fuzzy option is in force prevent increasing tolerance of input shapes. Instead pass increased by fuzzy value the tolerances of sub-shapes everywhere where it is needed by intersection algorithms. The following changes in API have been made: - The methods SetFuzzyValue and FuzzyValue have been moved from the classes BOPAlgo_ArgumentAnalyzer, BOPAlgo_Builder, and BOPAlgo_PaveFiller to the base class BOPAlgo_Algo. - The public method BOPDS_DS::VerticesOnIn has been renamed to SubShapesOnIn, and the new output parameter theCommonPB has been added. - In BOPTools_AlgoTools, a new argument "theFuzzyValue" has been added in the methods ComputeVV and AreFacesSameDomain. - In IntTools_Context, a new argument "theFuzzyValue" has been added in the methods ComputeVE and ComputeVF. - The methods SetFuzzyValue and FuzzyValue have been added in the classes IntTools_EdgeEdge, IntTools_FaceFace. - In the class IntTools_EdgeFace, the methods SetTolE, SetTolF, TolE, TolF have been removed, and the methods SetFuzzyValue, FuzzyValue have been added. - The new argument "theTol" has been added in the method IntTools_WLineTool::DecompositionOfWLine. Some improvements in algorithms have been made during fighting with regressions: - Correct initialization of pave blocks for degenerated edges. - In BOPAlgo_PaveFiller::MakeBlocks(), filter out paves on intersection curve that were put on the curve accidentally due to wide range of E-F intersection vertex. - In the method IntTools_Tools::ComputeTolerance the margin added to the computed tolerance has been increased up to 0.001%. - The method BOPAlgo_PaveFiller::PutPaveOnCurve has been corrected in order to use the original vertex tolerance instead of the value increased during putting it on other curves. - The new method BOPDS_PaveBlock::RemoveExtPave has been added. - The vertex tolerance computation in BOPTools_AlgoTools::CorrectCurveOnSurface has been improved, taking into account intersection segments between p-curves (to avoid regression on "bugs modalg_6 bug22794"). - Improve IsExistingPaveBlock to make more stable catching of coincidence of common block with section curve (against regression "bugs modalg_4 bug697_2" on Linux). Test case for the bug has been added. The following test cases have been updated as improvements: boolean gdml_private ZH2 ZI7 ZJ7 boolean volumemaker C4 The test case bugs/modalg_4/pro19653 has been corrected to make it stable. See comment inside the script for details. The test case bugs/modalg_6/bug25880 has been corrected to suppress wrong bfuse commands. The test bugs/modalg_6/bug26954_3 has been corrected to compare the result with more precise reference value. The "faulty" TODO in boolean/volumemaker/A8 has been made actual for Linux as well. //Eliminate compilation error on Linux.
172 lines
4.9 KiB
C++
172 lines
4.9 KiB
C++
// Created by: Peter KURNEV
|
|
// Copyright (c) 1999-2014 OPEN CASCADE SAS
|
|
//
|
|
// This file is part of Open CASCADE Technology software library.
|
|
//
|
|
// This library is free software; you can redistribute it and/or modify it under
|
|
// the terms of the GNU Lesser General Public License version 2.1 as published
|
|
// by the Free Software Foundation, with special exception defined in the file
|
|
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
|
|
// distribution for complete text of the license and disclaimer of any warranty.
|
|
//
|
|
// Alternatively, this file may be used under the terms of Open CASCADE
|
|
// commercial license or contractual agreement.
|
|
|
|
|
|
#include <Bnd_Box.hxx>
|
|
#include <BOPAlgo_PaveFiller.hxx>
|
|
#include <BOPAlgo_SectionAttribute.hxx>
|
|
#include <BOPCol_MapOfInteger.hxx>
|
|
#include <BOPCol_NCVector.hxx>
|
|
#include <BOPCol_Parallel.hxx>
|
|
#include <BOPDS_Curve.hxx>
|
|
#include <BOPDS_DS.hxx>
|
|
#include <BOPDS_Iterator.hxx>
|
|
#include <BOPDS_ListOfPaveBlock.hxx>
|
|
#include <BOPDS_PaveBlock.hxx>
|
|
#include <BOPDS_ShapeInfo.hxx>
|
|
#include <gp_Pnt.hxx>
|
|
#include <IntTools_Context.hxx>
|
|
#include <IntTools_ShrunkRange.hxx>
|
|
#include <TopoDS_Edge.hxx>
|
|
#include <TopoDS_Face.hxx>
|
|
#include <TopoDS_Vertex.hxx>
|
|
|
|
//
|
|
//=======================================================================
|
|
//class : BOPAlgo_ShrunkRange
|
|
//purpose :
|
|
//=======================================================================
|
|
class BOPAlgo_ShrunkRange : public IntTools_ShrunkRange {
|
|
public:
|
|
BOPAlgo_ShrunkRange()
|
|
: IntTools_ShrunkRange() {
|
|
}
|
|
//
|
|
virtual ~BOPAlgo_ShrunkRange() {
|
|
}
|
|
//
|
|
void SetPaveBlock(const Handle(BOPDS_PaveBlock)& aPB) {
|
|
myPB=aPB;
|
|
}
|
|
//
|
|
Handle(BOPDS_PaveBlock)& PaveBlock() {
|
|
return myPB;
|
|
}
|
|
//
|
|
virtual void Perform() {
|
|
IntTools_ShrunkRange::Perform();
|
|
}
|
|
//
|
|
protected:
|
|
Handle(BOPDS_PaveBlock) myPB;
|
|
};
|
|
//
|
|
//=======================================================================
|
|
typedef BOPCol_NCVector
|
|
<BOPAlgo_ShrunkRange> BOPAlgo_VectorOfShrunkRange;
|
|
//
|
|
typedef BOPCol_ContextFunctor
|
|
<BOPAlgo_ShrunkRange,
|
|
BOPAlgo_VectorOfShrunkRange,
|
|
Handle(IntTools_Context),
|
|
IntTools_Context> BOPAlgo_ShrunkRangeFunctor;
|
|
//
|
|
typedef BOPCol_ContextCnt
|
|
<BOPAlgo_ShrunkRangeFunctor,
|
|
BOPAlgo_VectorOfShrunkRange,
|
|
Handle(IntTools_Context)> BOPAlgo_ShrunkRangeCnt;
|
|
//
|
|
//=======================================================================
|
|
// function: FillShrunkData
|
|
// purpose:
|
|
//=======================================================================
|
|
void BOPAlgo_PaveFiller::FillShrunkData(const TopAbs_ShapeEnum aType1,
|
|
const TopAbs_ShapeEnum aType2)
|
|
{
|
|
Standard_Integer iSize;
|
|
|
|
//
|
|
myErrorStatus=0;
|
|
//
|
|
myIterator->Initialize(aType1, aType2);
|
|
iSize=myIterator->ExpectedLength();
|
|
if (!iSize) {
|
|
return;
|
|
}
|
|
//
|
|
Standard_Boolean bJustAdd;
|
|
Standard_Integer i, nS[2], nE, nV1, nV2, aNbVSD, k;
|
|
Standard_Real aT1, aT2, aTS1, aTS2;
|
|
BOPDS_ListIteratorOfListOfPaveBlock aItLPB;
|
|
BOPCol_MapOfInteger aMI;
|
|
BOPAlgo_VectorOfShrunkRange aVSD;
|
|
TopAbs_ShapeEnum aType[2] = { aType1, aType2 };
|
|
//
|
|
for (; myIterator->More(); myIterator->Next()) {
|
|
myIterator->Value(nS[0], nS[1], bJustAdd);
|
|
if(bJustAdd) {
|
|
continue;
|
|
}
|
|
//
|
|
for (i=0; i < 2; ++i) {
|
|
nE=nS[i];
|
|
if (aType[i] != TopAbs_EDGE || !aMI.Add(nE)) {
|
|
continue;
|
|
}
|
|
//
|
|
const BOPDS_ShapeInfo& aSIE=myDS->ShapeInfo(nE);
|
|
if (aSIE.HasFlag()){
|
|
continue;
|
|
}
|
|
//
|
|
BOPDS_ListOfPaveBlock& aLPB=myDS->ChangePaveBlocks(nE);
|
|
aItLPB.Initialize(aLPB);
|
|
for (; aItLPB.More(); aItLPB.Next()) {
|
|
const Handle(BOPDS_PaveBlock)& aPB=aItLPB.ChangeValue();
|
|
if (aPB->HasShrunkData()) {
|
|
continue;
|
|
}
|
|
//
|
|
// FillShrunkData(aPB);
|
|
aPB->Indices(nV1, nV2);
|
|
aPB->Range(aT1, aT2);
|
|
//
|
|
const TopoDS_Edge& aE=(*(TopoDS_Edge *)(&aSIE.Shape()));
|
|
//
|
|
const TopoDS_Vertex& aV1=
|
|
(*(TopoDS_Vertex *)(&myDS->Shape(nV1)));
|
|
//
|
|
const TopoDS_Vertex& aV2=
|
|
(*(TopoDS_Vertex *)(&myDS->Shape(nV2)));
|
|
//
|
|
BOPAlgo_ShrunkRange& aSD=aVSD.Append1();
|
|
//
|
|
aSD.SetPaveBlock(aPB);
|
|
aSD.SetData(aE, aT1, aT2, aV1, aV2);
|
|
}
|
|
}
|
|
}
|
|
//
|
|
aNbVSD=aVSD.Extent();
|
|
//=============================================================
|
|
BOPAlgo_ShrunkRangeCnt::Perform(myRunParallel, aVSD, myContext);
|
|
//=============================================================
|
|
//
|
|
Standard_Real aFuzz = myFuzzyValue / 2.;
|
|
for (k=0; k < aNbVSD; ++k) {
|
|
BOPAlgo_ShrunkRange& aSD=aVSD(k);
|
|
if (!aSD.IsDone()) {
|
|
continue;
|
|
}
|
|
//
|
|
Handle(BOPDS_PaveBlock)& aPB=aSD.PaveBlock();
|
|
aSD.ShrunkRange(aTS1, aTS2);
|
|
Bnd_Box aBox=aSD.BndBox();
|
|
aBox.SetGap(aBox.GetGap() + aFuzz);
|
|
Standard_Boolean bIsSplittable = aSD.IsSplittable();
|
|
//
|
|
aPB->SetShrunkData(aTS1, aTS2, aBox, bIsSplittable);
|
|
}
|
|
}
|