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

0027021: TopExp::Vertices performance optimization

Browse Source 
TopExp::Vertices optimized for sequential calls. BRep_Tool::Curve performance regression fixed. Update for fetching point done.

Casts modified to pointers

Test case for issue CR27021

gcc warnings elimination
This commit is contained in:
pdn 2015-12-21 15:41:39 +03:00 committed by bugmaster
parent 57736dfc91
commit 8447359f09
4 changed files with 302 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

234
src/BRep/BRep_Tool.cxx
View File

@ -84,7 +84,7 @@ static
const Handle(Geom_Surface)& BRep_Tool::Surface(const TopoDS_Face& F, const Handle(Geom_Surface)& BRep_Tool::Surface(const TopoDS_Face& F,
TopLoc_Location& L) TopLoc_Location& L)
{ {
Handle(BRep_TFace)& TF = *((Handle(BRep_TFace)*) &F.TShape()); const BRep_TFace* TF = static_cast<const BRep_TFace*>(F.TShape().get());
L = F.Location() * TF->Location(); L = F.Location() * TF->Location();
return TF->Surface(); return TF->Surface();
} }
@ -97,17 +97,16 @@ const Handle(Geom_Surface)& BRep_Tool::Surface(const TopoDS_Face& F,
Handle(Geom_Surface) BRep_Tool::Surface(const TopoDS_Face& F) Handle(Geom_Surface) BRep_Tool::Surface(const TopoDS_Face& F)
{ {
Handle(BRep_TFace)& TF = *((Handle(BRep_TFace)*) &F.TShape()); const BRep_TFace* TF = static_cast<const BRep_TFace*>(F.TShape().get());
TopLoc_Location L = F.Location() * TF->Location(); const Handle(Geom_Surface)& S = TF->Surface();
Handle(Geom_Surface) S = TF->Surface();
if(S.IsNull()) return S; if(S.IsNull()) return S;
Handle(Geom_Geometry) S1; TopLoc_Location L = F.Location() * TF->Location();
if (!L.IsIdentity()) { if (!L.IsIdentity()) {
S1 = S->Copy(); Handle(Geom_Geometry) aCopy = S->Transformed(L.Transformation());
S = Handle(Geom_Surface)::DownCast (S1); Geom_Surface* aGS = static_cast<Geom_Surface*>(aCopy.get());
S->Transform(L.Transformation()); return Handle(Geom_Surface)(aGS);
} }
return S; return S;
} }
@ -118,12 +117,12 @@ Handle(Geom_Surface) BRep_Tool::Surface(const TopoDS_Face& F)
// null handle if there is no triangulation. // null handle if there is no triangulation.
//======================================================================= //=======================================================================
const Handle(Poly_Triangulation)& const Handle(Poly_Triangulation)& BRep_Tool::Triangulation(const TopoDS_Face& F,
BRep_Tool::Triangulation(const TopoDS_Face& F, TopLoc_Location& L)
TopLoc_Location& L)
{ {
L = F.Location(); L = F.Location();
return (*((Handle(BRep_TFace)*)&F.TShape()))->Triangulation(); const BRep_TFace* TF = static_cast<const BRep_TFace*>(F.TShape().get());
return TF->Triangulation();
} }
//======================================================================= //=======================================================================
@ -133,7 +132,8 @@ BRep_Tool::Triangulation(const TopoDS_Face& F,
Standard_Real BRep_Tool::Tolerance(const TopoDS_Face& F) Standard_Real BRep_Tool::Tolerance(const TopoDS_Face& F)
{ {
Standard_Real p = (*((Handle(BRep_TFace)*)&F.TShape()))->Tolerance(); const BRep_TFace* TF = static_cast<const BRep_TFace*>(F.TShape().get());
Standard_Real p = TF->Tolerance();
Standard_Real pMin = Precision::Confusion(); Standard_Real pMin = Precision::Confusion();
if (p > pMin) return p; if (p > pMin) return p;
else return pMin; else return pMin;
@ -146,7 +146,8 @@ Standard_Real BRep_Tool::Tolerance(const TopoDS_Face& F)
Standard_Boolean BRep_Tool::NaturalRestriction(const TopoDS_Face& F) Standard_Boolean BRep_Tool::NaturalRestriction(const TopoDS_Face& F)
{ {
return (*((Handle(BRep_TFace)*) &F.TShape()))->NaturalRestriction(); const BRep_TFace* TF = static_cast<const BRep_TFace*>(F.TShape().get());
return TF->NaturalRestriction();
} }
//======================================================================= //=======================================================================
@ -164,13 +165,13 @@ const Handle(Geom_Curve)& BRep_Tool::Curve(const TopoDS_Edge& E,
Standard_Real& Last) Standard_Real& Last)
{ {
// find the representation // find the representation
BRep_ListIteratorOfListOfCurveRepresentation itcr const BRep_TEdge* TE = static_cast<const BRep_TEdge*>(E.TShape().get());
((*((Handle(BRep_TEdge)*)&E.TShape()))->ChangeCurves()); BRep_ListIteratorOfListOfCurveRepresentation itcr(TE->Curves());
while (itcr.More()) { while (itcr.More()) {
const Handle(BRep_CurveRepresentation)& cr = itcr.Value(); const Handle(BRep_CurveRepresentation)& cr = itcr.Value();
if (cr->IsCurve3D()) { if (cr->IsCurve3D()) {
Handle(BRep_Curve3D) GC (Handle(BRep_Curve3D)::DownCast (cr)); const BRep_Curve3D* GC = static_cast<const BRep_Curve3D*>(cr.get());
L = E.Location() * GC->Location(); L = E.Location() * GC->Location();
GC->Range(First,Last); GC->Range(First,Last);
return GC->Curve3D(); return GC->Curve3D();
@ -193,13 +194,12 @@ Handle(Geom_Curve) BRep_Tool::Curve(const TopoDS_Edge& E,
Standard_Real& Last) Standard_Real& Last)
{ {
TopLoc_Location L; TopLoc_Location L;
Handle(Geom_Curve) C = Curve(E,L,First,Last); const Handle(Geom_Curve)& C = Curve(E,L,First,Last);
if ( !C.IsNull() ) { if ( !C.IsNull() ) {
Handle(Geom_Geometry) C1;
if ( !L.IsIdentity() ) { if ( !L.IsIdentity() ) {
C1 = C->Copy(); Handle(Geom_Geometry) aCopy = C->Transformed(L.Transformation());
C = Handle(Geom_Curve)::DownCast (C1); Geom_Curve* aGC = static_cast<Geom_Curve*>(aCopy.get());
C->Transform(L.Transformation()); return Handle(Geom_Curve)(aGC);
} }
} }
return C; return C;
@ -214,8 +214,8 @@ Handle(Geom_Curve) BRep_Tool::Curve(const TopoDS_Edge& E,
Standard_Boolean BRep_Tool::IsGeometric(const TopoDS_Edge& E) Standard_Boolean BRep_Tool::IsGeometric(const TopoDS_Edge& E)
{ {
// find the representation // find the representation
BRep_ListIteratorOfListOfCurveRepresentation itcr const BRep_TEdge* TE = static_cast<const BRep_TEdge*>(E.TShape().get());
((*((Handle(BRep_TEdge)*)&E.TShape()))->ChangeCurves()); BRep_ListIteratorOfListOfCurveRepresentation itcr(TE->Curves());
while (itcr.More()) { while (itcr.More()) {
const Handle(BRep_CurveRepresentation)& cr = itcr.Value(); const Handle(BRep_CurveRepresentation)& cr = itcr.Value();
@ -243,13 +243,13 @@ const Handle(Poly_Polygon3D)& BRep_Tool::Polygon3D(const TopoDS_Edge& E,
TopLoc_Location& L) TopLoc_Location& L)
{ {
// find the representation // find the representation
BRep_ListIteratorOfListOfCurveRepresentation itcr const BRep_TEdge* TE = static_cast<const BRep_TEdge*>(E.TShape().get());
((*((Handle(BRep_TEdge)*)&E.TShape()))->ChangeCurves()); BRep_ListIteratorOfListOfCurveRepresentation itcr(TE->Curves());
while (itcr.More()) { while (itcr.More()) {
const Handle(BRep_CurveRepresentation)& cr = itcr.Value(); const Handle(BRep_CurveRepresentation)& cr = itcr.Value();
if (cr->IsPolygon3D()) { if (cr->IsPolygon3D()) {
Handle(BRep_Polygon3D) GC (Handle(BRep_Polygon3D)::DownCast (cr)); const BRep_Polygon3D* GC = static_cast<const BRep_Polygon3D*>(cr.get());
L = E.Location() * GC->Location(); L = E.Location() * GC->Location();
return GC->Polygon3D(); return GC->Polygon3D();
} }
@ -305,13 +305,13 @@ Handle(Geom2d_Curve) BRep_Tool::CurveOnSurface(const TopoDS_Edge& E,
Standard_Boolean Eisreversed = (E.Orientation() == TopAbs_REVERSED); Standard_Boolean Eisreversed = (E.Orientation() == TopAbs_REVERSED);
// find the representation // find the representation
BRep_ListIteratorOfListOfCurveRepresentation itcr const BRep_TEdge* TE = static_cast<const BRep_TEdge*>(E.TShape().get());
((*((Handle(BRep_TEdge)*)&E.TShape()))->ChangeCurves()); BRep_ListIteratorOfListOfCurveRepresentation itcr(TE->Curves());
while (itcr.More()) { while (itcr.More()) {
const Handle(BRep_CurveRepresentation)& cr = itcr.Value(); const Handle(BRep_CurveRepresentation)& cr = itcr.Value();
if (cr->IsCurveOnSurface(S,loc)) { if (cr->IsCurveOnSurface(S,loc)) {
Handle(BRep_GCurve) GC (Handle(BRep_GCurve)::DownCast (cr)); const BRep_GCurve* GC = static_cast<const BRep_GCurve*>(cr.get());
GC->Range(First,Last); GC->Range(First,Last);
if (GC->IsCurveOnClosedSurface() && Eisreversed) if (GC->IsCurveOnClosedSurface() && Eisreversed)
return GC->PCurve2(); return GC->PCurve2();
@ -401,13 +401,13 @@ void BRep_Tool::CurveOnSurface(const TopoDS_Edge& E,
Standard_Real& Last) Standard_Real& Last)
{ {
// find the representation // find the representation
BRep_ListIteratorOfListOfCurveRepresentation itcr const BRep_TEdge* TE = static_cast<const BRep_TEdge*>(E.TShape().get());
((*((Handle(BRep_TEdge)*)&E.TShape()))->ChangeCurves()); BRep_ListIteratorOfListOfCurveRepresentation itcr(TE->Curves());
while (itcr.More()) { while (itcr.More()) {
const Handle(BRep_CurveRepresentation)& cr = itcr.Value(); const Handle(BRep_CurveRepresentation)& cr = itcr.Value();
if (cr->IsCurveOnSurface()) { if (cr->IsCurveOnSurface()) {
Handle(BRep_GCurve) GC (Handle(BRep_GCurve)::DownCast (cr)); const BRep_GCurve* GC = static_cast<const BRep_GCurve*>(cr.get());
C = GC->PCurve(); C = GC->PCurve();
S = GC->Surface(); S = GC->Surface();
L = E.Location() * GC->Location(); L = E.Location() * GC->Location();
@ -439,13 +439,13 @@ void BRep_Tool::CurveOnSurface(const TopoDS_Edge& E,
Standard_Boolean Eisreversed = (E.Orientation() == TopAbs_REVERSED); Standard_Boolean Eisreversed = (E.Orientation() == TopAbs_REVERSED);
// find the representation // find the representation
BRep_ListIteratorOfListOfCurveRepresentation itcr const BRep_TEdge* TE = static_cast<const BRep_TEdge*>(E.TShape().get());
((*((Handle(BRep_TEdge)*)&E.TShape()))->ChangeCurves()); BRep_ListIteratorOfListOfCurveRepresentation itcr(TE->Curves());
while (itcr.More()) { while (itcr.More()) {
const Handle(BRep_CurveRepresentation)& cr = itcr.Value(); const Handle(BRep_CurveRepresentation)& cr = itcr.Value();
if (cr->IsCurveOnSurface()) { if (cr->IsCurveOnSurface()) {
Handle(BRep_GCurve) GC (Handle(BRep_GCurve)::DownCast (cr)); const BRep_GCurve* GC = static_cast<const BRep_GCurve*>(cr.get());
i++; i++;
if (i > Index) break; if (i > Index) break;
if (i == Index) { if (i == Index) {
@ -503,17 +503,16 @@ Handle(Poly_Polygon2D) BRep_Tool::PolygonOnSurface(const TopoDS_Edge& E,
static const Handle(Poly_Polygon2D) nullPolygon2D; static const Handle(Poly_Polygon2D) nullPolygon2D;
Handle(Poly_Polygon2D) Handle(Poly_Polygon2D) BRep_Tool::PolygonOnSurface(const TopoDS_Edge& E,
BRep_Tool::PolygonOnSurface(const TopoDS_Edge& E, const Handle(Geom_Surface)& S,
const Handle(Geom_Surface)& S, const TopLoc_Location& L)
const TopLoc_Location& L)
{ {
TopLoc_Location l = L.Predivided(E.Location()); TopLoc_Location l = L.Predivided(E.Location());
Standard_Boolean Eisreversed = (E.Orientation() == TopAbs_REVERSED); Standard_Boolean Eisreversed = (E.Orientation() == TopAbs_REVERSED);
// find the representation // find the representation
BRep_ListIteratorOfListOfCurveRepresentation itcr const BRep_TEdge* TE = static_cast<const BRep_TEdge*>(E.TShape().get());
((*((Handle(BRep_TEdge)*)&E.TShape()))->ChangeCurves()); BRep_ListIteratorOfListOfCurveRepresentation itcr(TE->Curves());
while (itcr.More()) { while (itcr.More()) {
const Handle(BRep_CurveRepresentation)& cr = itcr.Value(); const Handle(BRep_CurveRepresentation)& cr = itcr.Value();
@ -540,13 +539,13 @@ void BRep_Tool::PolygonOnSurface(const TopoDS_Edge& E,
TopLoc_Location& L) TopLoc_Location& L)
{ {
// find the representation // find the representation
BRep_ListIteratorOfListOfCurveRepresentation itcr const BRep_TEdge* TE = static_cast<const BRep_TEdge*>(E.TShape().get());
((*((Handle(BRep_TEdge)*)&E.TShape()))->ChangeCurves()); BRep_ListIteratorOfListOfCurveRepresentation itcr(TE->Curves());
while (itcr.More()) { while (itcr.More()) {
const Handle(BRep_CurveRepresentation)& cr = itcr.Value(); const Handle(BRep_CurveRepresentation)& cr = itcr.Value();
if (cr->IsPolygonOnSurface()) { if (cr->IsPolygonOnSurface()) {
Handle(BRep_PolygonOnSurface) PS (Handle(BRep_PolygonOnSurface)::DownCast (cr)); const BRep_PolygonOnSurface* PS = static_cast<const BRep_PolygonOnSurface*>(cr.get());
P = PS->Polygon(); P = PS->Polygon();
S = PS->Surface(); S = PS->Surface();
L = E.Location() * PS->Location(); L = E.Location() * PS->Location();
@ -574,13 +573,13 @@ void BRep_Tool::PolygonOnSurface(const TopoDS_Edge& E,
Standard_Integer i = 0; Standard_Integer i = 0;
// find the representation // find the representation
BRep_ListIteratorOfListOfCurveRepresentation itcr const BRep_TEdge* TE = static_cast<const BRep_TEdge*>(E.TShape().get());
((*((Handle(BRep_TEdge)*)&E.TShape()))->ChangeCurves()); BRep_ListIteratorOfListOfCurveRepresentation itcr(TE->Curves());
while (itcr.More()) { while (itcr.More()) {
const Handle(BRep_CurveRepresentation)& cr = itcr.Value(); const Handle(BRep_CurveRepresentation)& cr = itcr.Value();
if (cr->IsPolygonOnSurface()) { if (cr->IsPolygonOnSurface()) {
Handle(BRep_PolygonOnSurface) PS (Handle(BRep_PolygonOnSurface)::DownCast (cr)); const BRep_PolygonOnSurface* PS = static_cast<const BRep_PolygonOnSurface*>(cr.get());
i++; i++;
if (i > Index) break; if (i > Index) break;
if (i == Index) { if (i == Index) {
@ -616,8 +615,8 @@ BRep_Tool::PolygonOnTriangulation(const TopoDS_Edge& E,
Standard_Boolean Eisreversed = (E.Orientation() == TopAbs_REVERSED); Standard_Boolean Eisreversed = (E.Orientation() == TopAbs_REVERSED);
// find the representation // find the representation
BRep_ListIteratorOfListOfCurveRepresentation itcr const BRep_TEdge* TE = static_cast<const BRep_TEdge*>(E.TShape().get());
((*((Handle(BRep_TEdge)*)&E.TShape()))->ChangeCurves()); BRep_ListIteratorOfListOfCurveRepresentation itcr(TE->Curves());
while (itcr.More()) { while (itcr.More()) {
const Handle(BRep_CurveRepresentation)& cr = itcr.Value(); const Handle(BRep_CurveRepresentation)& cr = itcr.Value();
@ -645,13 +644,14 @@ BRep_Tool::PolygonOnTriangulation(const TopoDS_Edge& E,
TopLoc_Location& L) TopLoc_Location& L)
{ {
// find the representation // find the representation
BRep_ListIteratorOfListOfCurveRepresentation itcr const BRep_TEdge* TE = static_cast<const BRep_TEdge*>(E.TShape().get());
((*((Handle(BRep_TEdge)*)&E.TShape()))->ChangeCurves()); BRep_ListIteratorOfListOfCurveRepresentation itcr(TE->Curves());
while (itcr.More()) { while (itcr.More()) {
const Handle(BRep_CurveRepresentation)& cr = itcr.Value(); const Handle(BRep_CurveRepresentation)& cr = itcr.Value();
if (cr->IsPolygonOnTriangulation()) { if (cr->IsPolygonOnTriangulation()) {
Handle(BRep_PolygonOnTriangulation) PT (Handle(BRep_PolygonOnTriangulation)::DownCast (cr)); const BRep_PolygonOnTriangulation* PT =
static_cast<const BRep_PolygonOnTriangulation*>(cr.get());
P = PT->PolygonOnTriangulation(); P = PT->PolygonOnTriangulation();
T = PT->Triangulation(); T = PT->Triangulation();
L = E.Location() * PT->Location(); L = E.Location() * PT->Location();
@ -680,13 +680,14 @@ BRep_Tool::PolygonOnTriangulation(const TopoDS_Edge& E,
Standard_Integer i = 0; Standard_Integer i = 0;
// find the representation // find the representation
BRep_ListIteratorOfListOfCurveRepresentation itcr const BRep_TEdge* TE = static_cast<const BRep_TEdge*>(E.TShape().get());
((*((Handle(BRep_TEdge)*)&E.TShape()))->ChangeCurves()); BRep_ListIteratorOfListOfCurveRepresentation itcr(TE->Curves());
while (itcr.More()) { while (itcr.More()) {
const Handle(BRep_CurveRepresentation)& cr = itcr.Value(); const Handle(BRep_CurveRepresentation)& cr = itcr.Value();
if (cr->IsPolygonOnTriangulation()) { if (cr->IsPolygonOnTriangulation()) {
Handle(BRep_PolygonOnTriangulation) PT (Handle(BRep_PolygonOnTriangulation)::DownCast (cr)); const BRep_PolygonOnTriangulation* PT =
static_cast<const BRep_PolygonOnTriangulation*>(cr.get());
i++; i++;
if (i > Index) break; if (i > Index) break;
if (i == Index) { if (i == Index) {
@ -741,8 +742,8 @@ Standard_Boolean BRep_Tool::IsClosed(const TopoDS_Edge& E,
TopLoc_Location l = L.Predivided(E.Location()); TopLoc_Location l = L.Predivided(E.Location());
// find the representation // find the representation
BRep_ListIteratorOfListOfCurveRepresentation itcr const BRep_TEdge* TE = static_cast<const BRep_TEdge*>(E.TShape().get());
((*((Handle(BRep_TEdge)*)&E.TShape()))->ChangeCurves()); BRep_ListIteratorOfListOfCurveRepresentation itcr(TE->Curves());
while (itcr.More()) { while (itcr.More()) {
const Handle(BRep_CurveRepresentation)& cr = itcr.Value(); const Handle(BRep_CurveRepresentation)& cr = itcr.Value();
@ -767,8 +768,8 @@ Standard_Boolean BRep_Tool::IsClosed(const TopoDS_Edge& E,
TopLoc_Location l = L.Predivided(E.Location()); TopLoc_Location l = L.Predivided(E.Location());
// find the representation // find the representation
BRep_ListIteratorOfListOfCurveRepresentation itcr const BRep_TEdge* TE = static_cast<const BRep_TEdge*>(E.TShape().get());
((*((Handle(BRep_TEdge)*)&E.TShape()))->ChangeCurves()); BRep_ListIteratorOfListOfCurveRepresentation itcr(TE->Curves());
while (itcr.More()) { while (itcr.More()) {
const Handle(BRep_CurveRepresentation)& cr = itcr.Value(); const Handle(BRep_CurveRepresentation)& cr = itcr.Value();
@ -787,7 +788,8 @@ Standard_Boolean BRep_Tool::IsClosed(const TopoDS_Edge& E,
Standard_Real BRep_Tool::Tolerance(const TopoDS_Edge& E) Standard_Real BRep_Tool::Tolerance(const TopoDS_Edge& E)
{ {
Standard_Real p = (*((Handle(BRep_TEdge)*)&E.TShape()))->Tolerance(); const BRep_TEdge* TE = static_cast<const BRep_TEdge*>(E.TShape().get());
Standard_Real p = TE->Tolerance();
Standard_Real pMin = Precision::Confusion(); Standard_Real pMin = Precision::Confusion();
if (p > pMin) return p; if (p > pMin) return p;
else return pMin; else return pMin;
@ -800,7 +802,8 @@ Standard_Real BRep_Tool::Tolerance(const TopoDS_Edge& E)
Standard_Boolean BRep_Tool::SameParameter(const TopoDS_Edge& E) Standard_Boolean BRep_Tool::SameParameter(const TopoDS_Edge& E)
{ {
return (*((Handle(BRep_TEdge)*)&E.TShape()))->SameParameter(); const BRep_TEdge* TE = static_cast<const BRep_TEdge*>(E.TShape().get());
return TE->SameParameter();
} }
//======================================================================= //=======================================================================
@ -810,7 +813,8 @@ Standard_Boolean BRep_Tool::SameParameter(const TopoDS_Edge& E)
Standard_Boolean BRep_Tool::SameRange(const TopoDS_Edge& E) Standard_Boolean BRep_Tool::SameRange(const TopoDS_Edge& E)
{ {
return (*((Handle(BRep_TEdge)*)&E.TShape()))->SameRange(); const BRep_TEdge* TE = static_cast<const BRep_TEdge*>(E.TShape().get());
return TE->SameRange();
} }
//======================================================================= //=======================================================================
@ -820,7 +824,8 @@ Standard_Boolean BRep_Tool::SameRange(const TopoDS_Edge& E)
Standard_Boolean BRep_Tool::Degenerated(const TopoDS_Edge& E) Standard_Boolean BRep_Tool::Degenerated(const TopoDS_Edge& E)
{ {
return (*((Handle(BRep_TEdge)*)&E.TShape()))->Degenerated(); const BRep_TEdge* TE = static_cast<const BRep_TEdge*>(E.TShape().get());
return TE->Degenerated();
} }
//======================================================================= //=======================================================================
@ -833,13 +838,13 @@ void BRep_Tool::Range(const TopoDS_Edge& E,
Standard_Real& Last) Standard_Real& Last)
{ {
// set the range to all the representations // set the range to all the representations
BRep_ListIteratorOfListOfCurveRepresentation itcr const BRep_TEdge* TE = static_cast<const BRep_TEdge*>(E.TShape().get());
((*((Handle(BRep_TEdge)*)&E.TShape()))->ChangeCurves()); BRep_ListIteratorOfListOfCurveRepresentation itcr(TE->Curves());
while (itcr.More()) { while (itcr.More()) {
const Handle(BRep_CurveRepresentation)& cr = itcr.Value(); const Handle(BRep_CurveRepresentation)& cr = itcr.Value();
if (cr->IsCurve3D()) { if (cr->IsCurve3D()) {
Handle(BRep_Curve3D) CR (Handle(BRep_Curve3D)::DownCast (cr)); const BRep_Curve3D* CR = static_cast<const BRep_Curve3D*>(cr.get());
if (!CR->Curve3D().IsNull()) { if (!CR->Curve3D().IsNull()) {
First = CR->First(); First = CR->First();
Last = CR->Last(); Last = CR->Last();
@ -847,7 +852,7 @@ void BRep_Tool::Range(const TopoDS_Edge& E,
} }
} }
else if (cr->IsCurveOnSurface()) { else if (cr->IsCurveOnSurface()) {
Handle(BRep_GCurve) CR (Handle(BRep_GCurve)::DownCast (cr)); const BRep_GCurve* CR = static_cast<const BRep_GCurve*>(cr.get());
First = CR->First(); First = CR->First();
Last = CR->Last(); Last = CR->Last();
break; break;
@ -870,13 +875,14 @@ void BRep_Tool::Range(const TopoDS_Edge& E,
TopLoc_Location l = L.Predivided(E.Location()); TopLoc_Location l = L.Predivided(E.Location());
// find the representation // find the representation
BRep_ListIteratorOfListOfCurveRepresentation itcr const BRep_TEdge* TE = static_cast<const BRep_TEdge*>(E.TShape().get());
((*((Handle(BRep_TEdge)*)&E.TShape()))->ChangeCurves()); BRep_ListIteratorOfListOfCurveRepresentation itcr(TE->Curves());
while (itcr.More()) { while (itcr.More()) {
const Handle(BRep_CurveRepresentation)& cr = itcr.Value(); const Handle(BRep_CurveRepresentation)& cr = itcr.Value();
if (cr->IsCurveOnSurface(S,l)) { if (cr->IsCurveOnSurface(S,l)) {
Handle(BRep_GCurve)::DownCast (cr)->Range(First,Last); const BRep_CurveOnSurface* CR = static_cast<const BRep_CurveOnSurface*>(cr.get());
CR->Range(First,Last);
break; break;
} }
itcr.Next(); itcr.Next();
@ -884,7 +890,7 @@ void BRep_Tool::Range(const TopoDS_Edge& E,
if (!itcr.More()) { if (!itcr.More()) {
Range(E,First,Last); Range(E,First,Last);
} }
(*((Handle(BRep_TEdge)*)&E.TShape()))->Modified(Standard_True); E.TShape()->Modified(Standard_True);
} }
//======================================================================= //=======================================================================
@ -917,16 +923,24 @@ void BRep_Tool::UVPoints(const TopoDS_Edge& E,
Standard_Boolean Eisreversed = (E.Orientation() == TopAbs_REVERSED); Standard_Boolean Eisreversed = (E.Orientation() == TopAbs_REVERSED);
// find the representation // find the representation
BRep_ListIteratorOfListOfCurveRepresentation itcr const BRep_TEdge* TE = static_cast<const BRep_TEdge*>(E.TShape().get());
((*((Handle(BRep_TEdge)*)&E.TShape()))->ChangeCurves()); BRep_ListIteratorOfListOfCurveRepresentation itcr(TE->Curves());
while (itcr.More()) { while (itcr.More()) {
const Handle(BRep_CurveRepresentation)& cr = itcr.Value(); const Handle(BRep_CurveRepresentation)& cr = itcr.Value();
if (cr->IsCurveOnSurface(S,l)) { if (cr->IsCurveOnSurface(S,l)) {
if (cr->IsCurveOnClosedSurface() && Eisreversed) if (cr->IsCurveOnClosedSurface() && Eisreversed)
Handle(BRep_CurveOnClosedSurface)::DownCast (cr)->UVPoints2(PFirst,PLast); {
const BRep_CurveOnClosedSurface* CR =
static_cast<const BRep_CurveOnClosedSurface*>(cr.get());
CR->UVPoints2(PFirst, PLast);
}
else else
Handle(BRep_CurveOnSurface)::DownCast (cr)->UVPoints(PFirst,PLast); {
const BRep_CurveOnSurface* CR =
static_cast<const BRep_CurveOnSurface*>(cr.get());
CR->UVPoints(PFirst, PLast);
}
return; return;
} }
itcr.Next(); itcr.Next();
@ -1007,18 +1021,22 @@ void BRep_Tool::SetUVPoints(const TopoDS_Edge& E,
Standard_Boolean Eisreversed = (E.Orientation() == TopAbs_REVERSED); Standard_Boolean Eisreversed = (E.Orientation() == TopAbs_REVERSED);
// find the representation // find the representation
BRep_ListIteratorOfListOfCurveRepresentation itcr const BRep_TEdge* TE = static_cast<const BRep_TEdge*>(E.TShape().get());
((*((Handle(BRep_TEdge)*)&E.TShape()))->ChangeCurves()); BRep_ListIteratorOfListOfCurveRepresentation itcr(TE->Curves());
while (itcr.More()) { while (itcr.More()) {
const Handle(BRep_CurveRepresentation)& cr = itcr.Value(); Handle(BRep_CurveRepresentation)& cr = itcr.Value();
if (cr->IsCurveOnSurface(S,l)) { if (cr->IsCurveOnSurface(S,l)) {
if (cr->IsCurveOnClosedSurface() && Eisreversed) if (cr->IsCurveOnClosedSurface() && Eisreversed)
Handle(BRep_CurveOnClosedSurface)::DownCast (cr)-> {
SetUVPoints2(PFirst,PLast); BRep_CurveOnClosedSurface* CS = static_cast<BRep_CurveOnClosedSurface*>(cr.get());
CS->SetUVPoints2(PFirst, PLast);
}
else else
Handle(BRep_CurveOnSurface)::DownCast (cr)-> {
SetUVPoints(PFirst,PLast); BRep_CurveOnSurface* CS = static_cast<BRep_CurveOnSurface*>(cr.get());
CS->SetUVPoints(PFirst, PLast);
}
} }
itcr.Next(); itcr.Next();
} }
@ -1093,8 +1111,8 @@ Standard_Boolean BRep_Tool::HasContinuity(const TopoDS_Edge& E,
TopLoc_Location l2 = L2.Predivided(Eloc); TopLoc_Location l2 = L2.Predivided(Eloc);
// find the representation // find the representation
BRep_ListIteratorOfListOfCurveRepresentation itcr const BRep_TEdge* TE = static_cast<const BRep_TEdge*>(E.TShape().get());
((*((Handle(BRep_TEdge)*)&E.TShape()))->ChangeCurves()); BRep_ListIteratorOfListOfCurveRepresentation itcr(TE->Curves());
while (itcr.More()) { while (itcr.More()) {
const Handle(BRep_CurveRepresentation)& cr = itcr.Value(); const Handle(BRep_CurveRepresentation)& cr = itcr.Value();
@ -1139,8 +1157,8 @@ GeomAbs_Shape BRep_Tool::Continuity(const TopoDS_Edge& E,
Standard_Boolean BRep_Tool::HasContinuity(const TopoDS_Edge& E) Standard_Boolean BRep_Tool::HasContinuity(const TopoDS_Edge& E)
{ {
BRep_ListIteratorOfListOfCurveRepresentation itcr const BRep_TEdge* TE = static_cast<const BRep_TEdge*>(E.TShape().get());
((*((Handle(BRep_TEdge)*)&E.TShape()))->Curves()); BRep_ListIteratorOfListOfCurveRepresentation itcr(TE->Curves());
for (; itcr.More(); itcr.Next()) for (; itcr.More(); itcr.Next())
{ {
@ -1158,16 +1176,20 @@ Standard_Boolean BRep_Tool::HasContinuity(const TopoDS_Edge& E)
gp_Pnt BRep_Tool::Pnt(const TopoDS_Vertex& V) gp_Pnt BRep_Tool::Pnt(const TopoDS_Vertex& V)
{ {
Handle(BRep_TVertex)& TV = *((Handle(BRep_TVertex)*) &V.TShape()); const BRep_TVertex* TV = static_cast<const BRep_TVertex*>(V.TShape().get());
if (TV.IsNull()) if (TV == 0)
{ {
Standard_NullObject::Raise("BRep_Tool:: TopoDS_Vertex hasn't gp_Pnt"); Standard_NullObject::Raise("BRep_Tool:: TopoDS_Vertex hasn't gp_Pnt");
} }
gp_Pnt P = TV->Pnt(); const gp_Pnt& P = TV->Pnt();
P.Transform(V.Location().Transformation()); if (V.Location().IsIdentity())
return P; {
return P;
}
return P.Transformed(V.Location().Transformation());
} }
//======================================================================= //=======================================================================
@ -1177,9 +1199,9 @@ gp_Pnt BRep_Tool::Pnt(const TopoDS_Vertex& V)
Standard_Real BRep_Tool::Tolerance(const TopoDS_Vertex& V) Standard_Real BRep_Tool::Tolerance(const TopoDS_Vertex& V)
{ {
Handle(BRep_TVertex)& aTVert = *((Handle(BRep_TVertex)*)&V.TShape()); const BRep_TVertex* aTVert = static_cast<const BRep_TVertex*>(V.TShape().get());
if (aTVert.IsNull()) if (aTVert == 0)
{ {
Standard_NullObject::Raise("BRep_Tool:: TopoDS_Vertex hasn't gp_Pnt"); Standard_NullObject::Raise("BRep_Tool:: TopoDS_Vertex hasn't gp_Pnt");
} }
@ -1196,7 +1218,7 @@ Standard_Real BRep_Tool::Tolerance(const TopoDS_Vertex& V)
//======================================================================= //=======================================================================
Standard_Real BRep_Tool::Parameter(const TopoDS_Vertex& V, Standard_Real BRep_Tool::Parameter(const TopoDS_Vertex& V,
const TopoDS_Edge& E) const TopoDS_Edge& E)
{ {
// Search the vertex in the edge // Search the vertex in the edge
@ -1250,8 +1272,8 @@ Standard_Real BRep_Tool::Parameter(const TopoDS_Vertex& V,
const Handle(Geom_Curve)& C = BRep_Tool::Curve(E,L,f,l); const Handle(Geom_Curve)& C = BRep_Tool::Curve(E,L,f,l);
L = L.Predivided(V.Location()); L = L.Predivided(V.Location());
if (!C.IsNull() || Degenerated(E)) { if (!C.IsNull() || Degenerated(E)) {
BRep_ListIteratorOfListOfPointRepresentation itpr const BRep_TVertex* TV = static_cast<const BRep_TVertex*>(V.TShape().get());
((*((Handle(BRep_TVertex)*) &V.TShape()))->Points()); BRep_ListIteratorOfListOfPointRepresentation itpr(TV->Points());
while (itpr.More()) { while (itpr.More()) {
const Handle(BRep_PointRepresentation)& pr = itpr.Value(); const Handle(BRep_PointRepresentation)& pr = itpr.Value();
@ -1284,8 +1306,8 @@ Standard_Real BRep_Tool::Parameter(const TopoDS_Vertex& V,
Handle(Geom_Surface) S; Handle(Geom_Surface) S;
BRep_Tool::CurveOnSurface(E,PC,S,L,f,l); BRep_Tool::CurveOnSurface(E,PC,S,L,f,l);
L = L.Predivided(V.Location()); L = L.Predivided(V.Location());
BRep_ListIteratorOfListOfPointRepresentation itpr const BRep_TVertex* TV = static_cast<const BRep_TVertex*>(V.TShape().get());
((*((Handle(BRep_TVertex)*) &V.TShape()))->Points()); BRep_ListIteratorOfListOfPointRepresentation itpr(TV->Points());
while (itpr.More()) { while (itpr.More()) {
const Handle(BRep_PointRepresentation)& pr = itpr.Value(); const Handle(BRep_PointRepresentation)& pr = itpr.Value();
@ -1371,8 +1393,8 @@ Standard_Real BRep_Tool::Parameter(const TopoDS_Vertex& V,
else { else {
Handle(Geom2d_Curve) PC = BRep_Tool::CurveOnSurface(E,S,L,f,l); Handle(Geom2d_Curve) PC = BRep_Tool::CurveOnSurface(E,S,L,f,l);
BRep_ListIteratorOfListOfPointRepresentation itpr const BRep_TVertex* TV = static_cast<const BRep_TVertex*>(V.TShape().get());
((*((Handle(BRep_TVertex)*) &V.TShape()))->Points()); BRep_ListIteratorOfListOfPointRepresentation itpr(TV->Points());
while (itpr.More()) { while (itpr.More()) {
if (itpr.Value()->IsPointOnCurveOnSurface(PC,S,L)) if (itpr.Value()->IsPointOnCurveOnSurface(PC,S,L))
@ -1387,8 +1409,8 @@ Standard_Real BRep_Tool::Parameter(const TopoDS_Vertex& V,
const Handle(Geom_Curve)& C = BRep_Tool::Curve(E,L1,f,l); const Handle(Geom_Curve)& C = BRep_Tool::Curve(E,L1,f,l);
L1 = L1.Predivided(V.Location()); L1 = L1.Predivided(V.Location());
if (!C.IsNull() || Degenerated(E)) { if (!C.IsNull() || Degenerated(E)) {
BRep_ListIteratorOfListOfPointRepresentation itpr const BRep_TVertex* TV = static_cast<const BRep_TVertex*>(V.TShape().get());
((*((Handle(BRep_TVertex)*) &V.TShape()))->Points()); BRep_ListIteratorOfListOfPointRepresentation itpr(TV->Points());
while (itpr.More()) { while (itpr.More()) {
const Handle(BRep_PointRepresentation)& pr = itpr.Value(); const Handle(BRep_PointRepresentation)& pr = itpr.Value();
@ -1432,10 +1454,10 @@ gp_Pnt2d BRep_Tool::Parameters(const TopoDS_Vertex& V,
TopLoc_Location L; TopLoc_Location L;
const Handle(Geom_Surface)& S = BRep_Tool::Surface(F,L); const Handle(Geom_Surface)& S = BRep_Tool::Surface(F,L);
L = L.Predivided(V.Location()); L = L.Predivided(V.Location());
BRep_ListIteratorOfListOfPointRepresentation itpr const BRep_TVertex* TV = static_cast<const BRep_TVertex*>(V.TShape().get());
((*((Handle(BRep_TVertex)*) &V.TShape()))->Points()); BRep_ListIteratorOfListOfPointRepresentation itpr(TV->Points());
// It is checked if there is PointRepresentation (case non Manifold)
// It is checked if there is PointRepresentation (case non Manifold)
while (itpr.More()) { while (itpr.More()) {
if (itpr.Value()->IsPointOnSurface(S,L)) { if (itpr.Value()->IsPointOnSurface(S,L)) {
return gp_Pnt2d(itpr.Value()->Parameter(), return gp_Pnt2d(itpr.Value()->Parameter(),

101
src/QABugs/QABugs_20.cxx
View File

@ -25,6 +25,15 @@
#include <Geom_BSplineSurface.hxx> #include <Geom_BSplineSurface.hxx>
#include <DrawTrSurf.hxx> #include <DrawTrSurf.hxx>
#include <TopExp.hxx>
#include <TopoDS_Vertex.hxx>
#include <BRep_Tool.hxx>
#include <TopoDS_Edge.hxx>
#include <BRep_Builder.hxx>
#include <BRepTools.hxx>
#include <TopoDS.hxx>
#include <DBRep.hxx>
//======================================================================= //=======================================================================
//function : SurfaceGenOCC26675_1 //function : SurfaceGenOCC26675_1
//purpose : Generates a surface for intersect (in corresponding //purpose : Generates a surface for intersect (in corresponding
@ -1242,10 +1251,102 @@ static Standard_Integer SurfaceGenOCC26675_1( Draw_Interpretor& theDI,
return 0; return 0;
} }
//=======================================================================
//function : OCC27021
//purpose : Tests performance of obtaining geometry (points) via topological
// exploring or fetching the geometry.
//=======================================================================
// Fetch via topology
static std::pair<gp_Pnt, gp_Pnt> getVerticesA(const TopoDS_Edge& theEdge)
{
std::pair<gp_Pnt, gp_Pnt> result;
static TopoDS_Vertex aFirst, aLast;
TopExp::Vertices(theEdge, aFirst, aLast, Standard_True);
result.first = BRep_Tool::Pnt(aFirst);
result.second = BRep_Tool::Pnt(aLast);
return result;
}
//Geometrical way
static std::pair<gp_Pnt, gp_Pnt> getVerticesB(const TopoDS_Edge& theEdge)
{
Standard_Real first;
Standard_Real last;
Handle(Geom_Curve) curve = BRep_Tool::Curve(theEdge, first, last);
std::pair<gp_Pnt, gp_Pnt> result;
if (theEdge.Orientation() == TopAbs_REVERSED)
{
curve->D0(first, result.second);
curve->D0(last, result.first);
}
else
{
curve->D0(first, result.first);
curve->D0(last, result.second);
}
return result;
}
static Standard_Integer OCC27021(Draw_Interpretor& theDI,
Standard_Integer theNArg,
const char ** theArgVal)
{
if (theNArg != 2)
{
cout << "Use: " << theArgVal[0] << " shape" << endl;
return 1;
}
TopoDS_Shape shape (DBRep::Get(theArgVal[1]));
TopTools_IndexedMapOfShape shape_faces;
TopExp::MapShapes(shape, TopAbs_FACE, shape_faces);
// Pick a single face which shows the problem.
TopoDS_Face face = TopoDS::Face(shape_faces(10));
TopTools_IndexedMapOfShape face_edges;
TopExp::MapShapes(face, TopAbs_EDGE, face_edges);
TopoDS_Edge edge = TopoDS::Edge(face_edges(2));
Standard_Integer iterations = 100000000;
std::pair<gp_Pnt, gp_Pnt> vertices;
clock_t t = clock();
theDI << "\nRetrieving " << iterations << " vertices using approach A)...";
for (int i = 0; i < iterations; ++i)
{
vertices = getVerticesA(edge);
}
theDI << "done in " << (clock() - t) / (double)CLOCKS_PER_SEC << " seconds\n";
t = clock();
theDI << "\nRetrieving " << iterations << " vertices using approach B)...";
for (int i = 0; i < iterations; ++i)
{
vertices = getVerticesB(edge);
}
theDI << "done in " << (clock() - t) / (double)CLOCKS_PER_SEC << " seconds\n";
return 0;
}
void QABugs::Commands_20(Draw_Interpretor& theCommands) { void QABugs::Commands_20(Draw_Interpretor& theCommands) {
const char *group = "QABugs"; const char *group = "QABugs";
theCommands.Add ("OCC26675_1", "OCC26675_1 result", __FILE__, SurfaceGenOCC26675_1, group); theCommands.Add ("OCC26675_1", "OCC26675_1 result", __FILE__, SurfaceGenOCC26675_1, group);
theCommands.Add("OCC27021", "OCC27021", __FILE__, OCC27021, group);
return; return;
} }

30
src/TopExp/TopExp.cxx
View File

@ -147,15 +147,33 @@ void TopExp::Vertices(const TopoDS_Edge& E,
TopoDS_Vertex& Vlast, TopoDS_Vertex& Vlast,
const Standard_Boolean CumOri) const Standard_Boolean CumOri)
{ {
Vfirst = Vlast = TopoDS_Vertex(); // nullify // minor optimization for case when Vfirst and Vlast are non-null:
TopoDS_Iterator ite(E,CumOri); // at least for VC++ 10, it is faster if we use boolean flags than
// if we nullify vertices at that point (see #27021)
Standard_Boolean isFirstDefined = Standard_False;
Standard_Boolean isLastDefined = Standard_False;
TopoDS_Iterator ite(E, CumOri);
while (ite.More()) { while (ite.More()) {
if (ite.Value().Orientation() == TopAbs_FORWARD) const TopoDS_Shape& aV = ite.Value();
Vfirst = TopoDS::Vertex(ite.Value()); if (aV.Orientation() == TopAbs_FORWARD)
else if (ite.Value().Orientation() == TopAbs_REVERSED) {
Vlast = TopoDS::Vertex(ite.Value()); Vfirst = TopoDS::Vertex (aV);
isFirstDefined = Standard_True;
}
else if (aV.Orientation() == TopAbs_REVERSED)
{
Vlast = TopoDS::Vertex (aV);
isLastDefined = Standard_True;
}
ite.Next(); ite.Next();
} }
if (!isFirstDefined)
Vfirst.Nullify();
if (!isLastDefined)
Vlast.Nullify();
} }

47
tests/bugs/modalg_6/bug27021 Normal file
View File

@ -0,0 +1,47 @@
puts "========"
puts "OCC27021"
puts "========"
puts ""
###########################################################
# TopExp::Vertices performance optimization
###########################################################
pload QAcommands
if { [regexp {Debug mode} [dversion]] } {
if { [regexp {Windows} [dversion]] } {
set max_time 8.
set max_time2 5.
} else {
set max_time 8.
set max_time2 5.
}
} else {
if { [regexp {Windows} [dversion]] } {
set max_time 8.
set max_time2 5.
} else {
set max_time 8.
set max_time2 5.
}
}
restore [locate_data_file bug27021_shape.brep] f
set log [OCC27021 f]
regexp {Retrieving 100000000 vertices using approach A\)\.\.\.done in ([-0-9.+eE]+) seconds} ${log} full A_sec
regexp {Retrieving 100000000 vertices using approach B\)\.\.\.done in ([-0-9.+eE]+) seconds} ${log} full B_sec
if { ${A_sec} > ${max_time} } {
puts "Retrieving 100000000 vertices using approach A) is more than ${max_time} seconds - Faulty"
} else {
puts "Retrieving 100000000 vertices using approach A) is less than ${max_time} seconds - OK"
}
if { ${B_sec} > ${max_time2} } {
puts "Retrieving 100000000 vertices using approach A) is more than ${max_time2} seconds - Faulty"
} else {
puts "Retrieving 100000000 vertices using approach A) is less than ${max_time2} seconds - OK"
}