mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-09 18:50:54 +03:00
0024572: Improvement performance of BRepExtrema_DistShapeShape
Fix compilations issues. Fix compilation issues with GCC.
This commit is contained in:
dbp
apn
parent
11500a8529
commit
762b6cecec
@ -35,82 +35,164 @@
|
||||
#include <BRepExtrema_UnCompatibleShape.hxx>
|
||||
#include <BRep_Tool.hxx>
|
||||
#include <BRepClass3d_SolidClassifier.hxx>
|
||||
#include <NCollection_Comparator.hxx>
|
||||
#include <NCollection_QuickSort.hxx>
|
||||
#include <NCollection_Vector.hxx>
|
||||
#include <StdFail_NotDone.hxx>
|
||||
|
||||
static void Decomposition(const TopoDS_Shape& S,
|
||||
TopTools_IndexedMapOfShape& MapV,
|
||||
TopTools_IndexedMapOfShape& MapE,
|
||||
TopTools_IndexedMapOfShape& MapF)
|
||||
namespace
|
||||
{
|
||||
MapV.Clear();
|
||||
MapE.Clear();
|
||||
MapF.Clear();
|
||||
TopExp::MapShapes(S,TopAbs_VERTEX,MapV);
|
||||
TopExp::MapShapes(S,TopAbs_EDGE,MapE);
|
||||
TopExp::MapShapes(S,TopAbs_FACE,MapF);
|
||||
}
|
||||
|
||||
static void BoxCalculation(const TopTools_IndexedMapOfShape& Map,
|
||||
Bnd_SeqOfBox& SBox)
|
||||
{
|
||||
for (Standard_Integer i = 1; i <= Map.Extent(); i++)
|
||||
static void Decomposition(const TopoDS_Shape& S,
|
||||
TopTools_IndexedMapOfShape& MapV,
|
||||
TopTools_IndexedMapOfShape& MapE,
|
||||
TopTools_IndexedMapOfShape& MapF)
|
||||
{
|
||||
Bnd_Box box;
|
||||
BRepBndLib::Add(Map(i), box);
|
||||
SBox.Append(box);
|
||||
MapV.Clear();
|
||||
MapE.Clear();
|
||||
MapF.Clear();
|
||||
TopExp::MapShapes(S,TopAbs_VERTEX,MapV);
|
||||
TopExp::MapShapes(S,TopAbs_EDGE,MapE);
|
||||
TopExp::MapShapes(S,TopAbs_FACE,MapF);
|
||||
}
|
||||
|
||||
static void BoxCalculation(const TopTools_IndexedMapOfShape& Map,
|
||||
Bnd_SeqOfBox& SBox)
|
||||
{
|
||||
for (Standard_Integer i = 1; i <= Map.Extent(); i++)
|
||||
{
|
||||
Bnd_Box box;
|
||||
BRepBndLib::Add(Map(i), box);
|
||||
SBox.Append(box);
|
||||
}
|
||||
}
|
||||
|
||||
inline Standard_Real DistanceInitiale(const TopoDS_Vertex V1,
|
||||
const TopoDS_Vertex V2)
|
||||
{
|
||||
return (BRep_Tool::Pnt(V1).Distance(BRep_Tool::Pnt(V2)));
|
||||
}
|
||||
|
||||
//! Pair of objects to check extrema.
|
||||
struct BRepExtrema_CheckPair
|
||||
{
|
||||
Standard_Integer Index1; //!< Index of the 1st sub-shape
|
||||
Standard_Integer Index2; //!< Index of the 2nd sub-shape
|
||||
Standard_Real Distance; //!< Distance between sub-shapes
|
||||
|
||||
//! Uninitialized constructor for collection.
|
||||
BRepExtrema_CheckPair() {}
|
||||
|
||||
//! Creates new pair of sub-shapes.
|
||||
BRepExtrema_CheckPair (Standard_Integer theIndex1,
|
||||
Standard_Integer theIndex2,
|
||||
Standard_Real theDistance)
|
||||
: Index1 (theIndex1),
|
||||
Index2 (theIndex2),
|
||||
Distance (theDistance) {}
|
||||
};
|
||||
}
|
||||
|
||||
inline Standard_Real DistanceInitiale(const TopoDS_Vertex V1,
|
||||
const TopoDS_Vertex V2)
|
||||
template<>
|
||||
class NCollection_Comparator<BRepExtrema_CheckPair>
|
||||
{
|
||||
return (BRep_Tool::Pnt(V1).Distance(BRep_Tool::Pnt(V2)));
|
||||
}
|
||||
public:
|
||||
|
||||
Standard_Boolean IsLower (const BRepExtrema_CheckPair& theLeft, const BRepExtrema_CheckPair& theRight) const
|
||||
{
|
||||
return theLeft.Distance < theRight.Distance;
|
||||
}
|
||||
|
||||
Standard_Boolean IsGreater (const BRepExtrema_CheckPair& theLeft, const BRepExtrema_CheckPair& theRight) const
|
||||
{
|
||||
return theLeft.Distance > theRight.Distance;
|
||||
}
|
||||
|
||||
Standard_Boolean IsEqual (const BRepExtrema_CheckPair& theLeft, const BRepExtrema_CheckPair& theRight) const
|
||||
{
|
||||
return theLeft.Distance == theRight.Distance;
|
||||
}
|
||||
|
||||
Standard_Boolean IsLowerEqual (const BRepExtrema_CheckPair& theLeft, const BRepExtrema_CheckPair& theRight) const
|
||||
{
|
||||
return theLeft.Distance <= theRight.Distance;
|
||||
}
|
||||
|
||||
Standard_Boolean IsGreaterEqual (const BRepExtrema_CheckPair& theLeft, const BRepExtrema_CheckPair& theRight) const
|
||||
{
|
||||
return theLeft.Distance >= theRight.Distance;
|
||||
}
|
||||
};
|
||||
|
||||
//=======================================================================
|
||||
//function : DistanceMapMap
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
|
||||
void BRepExtrema_DistShapeShape::DistanceMapMap(const TopTools_IndexedMapOfShape& Map1,
|
||||
const TopTools_IndexedMapOfShape& Map2,
|
||||
const Bnd_SeqOfBox& LBox1,
|
||||
const Bnd_SeqOfBox& LBox2)
|
||||
void BRepExtrema_DistShapeShape::DistanceMapMap (const TopTools_IndexedMapOfShape& theMap1,
|
||||
const TopTools_IndexedMapOfShape& theMap2,
|
||||
const Bnd_SeqOfBox& theLBox1,
|
||||
const Bnd_SeqOfBox& theLBox2)
|
||||
{
|
||||
Standard_Integer i, j;
|
||||
BRepExtrema_SeqOfSolution seq1, seq2;
|
||||
|
||||
const Standard_Integer n1 = Map1.Extent();
|
||||
const Standard_Integer n2 = Map2.Extent();
|
||||
for (i = 1; i <= n1; i++)
|
||||
NCollection_Vector<BRepExtrema_CheckPair> aPairList;
|
||||
const Standard_Integer aCount1 = theMap1.Extent();
|
||||
const Standard_Integer aCount2 = theMap2.Extent();
|
||||
for (Standard_Integer anIdx1 = 1; anIdx1 <= aCount1; ++anIdx1)
|
||||
{
|
||||
const Bnd_Box &box1 = LBox1.Value(i);
|
||||
const TopoDS_Shape &S1 = Map1(i);
|
||||
for (j = 1; j <= n2; j++)
|
||||
for (Standard_Integer anIdx2 = 1; anIdx2 <= aCount2; ++anIdx2)
|
||||
{
|
||||
const Bnd_Box &box2= LBox2.Value(j);
|
||||
const TopoDS_Shape &S2 = Map2(j);
|
||||
const Standard_Real aDist = theLBox1.Value (anIdx1).Distance (theLBox2.Value (anIdx2));
|
||||
if (aDist < myDistRef - myEps || fabs (aDist - myDistRef) < myEps)
|
||||
{
|
||||
aPairList.Append (BRepExtrema_CheckPair (anIdx1, anIdx2, aDist));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
BRepExtrema_DistanceSS dist(S1,S2,box1,box2,myDistRef,myEps);
|
||||
if (dist.IsDone()) {
|
||||
if(dist.DistValue() < (myDistRef-myEps))
|
||||
NCollection_QuickSort<NCollection_Vector<BRepExtrema_CheckPair>, BRepExtrema_CheckPair>::Perform (aPairList, NCollection_Comparator<BRepExtrema_CheckPair>(),
|
||||
aPairList.Lower(), aPairList.Upper());
|
||||
for (NCollection_Vector<BRepExtrema_CheckPair>::Iterator aPairIter (aPairList);
|
||||
aPairIter.More(); aPairIter.Next())
|
||||
{
|
||||
const BRepExtrema_CheckPair& aPair = aPairIter.Value();
|
||||
if (aPair.Distance > myDistRef + myEps)
|
||||
{
|
||||
break; // early search termination
|
||||
}
|
||||
|
||||
const Bnd_Box& aBox1 = theLBox1.Value (aPair.Index1);
|
||||
const Bnd_Box& aBox2 = theLBox2.Value (aPair.Index2);
|
||||
|
||||
const TopoDS_Shape& aShape1 = theMap1 (aPair.Index1);
|
||||
const TopoDS_Shape& aShape2 = theMap2 (aPair.Index2);
|
||||
|
||||
BRepExtrema_DistanceSS aDistTool (aShape1, aShape2, aBox1, aBox2, myDistRef, myEps);
|
||||
if (aDistTool.IsDone())
|
||||
{
|
||||
if (aDistTool.DistValue() < myDistRef - myEps)
|
||||
{
|
||||
mySolutionsShape1.Clear();
|
||||
mySolutionsShape2.Clear();
|
||||
|
||||
BRepExtrema_SeqOfSolution aSeq1 = aDistTool.Seq1Value();
|
||||
BRepExtrema_SeqOfSolution aSeq2 = aDistTool.Seq2Value();
|
||||
|
||||
mySolutionsShape1.Append (aSeq1);
|
||||
mySolutionsShape2.Append (aSeq2);
|
||||
|
||||
myDistRef = aDistTool.DistValue();
|
||||
}
|
||||
else if (fabs (aDistTool.DistValue() - myDistRef) < myEps)
|
||||
{
|
||||
BRepExtrema_SeqOfSolution aSeq1 = aDistTool.Seq1Value();
|
||||
BRepExtrema_SeqOfSolution aSeq2 = aDistTool.Seq2Value();
|
||||
|
||||
mySolutionsShape1.Append (aSeq1);
|
||||
mySolutionsShape2.Append (aSeq2);
|
||||
|
||||
if (myDistRef > aDistTool.DistValue())
|
||||
{
|
||||
mySolutionsShape1.Clear();
|
||||
mySolutionsShape2.Clear();
|
||||
seq1= dist.Seq1Value();
|
||||
seq2= dist.Seq2Value();
|
||||
mySolutionsShape1.Append(seq1);
|
||||
mySolutionsShape2.Append(seq2);
|
||||
myDistRef=dist.DistValue();
|
||||
}
|
||||
else if(fabs(dist.DistValue()-myDistRef) < myEps)
|
||||
{
|
||||
seq1= dist.Seq1Value();
|
||||
seq2= dist.Seq2Value();
|
||||
mySolutionsShape1.Append(seq1);
|
||||
mySolutionsShape2.Append(seq2);
|
||||
if (myDistRef > dist.DistValue())
|
||||
myDistRef=dist.DistValue();
|
||||
myDistRef = aDistTool.DistValue();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -123,13 +205,16 @@ void BRepExtrema_DistShapeShape::DistanceMapMap(const TopTools_IndexedMapOfShape
|
||||
//=======================================================================
|
||||
|
||||
BRepExtrema_DistShapeShape::BRepExtrema_DistShapeShape()
|
||||
: myDistRef(0.),
|
||||
myIsDone(Standard_False),
|
||||
myInnerSol(Standard_False),
|
||||
myEps(Precision::Confusion()),
|
||||
myFlag(Extrema_ExtFlag_MINMAX),
|
||||
myAlgo(Extrema_ExtAlgo_Grad)
|
||||
: myDistRef (0.0),
|
||||
myIsDone (Standard_False),
|
||||
myInnerSol (Standard_False),
|
||||
myEps (Precision::Confusion()),
|
||||
myIsInitS1 (Standard_False),
|
||||
myIsInitS2 (Standard_False),
|
||||
myFlag (Extrema_ExtFlag_MINMAX),
|
||||
myAlgo (Extrema_ExtAlgo_Grad)
|
||||
{
|
||||
//
|
||||
}
|
||||
|
||||
//=======================================================================
|
||||
@ -140,12 +225,14 @@ BRepExtrema_DistShapeShape::BRepExtrema_DistShapeShape(const TopoDS_Shape& Shape
|
||||
const TopoDS_Shape& Shape2,
|
||||
const Extrema_ExtFlag F,
|
||||
const Extrema_ExtAlgo A)
|
||||
: myDistRef(0.),
|
||||
myIsDone(Standard_False),
|
||||
myInnerSol(Standard_False),
|
||||
myEps(Precision::Confusion()),
|
||||
myFlag(F),
|
||||
myAlgo(A)
|
||||
: myDistRef (0.0),
|
||||
myIsDone (Standard_False),
|
||||
myInnerSol (Standard_False),
|
||||
myEps (Precision::Confusion()),
|
||||
myIsInitS1 (Standard_False),
|
||||
myIsInitS2 (Standard_False),
|
||||
myFlag (F),
|
||||
myAlgo (A)
|
||||
{
|
||||
LoadS1(Shape1);
|
||||
LoadS2(Shape2);
|
||||
@ -162,12 +249,14 @@ BRepExtrema_DistShapeShape::BRepExtrema_DistShapeShape(const TopoDS_Shape& Shape
|
||||
const Standard_Real theDeflection,
|
||||
const Extrema_ExtFlag F,
|
||||
const Extrema_ExtAlgo A)
|
||||
: myDistRef(0.),
|
||||
myIsDone(Standard_False),
|
||||
myInnerSol(Standard_False),
|
||||
myEps(theDeflection),
|
||||
myFlag(F),
|
||||
myAlgo(A)
|
||||
: myDistRef (0.0),
|
||||
myIsDone (Standard_False),
|
||||
myInnerSol (Standard_False),
|
||||
myEps (theDeflection),
|
||||
myIsInitS1 (Standard_False),
|
||||
myIsInitS2 (Standard_False),
|
||||
myFlag (F),
|
||||
myAlgo (A)
|
||||
{
|
||||
LoadS1(Shape1);
|
||||
LoadS2(Shape2);
|
||||
@ -179,10 +268,11 @@ BRepExtrema_DistShapeShape::BRepExtrema_DistShapeShape(const TopoDS_Shape& Shape
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
|
||||
void BRepExtrema_DistShapeShape::LoadS1(const TopoDS_Shape& Shape1)
|
||||
void BRepExtrema_DistShapeShape::LoadS1 (const TopoDS_Shape& Shape1)
|
||||
{
|
||||
myShape1 = Shape1;
|
||||
Decomposition(Shape1, myMapV1, myMapE1, myMapF1);
|
||||
myIsInitS1 = Standard_False;
|
||||
Decomposition (Shape1, myMapV1, myMapE1, myMapF1);
|
||||
}
|
||||
|
||||
//=======================================================================
|
||||
@ -190,10 +280,11 @@ void BRepExtrema_DistShapeShape::LoadS1(const TopoDS_Shape& Shape1)
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
|
||||
void BRepExtrema_DistShapeShape::LoadS2(const TopoDS_Shape& Shape2)
|
||||
void BRepExtrema_DistShapeShape::LoadS2 (const TopoDS_Shape& Shape2)
|
||||
{
|
||||
myShape2 = Shape2;
|
||||
Decomposition(Shape2, myMapV2, myMapE2, myMapF2);
|
||||
myIsInitS2 = Standard_False;
|
||||
Decomposition (Shape2, myMapV2, myMapE2, myMapF2);
|
||||
}
|
||||
|
||||
//=======================================================================
|
||||
@ -212,7 +303,6 @@ Standard_Boolean BRepExtrema_DistShapeShape::Perform()
|
||||
return Standard_False;
|
||||
|
||||
TopoDS_Vertex V;
|
||||
Bnd_SeqOfBox BV1, BV2, BE1, BE2, BF1, BF2;
|
||||
const Standard_Real tol = 0.001;
|
||||
|
||||
// Treatment of solids
|
||||
@ -262,16 +352,35 @@ Standard_Boolean BRepExtrema_DistShapeShape::Perform()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (!myInnerSol)
|
||||
{
|
||||
BoxCalculation(myMapV1,BV1);
|
||||
BoxCalculation(myMapE1,BE1);
|
||||
BoxCalculation(myMapF1,BF1);
|
||||
BoxCalculation(myMapV2,BV2);
|
||||
BoxCalculation(myMapE2,BE2);
|
||||
BoxCalculation(myMapF2,BF2);
|
||||
|
||||
if (!myIsInitS1) // rebuild cached data for 1st shape
|
||||
{
|
||||
myBV1.Clear();
|
||||
myBE1.Clear();
|
||||
myBF1.Clear();
|
||||
|
||||
BoxCalculation (myMapV1, myBV1);
|
||||
BoxCalculation (myMapE1, myBE1);
|
||||
BoxCalculation (myMapF1, myBF1);
|
||||
|
||||
myIsInitS1 = Standard_True;
|
||||
}
|
||||
|
||||
if (!myIsInitS2) // rebuild cached data for 2nd shape
|
||||
{
|
||||
myBV2.Clear();
|
||||
myBE2.Clear();
|
||||
myBF2.Clear();
|
||||
|
||||
BoxCalculation (myMapV2, myBV2);
|
||||
BoxCalculation (myMapE2, myBE2);
|
||||
BoxCalculation (myMapF2, myBF2);
|
||||
|
||||
myIsInitS2 = Standard_True;
|
||||
}
|
||||
|
||||
if (myMapV1.Extent() && myMapV2.Extent())
|
||||
{
|
||||
TopoDS_Vertex V1 = TopoDS::Vertex(myMapV1(1));
|
||||
@ -281,17 +390,19 @@ Standard_Boolean BRepExtrema_DistShapeShape::Perform()
|
||||
else
|
||||
myDistRef= 1.e30; //szv:!!!
|
||||
|
||||
DistanceMapMap(myMapV1, myMapV2, BV1, BV2);
|
||||
DistanceMapMap(myMapV1, myMapE2, BV1, BE2);
|
||||
DistanceMapMap(myMapE1, myMapV2, BE1, BV2);
|
||||
DistanceMapMap(myMapV1, myMapF2, BV1, BF2);
|
||||
DistanceMapMap(myMapF1, myMapV2, BF1, BV2);
|
||||
DistanceMapMap(myMapE1, myMapE2, BE1, BE2);
|
||||
DistanceMapMap(myMapE1, myMapF2, BE1, BF2);
|
||||
DistanceMapMap(myMapF1, myMapE2, BF1, BE2);
|
||||
DistanceMapMap (myMapV1, myMapV2, myBV1, myBV2);
|
||||
DistanceMapMap (myMapV1, myMapE2, myBV1, myBE2);
|
||||
DistanceMapMap (myMapE1, myMapV2, myBE1, myBV2);
|
||||
DistanceMapMap (myMapV1, myMapF2, myBV1, myBF2);
|
||||
DistanceMapMap (myMapF1, myMapV2, myBF1, myBV2);
|
||||
DistanceMapMap (myMapE1, myMapE2, myBE1, myBE2);
|
||||
DistanceMapMap (myMapE1, myMapF2, myBE1, myBF2);
|
||||
DistanceMapMap (myMapF1, myMapE2, myBF1, myBE2);
|
||||
|
||||
if( (fabs(myDistRef)) > myEps )
|
||||
DistanceMapMap(myMapF1,myMapF2,BF1,BF2);
|
||||
if (fabs (myDistRef) > myEps)
|
||||
{
|
||||
DistanceMapMap (myMapF1, myMapF2, myBF1, myBF2);
|
||||
}
|
||||
|
||||
// Modified by Sergey KHROMOV - Tue Mar 6 11:55:03 2001 Begin
|
||||
Standard_Integer i = 1;
|
||||
|
||||
@ -14,20 +14,20 @@
|
||||
#ifndef _BRepExtrema_DistShapeShape_HeaderFile
|
||||
#define _BRepExtrema_DistShapeShape_HeaderFile
|
||||
|
||||
#include <Bnd_SeqOfBox.hxx>
|
||||
#include <BRepExtrema_SeqOfSolution.hxx>
|
||||
#include <BRepExtrema_SolutionElem.hxx>
|
||||
#include <BRepExtrema_SupportType.hxx>
|
||||
#include <Extrema_ExtAlgo.hxx>
|
||||
#include <Extrema_ExtFlag.hxx>
|
||||
#include <gp_Pnt.hxx>
|
||||
#include <TopoDS_Shape.hxx>
|
||||
#include <TopTools_IndexedMapOfShape.hxx>
|
||||
#include <Extrema_ExtFlag.hxx>
|
||||
#include <Extrema_ExtAlgo.hxx>
|
||||
#include <BRepExtrema_SupportType.hxx>
|
||||
#include <gp_Pnt.hxx>
|
||||
#include <Standard_OStream.hxx>
|
||||
#include <Standard_DefineAlloc.hxx>
|
||||
|
||||
class TopoDS_Shape;
|
||||
class TopTools_IndexedMapOfShape;
|
||||
class Bnd_SeqOfBox;
|
||||
|
||||
|
||||
//! This class provides tools to compute minimum distance <br>
|
||||
@ -156,8 +156,16 @@ private:
|
||||
TopTools_IndexedMapOfShape myMapE2;
|
||||
TopTools_IndexedMapOfShape myMapF1;
|
||||
TopTools_IndexedMapOfShape myMapF2;
|
||||
Standard_Boolean myIsInitS1;
|
||||
Standard_Boolean myIsInitS2;
|
||||
Extrema_ExtFlag myFlag;
|
||||
Extrema_ExtAlgo myAlgo;
|
||||
Bnd_SeqOfBox myBV1;
|
||||
Bnd_SeqOfBox myBV2;
|
||||
Bnd_SeqOfBox myBE1;
|
||||
Bnd_SeqOfBox myBE2;
|
||||
Bnd_SeqOfBox myBF1;
|
||||
Bnd_SeqOfBox myBF2;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@ -18,16 +18,12 @@
|
||||
|
||||
#include <DBRep.hxx>
|
||||
#include <BRepTest.hxx>
|
||||
#include <gp_Pnt.hxx>
|
||||
#include <TopoDS_Shape.hxx>
|
||||
#include <TopoDS_Edge.hxx>
|
||||
#include <BRepExtrema_Poly.hxx>
|
||||
#include <BRepExtrema_DistShapeShape.hxx>
|
||||
#include <BRepLib_MakeEdge.hxx>
|
||||
#include <BRepLib_MakeEdge.hxx>
|
||||
#include <BRepLib_MakeVertex.hxx>
|
||||
#include <Draw.hxx>
|
||||
#include <Draw_Interpretor.hxx>
|
||||
|
||||
//#ifdef WNT
|
||||
#include <stdio.h>
|
||||
//#endif
|
||||
@ -58,6 +54,7 @@ static Standard_Integer distance (Draw_Interpretor& di,
|
||||
DBRep::Set("distance",E);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static Standard_Integer distmini(Draw_Interpretor& di, Standard_Integer n, const char** a)
|
||||
{
|
||||
Standard_Integer i1;
|
||||
@ -124,31 +121,25 @@ static Standard_Integer distmini(Draw_Interpretor& di, Standard_Integer n, const
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
|
||||
void BRepTest::ExtremaCommands(Draw_Interpretor& theCommands)
|
||||
void BRepTest::ExtremaCommands (Draw_Interpretor& theCommands)
|
||||
{
|
||||
static Standard_Boolean done = Standard_False;
|
||||
if (done) return;
|
||||
done = Standard_True;
|
||||
static const char* aGroup = "TOPOLOGY Extrema commands";
|
||||
static Standard_Boolean isDone = Standard_False;
|
||||
if (isDone)
|
||||
{
|
||||
return;
|
||||
}
|
||||
isDone = Standard_True;
|
||||
|
||||
const char* g = "TOPOLOGY Extrema commands";
|
||||
theCommands.Add ("dist",
|
||||
"dist Shape1 Shape2",
|
||||
__FILE__,
|
||||
distance,
|
||||
aGroup);
|
||||
|
||||
theCommands.Add("dist","dist Shape1 Shape2" ,__FILE__,distance,g);
|
||||
|
||||
|
||||
theCommands.Add("distmini",
|
||||
"distmini name Shape1 Shape2",
|
||||
__FILE__,
|
||||
distmini,g);
|
||||
theCommands.Add ("distmini",
|
||||
"distmini name Shape1 Shape2",
|
||||
__FILE__,
|
||||
distmini,
|
||||
aGroup);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -14,7 +14,10 @@
|
||||
// commercial license or contractual agreement.
|
||||
|
||||
#include <QADraw.hxx>
|
||||
#include <Draw.hxx>
|
||||
#include <Draw_Interpretor.hxx>
|
||||
#include <Draw_Window.hxx>
|
||||
#include <Draw_Viewer.hxx>
|
||||
#include <Image_AlienPixMap.hxx>
|
||||
#include <V3d_View.hxx>
|
||||
#include <ViewerTest.hxx>
|
||||
@ -23,15 +26,21 @@
|
||||
#include <TColStd_ListOfInteger.hxx>
|
||||
#include <TColStd_ListIteratorOfListOfInteger.hxx>
|
||||
#include <TColStd_HSequenceOfReal.hxx>
|
||||
#include <TopoDS_Shape.hxx>
|
||||
#include <AIS_InteractiveContext.hxx>
|
||||
#include <Draw.hxx>
|
||||
#include <Draw_Window.hxx>
|
||||
#include <Draw_Viewer.hxx>
|
||||
#include <Aspect_Window.hxx>
|
||||
#include <Aspect_WindowDriver.hxx>
|
||||
#include <stdio.h>
|
||||
#include <Aspect_DisplayConnection.hxx>
|
||||
#include <Graphic3d.hxx>
|
||||
#include <Aspect_Window.hxx>
|
||||
#include <DBRep.hxx>
|
||||
#include <Bnd_Box.hxx>
|
||||
#include <BRepBndLib.hxx>
|
||||
#include <BRepExtrema_DistShapeShape.hxx>
|
||||
#include <BRepBuilderAPI_MakeVertex.hxx>
|
||||
#include <TopTools_SequenceOfShape.hxx>
|
||||
#include <TColgp_SequenceOfXYZ.hxx>
|
||||
#include <OSD_Timer.hxx>
|
||||
#include <stdio.h>
|
||||
|
||||
#if defined(_WIN32) || defined(__WIN32__)
|
||||
# include <windows.h>
|
||||
@ -236,14 +245,146 @@ static int VTrihedronOrigins(Draw_Interpretor& di,
|
||||
return 0;
|
||||
}
|
||||
|
||||
void QADraw::CommonCommands(Draw_Interpretor& theCommands)
|
||||
//=======================================================================
|
||||
//function : QATestExtremaSS
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
static Standard_Integer QATestExtremaSS (Draw_Interpretor& theInterpretor,
|
||||
Standard_Integer theArgNb,
|
||||
const char** theArgs)
|
||||
{
|
||||
if (theArgNb < 3
|
||||
|| theArgNb > 4)
|
||||
{
|
||||
std::cerr << "Usage: type help " << theArgs[0] << std::endl;
|
||||
return 1;
|
||||
}
|
||||
|
||||
// Get target shape
|
||||
TopoDS_Shape aShape = DBRep::Get (theArgs[1]);
|
||||
if (aShape.IsNull())
|
||||
{
|
||||
std::cerr << "Error: " << theArgs[1] << " shape is null\n";
|
||||
return 1;
|
||||
}
|
||||
|
||||
// Get step value
|
||||
const Standard_Real aStep = Draw::Atof (theArgs[2]);
|
||||
if (aStep <= 1e-5)
|
||||
{
|
||||
std::cerr << "Error: Step " << aStep << " is too small\n";
|
||||
return 1;
|
||||
}
|
||||
|
||||
Extrema_ExtFlag aFlag = Extrema_ExtFlag_MIN;
|
||||
if (theArgNb > 3)
|
||||
{
|
||||
Standard_Integer aVal = Draw::Atoi (theArgs[3]);
|
||||
if (aVal > 0)
|
||||
{
|
||||
aFlag = aVal == 1 ? Extrema_ExtFlag_MAX : Extrema_ExtFlag_MINMAX;
|
||||
}
|
||||
}
|
||||
|
||||
// Get bounding box of the shape
|
||||
Bnd_Box aBounds;
|
||||
BRepBndLib::Add (aShape, aBounds);
|
||||
|
||||
Standard_Real aXmin, aYmin, aZmin;
|
||||
Standard_Real aXmax, aYmax, aZmax;
|
||||
aBounds.Get (aXmin, aYmin, aZmin,
|
||||
aXmax, aYmax, aZmax);
|
||||
|
||||
const Standard_Real aScaleFactor = 1.5;
|
||||
aXmin *= aScaleFactor;
|
||||
aYmin *= aScaleFactor;
|
||||
aZmin *= aScaleFactor;
|
||||
aXmax *= aScaleFactor;
|
||||
aYmax *= aScaleFactor;
|
||||
aZmax *= aScaleFactor;
|
||||
|
||||
TopTools_SequenceOfShape aList;
|
||||
TColgp_SequenceOfXYZ aPoints;
|
||||
for (Standard_Real aX = aXmin + 0.5 * aStep; aX < aXmax; aX += aStep)
|
||||
{
|
||||
for (Standard_Real aY = aYmin + 0.5 * aStep; aY < aYmax; aY += aStep)
|
||||
{
|
||||
aList.Append (BRepBuilderAPI_MakeVertex (gp_Pnt (aX, aY, aZmin)));
|
||||
aList.Append (BRepBuilderAPI_MakeVertex (gp_Pnt (aX, aY, aZmax)));
|
||||
|
||||
aPoints.Append (gp_XYZ (aX, aY, aZmin));
|
||||
aPoints.Append (gp_XYZ (aX, aY, aZmax));
|
||||
}
|
||||
|
||||
for (Standard_Real aZ = aZmin + 0.5 * aStep; aZ < aZmax; aZ += aStep)
|
||||
{
|
||||
aList.Append (BRepBuilderAPI_MakeVertex (gp_Pnt (aX, aYmin, aZ)));
|
||||
aList.Append (BRepBuilderAPI_MakeVertex (gp_Pnt (aX, aYmax, aZ)));
|
||||
|
||||
aPoints.Append (gp_XYZ (aX, aYmin, aZ));
|
||||
aPoints.Append (gp_XYZ (aX, aYmax, aZ));
|
||||
}
|
||||
}
|
||||
|
||||
for (Standard_Real aY = aYmin + 0.5 * aStep; aY < aYmax; aY += aStep)
|
||||
{
|
||||
for (Standard_Real aZ = aZmin + 0.5 * aStep; aZ < aZmax; aZ += aStep)
|
||||
{
|
||||
aList.Append (BRepBuilderAPI_MakeVertex (gp_Pnt (aXmin, aY, aZ)));
|
||||
aList.Append (BRepBuilderAPI_MakeVertex (gp_Pnt (aXmax, aY, aZ)));
|
||||
|
||||
aPoints.Append (gp_XYZ (aXmin, aY, aZ));
|
||||
aPoints.Append (gp_XYZ (aXmax, aY, aZ));
|
||||
}
|
||||
}
|
||||
|
||||
const Standard_Integer aNbPoints = aList.Length();
|
||||
theInterpretor << "Number of sampled points: " << aNbPoints << "\n";
|
||||
|
||||
// Perform projection of points
|
||||
OSD_Timer aTimer;
|
||||
aTimer.Start();
|
||||
|
||||
// Perform projection using standard method
|
||||
BRepExtrema_DistShapeShape aTool;
|
||||
aTool.SetFlag (aFlag);
|
||||
aTool.LoadS1 (aShape);
|
||||
for (Standard_Integer anIdx = 1; anIdx <= aNbPoints; ++anIdx)
|
||||
{
|
||||
aTool.LoadS2 (aList (anIdx));
|
||||
aTool.Perform();
|
||||
}
|
||||
|
||||
aTimer.Stop();
|
||||
theInterpretor << "Test for gradient descent complete in: " << aTimer.ElapsedTime() << "\n";
|
||||
return 0;
|
||||
}
|
||||
|
||||
//=======================================================================
|
||||
//function : CommonCommands
|
||||
//purpose :
|
||||
//=======================================================================
|
||||
void QADraw::CommonCommands (Draw_Interpretor& theCommands)
|
||||
{
|
||||
const char* group = "QA_Commands";
|
||||
|
||||
theCommands.Add("QAGetPixelColor", "QAGetPixelColor coordinate_X coordinate_Y [color_R color_G color_B]", __FILE__,QAAISGetPixelColor, group);
|
||||
theCommands.Add("vtri_orig",
|
||||
"vtri_orig : vtri_orig trihedron_name - draws axis origin lines",
|
||||
__FILE__,VTrihedronOrigins,group);
|
||||
theCommands.Add ("QAGetPixelColor",
|
||||
"QAGetPixelColor coordinate_X coordinate_Y [color_R color_G color_B]",
|
||||
__FILE__,
|
||||
QAAISGetPixelColor,
|
||||
group);
|
||||
|
||||
theCommands.Add ("vtri_orig",
|
||||
"vtri_orig : vtri_orig trihedron_name - draws axis origin lines",
|
||||
__FILE__,
|
||||
VTrihedronOrigins,
|
||||
group);
|
||||
|
||||
theCommands.Add ("QATestExtremaSS",
|
||||
"QATestExtremaSS Shape Step [Flag { MIN = 0 | MAX = 1 | MINMAX = 2 }]",
|
||||
__FILE__,
|
||||
QATestExtremaSS,
|
||||
group);
|
||||
|
||||
// adding commands "rename" leads to the fact that QA commands doesn't work properly OCC23410, use function "renamevar"
|
||||
// theCommands.Add("rename","rename name1 toname1 name2 toname2 ...",__FILE__,QArename,group);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user