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

0025743: Add FixMode parameter to DropSmallSolids operator

Browse Source
This commit is contained in:
imn 2015-01-23 13:31:01 +03:00 committed by bugmaster
parent b2af2f567d
commit df515f16ce
3 changed files with 50 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ShapeFix/ShapeFix_FixSmallSolid.cdl
View File

@ -25,6 +25,12 @@ is
Create returns FixSmallSolid;
---Purpose: Construct
SetFixMode (me: mutable; theMode: Integer);
---Purpose: Set working mode for operator:
-- - theMode = 0 use both WidthFactorThreshold and VolumeThreshold parameters
-- - theMode = 1 use only WidthFactorThreshold parameter
-- - theMode = 2 use only VolumeThreshold parameter
SetVolumeThreshold (me: mutable; theThreshold: Real = -1.0);
---Purpose: Set or clear volume threshold for small solids
@ -43,8 +49,13 @@ is
IsSmall (me; theSolid: Shape from TopoDS) returns Boolean is private;
IsUsedWidthFactorThreshold (me) returns Boolean is private;
IsUsedVolumeThreshold (me) returns Boolean is private;
fields
myFixMode : Integer;
myVolumeThreshold : Real;
myWidthFactorThreshold : Real;

45
src/ShapeFix/ShapeFix_FixSmallSolid.cxx
View File

@ -40,9 +40,20 @@
//purpose : Construct
//=======================================================================
ShapeFix_FixSmallSolid::ShapeFix_FixSmallSolid()
: myVolumeThreshold (Precision::Infinite())
: myFixMode (0)
, myVolumeThreshold (Precision::Infinite())
, myWidthFactorThreshold (Precision::Infinite()) {}
//=======================================================================
//function : SetFixMode
//purpose : Set the mode for applying fixes of small solids.
//=======================================================================
void ShapeFix_FixSmallSolid::SetFixMode (
const Standard_Integer theMode)
{
myFixMode = (theMode < 0 || theMode > 2) ? 0 : theMode;
}
//=======================================================================
//function : SetVolumeThreshold
//purpose : Set or clear volume threshold for small solids
@ -495,8 +506,8 @@ TopoDS_Shape ShapeFix_FixSmallSolid::Merge (
//=======================================================================
Standard_Boolean ShapeFix_FixSmallSolid::IsThresholdsSet() const
{
return myVolumeThreshold < Precision::Infinite()
|| myWidthFactorThreshold < Precision::Infinite();
return (IsUsedVolumeThreshold() && myVolumeThreshold < Precision::Infinite()) ||
(IsUsedWidthFactorThreshold() && myWidthFactorThreshold < Precision::Infinite());
}
//=======================================================================
@ -506,16 +517,16 @@ Standard_Boolean ShapeFix_FixSmallSolid::IsThresholdsSet() const
Standard_Boolean ShapeFix_FixSmallSolid::IsSmall (const TopoDS_Shape& theSolid)
const
{
// If the volume threshold is set and the solid's volume exceeds it,
// consider the solid as not small
// If the volume threshold is used and set, and the solid's volume exceeds
// threshold value, consider the solid as not small
Standard_Real aVolume = ShapeVolume (theSolid);
if (aVolume > myVolumeThreshold)
if (IsUsedVolumeThreshold() && aVolume > myVolumeThreshold)
return Standard_False;
// If the width factor threshold is set
// and the solid's width factor exceeds it
// If the width factor threshold is used and set,
// and the solid's width factor exceeds threshold value,
// consider the solid as not small
if (myWidthFactorThreshold < Precision::Infinite())
if (IsUsedWidthFactorThreshold() && myWidthFactorThreshold < Precision::Infinite())
{
Standard_Real anArea = ShapeArea (theSolid);
if (aVolume > myWidthFactorThreshold * anArea * 0.5)
@ -525,3 +536,19 @@ Standard_Boolean ShapeFix_FixSmallSolid::IsSmall (const TopoDS_Shape& theSolid)
// Both thresholds are met - consider the solid as small
return Standard_True;
}
//=======================================================================
//function : IsUsedWidthFactorThreshold
//purpose : Check if width factor threshold criterion is used
//=======================================================================
Standard_Boolean ShapeFix_FixSmallSolid::IsUsedWidthFactorThreshold() const
{
return myFixMode == 0 || myFixMode == 1;
}
//=======================================================================
//function : IsUsedVolumeThreshold
//purpose : Check if volume threshold criterion is used
//=======================================================================
Standard_Boolean ShapeFix_FixSmallSolid::IsUsedVolumeThreshold() const
{
return myFixMode == 0 || myFixMode == 2;
}

3
src/ShapeProcess/ShapeProcess_OperLibrary.cxx
View File

@ -600,6 +600,9 @@ static Standard_Boolean dropsmallsolids (const Handle(ShapeProcess_Context)& con
FSS.SetMsgRegistrator( msg );
Standard_Real aThreshold;
Standard_Integer aMode;
if (ctx->GetInteger ("FixMode", aMode))
FSS.SetFixMode (aMode);
if (ctx->GetReal ("VolumeThreshold", aThreshold))
FSS.SetVolumeThreshold (aThreshold);
if (ctx->GetReal ("WidthFactorThreshold", aThreshold))