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

0032644: Modeling Algorithms - Empty result of section operation

Browse Source 
Use distance criteria additionally to parameter criteria when verifying the extrema solution to belong to the edge boundary.
Refactor the BRepExtrema_DistanceSS class to remove the excessive methods with mirrored parameters.
This commit is contained in:
emv 2021-10-28 11:07:05 +03:00 committed by smoskvin
parent f32cb549d8
commit bcecb5832b
4 changed files with 625 additions and 828 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dox/upgrade/upgrade.md
View File

@ -2300,6 +2300,10 @@ void Perform(const Handle(Adaptor3d_CurveOnSurface)& theCurveOnSurface,
Building OCCT now requires C++11-compliant compiler, so that some legacy compilers (Visual Studio 2010 and 2012) are no more supported. Building OCCT now requires C++11-compliant compiler, so that some legacy compilers (Visual Studio 2010 and 2012) are no more supported.
It is recommended using Visual Studio 2015 or newer for building OCCT on Windows platform. It is recommended using Visual Studio 2015 or newer for building OCCT on Windows platform.
@subsection upgrade_770_removed_features Removed features
* One of the constructors of the BRepExtrema_DistanceSS class (the one without deflection parameter) has been removed as excessive. The remaining constructor has to be used instead.
@subsection upgrade_occt770_parallel_flag_removed Removed parameter theIsParallel from Put/Compute/Perform @subsection upgrade_occt770_parallel_flag_removed Removed parameter theIsParallel from Put/Compute/Perform
theIsParallel parameter has been removed from Put/Compute/Perform from the next classes: theIsParallel parameter has been removed from Put/Compute/Perform from the next classes:

1266
src/BRepExtrema/BRepExtrema_DistanceSS.cxx
View File

File diff suppressed because it is too large Load Diff

161
src/BRepExtrema/BRepExtrema_DistanceSS.hxx
View File

@ -26,111 +26,116 @@ class TopoDS_Vertex;
class TopoDS_Edge; class TopoDS_Edge;
class TopoDS_Face; class TopoDS_Face;
//! This class allows to compute minimum distance between two brep shapes
//! This class allows to compute minimum distance between two shapes <br> //! (face edge vertex) and is used in DistShapeShape class.
//! (face edge vertex) and is used in DistShapeShape class. <br>
class BRepExtrema_DistanceSS class BRepExtrema_DistanceSS
{ {
public: public:
DEFINE_STANDARD_ALLOC DEFINE_STANDARD_ALLOC
//! computes the distance between two Shapes ( face edge vertex). <br> public: //! @name Constructor from two shapes
BRepExtrema_DistanceSS(const TopoDS_Shape& S1, const TopoDS_Shape& S2,
const Bnd_Box& B1, const Bnd_Box& B2, //! Computes the distance between two Shapes (face edge vertex).
const Standard_Real DstRef, //! @param theS1 - First shape
const Extrema_ExtFlag F = Extrema_ExtFlag_MINMAX, //! @param theS2 - Second shape
const Extrema_ExtAlgo A = Extrema_ExtAlgo_Grad) //! @param theBox1 - Bounding box of first shape
: myDstRef(DstRef), myModif(Standard_False), myEps(Precision::Confusion()), myFlag(F), myAlgo(A) //! @param theBox2 - Bounding box of second shape
//! @param theDstRef - Initial distance between the shapes to start with
//! @param theDeflection - Maximum deviation of extreme distances from the minimum
//! one (default is Precision::Confusion()).
//! @param theExtFlag - Specifies which extrema solutions to look for
//! (default is MINMAX, applied only to point-face extrema)
//! @param theExtAlgo - Specifies which extrema algorithm is to be used
//! (default is Grad algo, applied only to point-face extrema)
BRepExtrema_DistanceSS(const TopoDS_Shape& theS1, const TopoDS_Shape& theS2,
const Bnd_Box& theBox1, const Bnd_Box& theBox2,
const Standard_Real theDstRef,
const Standard_Real theDeflection = Precision::Confusion(),
const Extrema_ExtFlag theExtFlag = Extrema_ExtFlag_MINMAX,
const Extrema_ExtAlgo theExtAlgo = Extrema_ExtAlgo_Grad)
:
myDstRef(theDstRef),
myModif(Standard_False),
myEps(theDeflection),
myFlag(theExtFlag),
myAlgo(theExtAlgo)
{ {
Perform(S1, S2, B1, B2); Perform(theS1, theS2, theBox1, theBox2);
} }
//! computes the distance between two Shapes ( face edge vertex). <br>
//! Parameter theDeflection is used to specify a maximum deviation <br> public: //! @name Results
//! of extreme distances from the minimum one. <br>
//! Default value is Precision::Confusion(). <br> //! Returns true if the distance has been computed, false otherwise.
BRepExtrema_DistanceSS(const TopoDS_Shape& S1, const TopoDS_Shape& S2,
const Bnd_Box& B1, const Bnd_Box& B2,
const Standard_Real DstRef, const Standard_Real aDeflection,
const Extrema_ExtFlag F = Extrema_ExtFlag_MINMAX,
const Extrema_ExtAlgo A = Extrema_ExtAlgo_Grad)
: myDstRef(DstRef), myModif(Standard_False), myEps(aDeflection), myFlag(F), myAlgo(A)
{
Perform(S1, S2, B1, B2);
}
//! True if the distance has been computed <br>
Standard_Boolean IsDone() const Standard_Boolean IsDone() const
{ {
return myModif; return myModif;
} }
//! returns the distance value <br>
//! Returns the distance value.
Standard_Real DistValue() const Standard_Real DistValue() const
{ {
return myDstRef; return myDstRef;
} }
//! returns the list of solutions on the first shape <br>
//! Returns the list of solutions on the first shape.
const BRepExtrema_SeqOfSolution& Seq1Value() const const BRepExtrema_SeqOfSolution& Seq1Value() const
{ {
return SeqSolShape1; return mySeqSolShape1;
} }
//! returns the list of solutions on the second shape <br>
//! Returns the list of solutions on the second shape.
const BRepExtrema_SeqOfSolution& Seq2Value() const const BRepExtrema_SeqOfSolution& Seq2Value() const
{ {
return SeqSolShape2; return mySeqSolShape2;
}
//! sets the flag controlling minimum and maximum search
void SetFlag(const Extrema_ExtFlag F)
{
myFlag = F;
}
//! sets the flag controlling ...
void SetAlgo(const Extrema_ExtAlgo A)
{
myAlgo = A;
} }
private: private: //! @name private methods performing the search
//! computes the distance between two Shapes ( face edge vertex) <br> //! Computes the distance between two Shapes (face edge vertex).
Standard_EXPORT void Perform(const TopoDS_Shape& S1,const TopoDS_Shape& S2,const Bnd_Box& B1,const Bnd_Box& B2); //! General method to sort out the shape types and call the specific method.
Standard_EXPORT void Perform(const TopoDS_Shape& theS1, const TopoDS_Shape& theS2,
const Bnd_Box& theBox1, const Bnd_Box& theBox2);
//! computes the distance between two vertices <br> //! Computes the distance between two vertices.
void Perform(const TopoDS_Vertex& S1,const TopoDS_Vertex& S2); void Perform(const TopoDS_Vertex& S1, const TopoDS_Vertex& S2,
//! computes the minimum distance between a vertex and an edge <br> BRepExtrema_SeqOfSolution& theSeqSolShape1,
void Perform(const TopoDS_Vertex& S1,const TopoDS_Edge& S2,const Bnd_Box& B1,const Bnd_Box& B2); BRepExtrema_SeqOfSolution& theSeqSolShape2);
//! computes the minimum distance between a vertex and a face <br>
void Perform(const TopoDS_Vertex& S1,const TopoDS_Face& S2,const Bnd_Box& B1,const Bnd_Box& B2);
//! computes the minimum distance between an edge and a vertex <br> //! Computes the minimum distance between a vertex and an edge.
void Perform(const TopoDS_Edge& S1,const TopoDS_Vertex& S2,const Bnd_Box& B1,const Bnd_Box& B2); void Perform(const TopoDS_Vertex& theS1, const TopoDS_Edge& theS2,
/*{ BRepExtrema_SeqOfSolution& theSeqSolShape1,
Perform(S2, S1, B2, B1); BRepExtrema_SeqOfSolution& theSeqSolShape2);
}*/
//! computes the minimum distance between two edges <br>
void Perform(const TopoDS_Edge& S1,const TopoDS_Edge& S2,const Bnd_Box& B1,const Bnd_Box& B2);
//! computes the minimum distance an edge and a face <br>
void Perform(const TopoDS_Edge& S1,const TopoDS_Face& S2,const Bnd_Box& B1,const Bnd_Box& B2);
//! computes the minimum distance betwwen a face and a vertex <br> //! Computes the minimum distance between a vertex and a face.
void Perform(const TopoDS_Face& S1,const TopoDS_Vertex& S2,const Bnd_Box& B1,const Bnd_Box& B2); void Perform(const TopoDS_Vertex& theS1, const TopoDS_Face& theS2,
/*{ BRepExtrema_SeqOfSolution& theSeqSolShape1,
Perform(S2, S1, B2, B1); BRepExtrema_SeqOfSolution& theSeqSolShape2);
}*/
//! computes the minimum distance between a face and an edge <br>
void Perform(const TopoDS_Face& S1,const TopoDS_Edge& S2,const Bnd_Box& B1,const Bnd_Box& B2);
/*{
Perform(S2, S1, B2, B1);
}*/
//! computes the minimum distance between two faces <br>
void Perform(const TopoDS_Face& S1,const TopoDS_Face& S2,const Bnd_Box& B1,const Bnd_Box& B2);
BRepExtrema_SeqOfSolution SeqSolShape1; //! Computes the minimum distance between two edges.
BRepExtrema_SeqOfSolution SeqSolShape2; void Perform(const TopoDS_Edge& theS1, const TopoDS_Edge& theS2,
Standard_Real myDstRef; BRepExtrema_SeqOfSolution& theSeqSolShape1,
Standard_Boolean myModif; BRepExtrema_SeqOfSolution& theSeqSolShape2);
Standard_Real myEps;
Extrema_ExtFlag myFlag; //! Computes the minimum distance between an edge and a face.
Extrema_ExtAlgo myAlgo; void Perform(const TopoDS_Edge& theS1, const TopoDS_Face& theS2,
BRepExtrema_SeqOfSolution& theSeqSolShape1,
BRepExtrema_SeqOfSolution& theSeqSolShape2);
//! Computes the minimum distance between two faces.
void Perform(const TopoDS_Face& theS1, const TopoDS_Face& theS2,
BRepExtrema_SeqOfSolution& theSeqSolShape1,
BRepExtrema_SeqOfSolution& theSeqSolShape2);
private: //! @name Fields
BRepExtrema_SeqOfSolution mySeqSolShape1; //!< Solutions on the first shape
BRepExtrema_SeqOfSolution mySeqSolShape2; //!< Solutions on the second shape
Standard_Real myDstRef; //!< The minimal distance found
Standard_Boolean myModif; //!< Flag indicating whether the solution was improved or not
Standard_Real myEps; //!< Deflection
Extrema_ExtFlag myFlag; //!< Extrema flag indicating what solutions to look for
Extrema_ExtAlgo myAlgo; //!< Extrema algo to be used to look for solutions
}; };
#endif #endif

22
tests/bugs/modalg_7/bug32644 Normal file
View File

@ -0,0 +1,22 @@
puts "================================================="
puts "OCC32644: Modeling Algorithms - Empty result of section operation"
puts "================================================="
puts ""
restore [locate_data_file bug32644_face.brep] f
restore [locate_data_file bug32644_wire.brep] w
bclearobjects
bcleartools
baddobjects f
baddtools w
bfillds
bbop result 4
checkprops result -l 2.06
checksection result -r 2
checknbshapes result -edge 2
bsplit rsplit
checkshape rsplit
checknbshapes rsplit -face 2