mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-03 17:56:21 +03:00
3510db6201
0026796: The result of General Fuse operation is self-intersecting shape The fix forces creation of new sub-shapes (vertex, edge) when the tolerance of some sub-shape of an argument is to be increased. This new behavior is turned off by default. It can be turned on using two ways: 1) Setting 'locking' flag of the arguments. 2) Calling the method SetNonDestructive(Standard_True) of the API classes. Various bug fixes in the algorithm: - Compute correct tolerance values for intersections of type Line/Line, Line/Plane, Plane/Plane. - In case of Line/Plane intersection check if line's vertices lie on the plane. - Do not allow decreasing of the tolerance value of the Line/Line intersection vertex. - In IntTools_EdgeEdge, call the method FindParameters with proper 3D tolerance of the curve. - Force making copy of a degenerated edge if its vertex is touched but no 2D intersection with other curves is found. - Remove pave blocks both ends of which became referring to the same vertex after vertices substitution. - Avoid exception in IntTools_Context::IsVertexOnLine if Extrema is not done. - Reduce tolerance of vertex/edge using actual distances to interfered shapes if it was increased due to line/line, line/plane, or plane/plane small intersection angle. - Update tolerance of edges to reach all representations in a common block. - In V-E intersections, check if a vertex hits beyond shrunk range, in such case create V-V interference. - Do not put a section edge to the result if it becomes to be a micro edge after updating its vertex. - Correctly make vertices same-domain during the work of MakeBlocks. - Decrease shrunk range at least on a Precision::Confusion() in addition to vertex tolerance. - Add Confusion to bounding boxes of new shapes in DS - Add tolerance Precision::Confusion() to compare distances of touching cases to fix regressions. TODO marks have been removed from (or modified in) the following test cases (Improvements): boolean bsection M3 N2 R2 boolean gdml_private B6 C2 C6 G7 I6 F6 J1 J4 M7 N1 N8 N9 O3 O4 O6 O8 O9 P1 P2 P5 Q1 Q3 Q5 S9 T2 U4 U5 U9 ZB5 ZB6 ZC1 ZC5 ZD3 ZD6 ZD7 ZH2 ZH5 ZI2 ZI5 ZI7 ZI9 ZJ3 ZJ4 ZJ7 F8 I6 G1 boolean volumemaker A5 A6 B3 B4 B7 B9 D3 D4 D7 F1 boolean bopcut_2d D5 bugs modalg_5 bug25043 bugs modalg_2 bug472_1 bug472_2 bug472_3 Test cases updated because they are still bad but can be accepted as non-regression: boolean volumemaker C4 A3 A7 E6 bugs modalg_1 bug10232 boolean bsection N2 Put new TODO in the scripts: bugs modalg_5 bug25232_9 bugs modalg_6 bug26619 bugs modalg_1 buc60462_2 bugs modalg_4 bug772 For the following tests the result in fix became better, so take fix result as the reference: bugs modalg_5 bug24628 bugs modalg_6 bug26954_3 boolean volumemaker A4 B5 B6 C3 C8 D2 D5 F2 bugs modalg_2 bug472_2 bugs modalg_1 buc60776_1 - Add the method SetNonDestructive to API classes of user level
176 lines
4.5 KiB
C++
176 lines
4.5 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.
|
|
|
|
#ifndef _BOPDS_CommonBlock_HeaderFile
|
|
#define _BOPDS_CommonBlock_HeaderFile
|
|
|
|
#include <Standard.hxx>
|
|
#include <Standard_Type.hxx>
|
|
|
|
#include <BOPDS_ListOfPaveBlock.hxx>
|
|
#include <BOPCol_ListOfInteger.hxx>
|
|
#include <MMgt_TShared.hxx>
|
|
#include <BOPCol_BaseAllocator.hxx>
|
|
#include <Standard_Integer.hxx>
|
|
#include <Standard_Boolean.hxx>
|
|
class BOPDS_PaveBlock;
|
|
|
|
|
|
class BOPDS_CommonBlock;
|
|
DEFINE_STANDARD_HANDLE(BOPDS_CommonBlock, MMgt_TShared)
|
|
|
|
|
|
//! The class BOPDS_CommonBlock is to store
|
|
//! the information about pave blocks that have
|
|
//! geometry coincidence (in terms of a tolerance) with
|
|
//! a) other pave block(s)
|
|
//! b) face(s)
|
|
class BOPDS_CommonBlock : public MMgt_TShared
|
|
{
|
|
|
|
public:
|
|
|
|
|
|
|
|
//! Empty contructor
|
|
Standard_EXPORT BOPDS_CommonBlock();
|
|
|
|
|
|
//! Contructor
|
|
//! <theAllocator> - the allocator to manage the memory
|
|
Standard_EXPORT BOPDS_CommonBlock(const BOPCol_BaseAllocator& theAllocator);
|
|
|
|
|
|
//! Modifier
|
|
//! Adds the pave block <aPB> to the list of pave blocks
|
|
//! of the common block
|
|
Standard_EXPORT void AddPaveBlock (const Handle(BOPDS_PaveBlock)& aPB);
|
|
|
|
|
|
//! Modifier
|
|
//! Adds the list of pave blocks <aLPB>
|
|
//! to the list of pave blocks
|
|
//! of the common block
|
|
Standard_EXPORT void AddPaveBlocks (const BOPDS_ListOfPaveBlock& aLPB);
|
|
|
|
|
|
//! Modifier
|
|
//! Adds the index of the face <aF>
|
|
//! to the list of indices of faces
|
|
//! of the common block
|
|
Standard_EXPORT void AddFace (const Standard_Integer aF);
|
|
|
|
|
|
//! Modifier
|
|
//! Sets the list of indices of faces <aLF>
|
|
//! of the common block
|
|
Standard_EXPORT void SetFaces (const BOPCol_ListOfInteger& aLF);
|
|
|
|
//! Modifier
|
|
//! Appends the list of indices of faces <aLF>
|
|
//! to the list of indices of faces
|
|
//! of the common block (the input list is emptied)
|
|
Standard_EXPORT void AppendFaces(BOPCol_ListOfInteger& aLF);
|
|
|
|
|
|
//! Selector
|
|
//! Returns the list of pave blocks
|
|
//! of the common block
|
|
Standard_EXPORT const BOPDS_ListOfPaveBlock& PaveBlocks() const;
|
|
|
|
|
|
//! Selector
|
|
//! Returns the list of indices of faces
|
|
//! of the common block
|
|
Standard_EXPORT const BOPCol_ListOfInteger& Faces() const;
|
|
|
|
|
|
//! Selector
|
|
//! Returns the first pave block
|
|
//! of the common block
|
|
Standard_EXPORT const Handle(BOPDS_PaveBlock)& PaveBlock1() const;
|
|
|
|
|
|
//! Selector
|
|
//! Returns the pave block that belongs
|
|
//! to the edge with index <theIx>
|
|
Standard_EXPORT Handle(BOPDS_PaveBlock)& PaveBlockOnEdge (const Standard_Integer theIndex);
|
|
|
|
|
|
//! Query
|
|
//! Returns true if the common block contains
|
|
//! a pave block that belongs
|
|
//! to the face with index <theIx>
|
|
Standard_EXPORT Standard_Boolean IsPaveBlockOnFace (const Standard_Integer theIndex) const;
|
|
|
|
|
|
//! Query
|
|
//! Returns true if the common block contains
|
|
//! a pave block that belongs
|
|
//! to the edge with index <theIx>
|
|
Standard_EXPORT Standard_Boolean IsPaveBlockOnEdge (const Standard_Integer theIndex) const;
|
|
|
|
|
|
//! Query
|
|
//! Returns true if the common block contains
|
|
//! a pave block that is equal to <thePB>
|
|
Standard_EXPORT Standard_Boolean Contains (const Handle(BOPDS_PaveBlock)& thePB) const;
|
|
|
|
|
|
//! Query
|
|
//! Returns true if the common block contains
|
|
//! the face with index equal to <theF>
|
|
Standard_EXPORT Standard_Boolean Contains (const Standard_Integer theF) const;
|
|
|
|
|
|
//! Modifier
|
|
//! Assign the index <theEdge> as the edge index
|
|
//! to all pave blocks of the common block
|
|
Standard_EXPORT void SetEdge (const Standard_Integer theEdge);
|
|
|
|
|
|
//! Selector
|
|
//! Returns the index of the edge
|
|
//! of all pave blocks of the common block
|
|
Standard_EXPORT Standard_Integer Edge() const;
|
|
|
|
Standard_EXPORT void Dump() const;
|
|
|
|
|
|
|
|
|
|
DEFINE_STANDARD_RTTIEXT(BOPDS_CommonBlock,MMgt_TShared)
|
|
|
|
protected:
|
|
|
|
|
|
BOPDS_ListOfPaveBlock myPaveBlocks;
|
|
BOPCol_ListOfInteger myFaces;
|
|
|
|
|
|
private:
|
|
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#endif // _BOPDS_CommonBlock_HeaderFile
|