OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-04 13:13:25 +03:00
Code Activity

0028966: Coding Rules - remove Adaptor2d_HCurve2d, Adaptor3d_HCurve and Adaptor3d_HSurface classes

Browse Source 
Adaptor2d_Curve2d, Adaptor3d_Curve and Adaptor3d_Surface now inherit Standard_Transient.
Interfaces Adaptor2d_HCurve2d, Adaptor3d_HCurve, Adaptor3d_HSurface and their subclasses
are now aliases to Adaptor2d_Curve2d, Adaptor3d_Curve and Adaptor3d_Surface.
Removed numerous unsafe reinterpret casts.

Generic classes Adaptor3d_GenHCurve, Adaptor3d_GenHSurface, Adaptor2d_GenHCurve2d have been removed.
Several redundant .lxx files have been merged into .hxx.

Removed obsolete adaptor classes with H suffix.
This commit is contained in:
kgv
2020-12-03 17:36:19 +03:00
committed by bugmaster
parent 266877a7c3
commit c22b52d60e
710 changed files with 6144 additions and 14175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Extrema/Extrema_ExtPExtS.cxx
View File

@@ -17,7 +17,7 @@
#include <Standard_NotImplemented.hxx>
#include <Standard_OutOfRange.hxx>
#include <StdFail_NotDone.hxx>
#include <Adaptor3d_HCurve.hxx>
#include <Adaptor3d_Curve.hxx>
#include <ElCLib.hxx>
#include <Extrema_ExtPElC.hxx>
#include <Extrema_ExtPExtS.hxx>
@@ -33,16 +33,16 @@
#include <gp_Vec.hxx>
#include <math_FunctionSetRoot.hxx>
#include <math_Vector.hxx>
#include <GeomAdaptor_HSurfaceOfLinearExtrusion.hxx>
#include <GeomAdaptor_SurfaceOfLinearExtrusion.hxx>
IMPLEMENT_STANDARD_RTTIEXT(Extrema_ExtPExtS,Standard_Transient)
static gp_Ax2 GetPosition (const Handle(Adaptor3d_HCurve)& C);
static gp_Ax2 GetPosition (const Handle(Adaptor3d_Curve)& C);
static void PerformExtPElC (Extrema_ExtPElC& E,
const gp_Pnt& P,
const Handle(Adaptor3d_HCurve)& C,
const Handle(Adaptor3d_Curve)& C,
const Standard_Real Tol);
static Standard_Boolean
@@ -51,7 +51,7 @@ static Standard_Boolean
const gp_Dir& theSurfaceDirection) ;
static gp_Pnt GetValue(const Standard_Real U,
const Handle(Adaptor3d_HCurve)& C);
const Handle(Adaptor3d_Curve)& C);
//=======================================================================
//function : Project
//purpose : Returns the projection of a point <Point> on a plane
@@ -164,7 +164,7 @@ Extrema_ExtPExtS::Extrema_ExtPExtS()
//=============================================================================
Extrema_ExtPExtS::Extrema_ExtPExtS (const gp_Pnt& theP,
const Handle(GeomAdaptor_HSurfaceOfLinearExtrusion)& theS,
const Handle(GeomAdaptor_SurfaceOfLinearExtrusion)& theS,
const Standard_Real theUmin,
const Standard_Real theUsup,
const Standard_Real theVmin,
@@ -199,7 +199,7 @@ Extrema_ExtPExtS::Extrema_ExtPExtS (const gp_Pnt&
//=============================================================================
Extrema_ExtPExtS::Extrema_ExtPExtS (const gp_Pnt& theP,
const Handle(GeomAdaptor_HSurfaceOfLinearExtrusion)& theS,
const Handle(GeomAdaptor_SurfaceOfLinearExtrusion)& theS,
const Standard_Real theTolU,
const Standard_Real theTolV)
: myuinf(theS->FirstUParameter()),
@@ -233,7 +233,7 @@ Extrema_ExtPExtS::Extrema_ExtPExtS (const gp_Pnt&
//purpose :
//=======================================================================
void Extrema_ExtPExtS::Initialize (const Handle(GeomAdaptor_HSurfaceOfLinearExtrusion)& theS,
void Extrema_ExtPExtS::Initialize (const Handle(GeomAdaptor_SurfaceOfLinearExtrusion)& theS,
const Standard_Real theUinf,
const Standard_Real theUsup,
const Standard_Real theVinf,
@@ -253,9 +253,9 @@ void Extrema_ExtPExtS::Initialize (const Handle(GeomAdaptor_HSurfaceOfLinearExtr
myDone = Standard_False;
myNbExt = 0;
Handle(Adaptor3d_HCurve) anACurve = theS->BasisCurve();
Handle(Adaptor3d_Curve) anACurve = theS->BasisCurve();
myF.Initialize (theS->ChangeSurface());
myF.Initialize (*theS);
myC = anACurve;
myS = theS;
myPosition = GetPosition(myC);
@@ -265,7 +265,7 @@ void Extrema_ExtPExtS::Initialize (const Handle(GeomAdaptor_HSurfaceOfLinearExtr
if (!myIsAnalyticallyComputable)
{
myExtPS.Initialize (theS->ChangeSurface(),
myExtPS.Initialize (*theS,
32,
32,
theUinf,
@@ -496,7 +496,7 @@ const Extrema_POnSurf& Extrema_ExtPExtS::Point (const Standard_Integer N) const
//=============================================================================
static gp_Ax2 GetPosition (const Handle(Adaptor3d_HCurve)& C)
static gp_Ax2 GetPosition (const Handle(Adaptor3d_Curve)& C)
{
switch (C->GetType()) {
case GeomAbs_Line: {
@@ -525,7 +525,7 @@ static gp_Ax2 GetPosition (const Handle(Adaptor3d_HCurve)& C)
static void PerformExtPElC (Extrema_ExtPElC& E,
const gp_Pnt& P,
const Handle(Adaptor3d_HCurve)& C,
const Handle(Adaptor3d_Curve)& C,
const Standard_Real Tol)
{
switch (C->GetType()) {
@@ -582,7 +582,7 @@ static Standard_Boolean IsCaseAnalyticallyComputable
//=======================================================================
static gp_Pnt GetValue(const Standard_Real U,
const Handle(Adaptor3d_HCurve)& C)
const Handle(Adaptor3d_Curve)& C)
{
switch (C->GetType()) {
case GeomAbs_Line:
@@ -606,7 +606,7 @@ static gp_Pnt GetValue(const Standard_Real U,
//#ifdef OCCT_DEBUG
//static Standard_Real GetU(const gp_Vec& vec,
// const gp_Pnt& P,
// const Handle(Adaptor3d_HCurve)& C)
// const Handle(Adaptor3d_Curve)& C)
//{
// switch (C->GetType()) {
// case GeomAbs_Line:

33
src/Extrema/Extrema_ExtPExtS.hxx
View File

@@ -17,28 +17,13 @@
#ifndef _Extrema_ExtPExtS_HeaderFile
#define _Extrema_ExtPExtS_HeaderFile
#include <Standard.hxx>
#include <Standard_Type.hxx>
#include <Standard_Real.hxx>
#include <Extrema_FuncPSNorm.hxx>
#include <gp_Vec.hxx>
#include <gp_Ax2.hxx>
#include <Extrema_GenExtPS.hxx>
#include <Standard_Boolean.hxx>
#include <Standard_Integer.hxx>
#include <Extrema_FuncPSNorm.hxx>
#include <Extrema_POnSurf.hxx>
#include <Standard_Transient.hxx>
class Adaptor3d_HCurve;
class GeomAdaptor_HSurfaceOfLinearExtrusion;
class StdFail_NotDone;
class Standard_OutOfRange;
class gp_Pnt;
class Extrema_POnSurf;
class gp_Ax2;
#include <GeomAdaptor_SurfaceOfLinearExtrusion.hxx>
#include <gp_Ax2.hxx>
#include <gp_Vec.hxx>
class Extrema_ExtPExtS;
DEFINE_STANDARD_HANDLE(Extrema_ExtPExtS, Standard_Transient)
//! It calculates all the extremum (minimum and
@@ -54,14 +39,14 @@ public:
//! It calculates all the distances between a point
//! from gp and a Surface.
Standard_EXPORT Extrema_ExtPExtS(const gp_Pnt& P, const Handle(GeomAdaptor_HSurfaceOfLinearExtrusion)& S, const Standard_Real Umin, const Standard_Real Usup, const Standard_Real Vmin, const Standard_Real Vsup, const Standard_Real TolU, const Standard_Real TolV);
Standard_EXPORT Extrema_ExtPExtS(const gp_Pnt& P, const Handle(GeomAdaptor_SurfaceOfLinearExtrusion)& S, const Standard_Real Umin, const Standard_Real Usup, const Standard_Real Vmin, const Standard_Real Vsup, const Standard_Real TolU, const Standard_Real TolV);
//! It calculates all the distances between a point
//! from gp and a Surface.
Standard_EXPORT Extrema_ExtPExtS(const gp_Pnt& P, const Handle(GeomAdaptor_HSurfaceOfLinearExtrusion)& S, const Standard_Real TolU, const Standard_Real TolV);
Standard_EXPORT Extrema_ExtPExtS(const gp_Pnt& P, const Handle(GeomAdaptor_SurfaceOfLinearExtrusion)& S, const Standard_Real TolU, const Standard_Real TolV);
//! Initializes the fields of the algorithm.
Standard_EXPORT void Initialize (const Handle(GeomAdaptor_HSurfaceOfLinearExtrusion)& S, const Standard_Real Uinf, const Standard_Real Usup, const Standard_Real Vinf, const Standard_Real Vsup, const Standard_Real TolU, const Standard_Real TolV);
Standard_EXPORT void Initialize (const Handle(GeomAdaptor_SurfaceOfLinearExtrusion)& S, const Standard_Real Uinf, const Standard_Real Usup, const Standard_Real Vinf, const Standard_Real Vsup, const Standard_Real TolU, const Standard_Real TolV);
Standard_EXPORT void Perform (const gp_Pnt& P);
@@ -99,8 +84,8 @@ private:
Standard_Real myvsup;
Standard_Real mytolv;
Extrema_FuncPSNorm myF;
Handle(Adaptor3d_HCurve) myC;
Handle(GeomAdaptor_HSurfaceOfLinearExtrusion) myS;
Handle(Adaptor3d_Curve) myC;
Handle(GeomAdaptor_SurfaceOfLinearExtrusion) myS;
gp_Vec myDirection;
gp_Ax2 myPosition;
Extrema_GenExtPS myExtPS;

34
src/Extrema/Extrema_ExtPRevS.cxx
View File

@@ -15,8 +15,8 @@
// commercial license or contractual agreement.
#include <Adaptor3d_HCurve.hxx>
#include <GeomAdaptor_HSurfaceOfRevolution.hxx>
#include <Adaptor3d_Curve.hxx>
#include <GeomAdaptor_SurfaceOfRevolution.hxx>
#include <ElCLib.hxx>
#include <Extrema_ExtPElC.hxx>
#include <Extrema_ExtPRevS.hxx>
@@ -39,7 +39,7 @@ IMPLEMENT_STANDARD_RTTIEXT(Extrema_ExtPRevS,Standard_Transient)
static gp_Ax2 GetPosition (const GeomAdaptor_SurfaceOfRevolution& S)//const Handle(Adaptor_HCurve)& C)
{
Handle(Adaptor3d_HCurve) C = S.BasisCurve();
Handle(Adaptor3d_Curve) C = S.BasisCurve();
switch (C->GetType()) {
@@ -81,7 +81,7 @@ static gp_Ax2 GetPosition (const GeomAdaptor_SurfaceOfRevolution& S)//const Hand
static Standard_Boolean HasSingularity(const GeomAdaptor_SurfaceOfRevolution& S)
{
const Handle(Adaptor3d_HCurve) C = S.BasisCurve();
const Handle(Adaptor3d_Curve) C = S.BasisCurve();
gp_Dir N = S.AxeOfRevolution().Direction();
gp_Pnt P = S.AxeOfRevolution().Location();
@@ -102,7 +102,7 @@ static Standard_Boolean HasSingularity(const GeomAdaptor_SurfaceOfRevolution& S)
static void PerformExtPElC (Extrema_ExtPElC& E,
const gp_Pnt& P,
const Handle(Adaptor3d_HCurve)& C,
const Handle(Adaptor3d_Curve)& C,
const Standard_Real Tol)
{
switch (C->GetType()) {
@@ -227,7 +227,7 @@ Extrema_ExtPRevS::Extrema_ExtPRevS()
//=======================================================================
Extrema_ExtPRevS::Extrema_ExtPRevS (const gp_Pnt& theP,
const Handle(GeomAdaptor_HSurfaceOfRevolution)& theS,
const Handle(GeomAdaptor_SurfaceOfRevolution)& theS,
const Standard_Real theUmin,
const Standard_Real theUsup,
const Standard_Real theVmin,
@@ -251,7 +251,7 @@ Extrema_ExtPRevS::Extrema_ExtPRevS (const gp_Pnt&
//=======================================================================
Extrema_ExtPRevS::Extrema_ExtPRevS (const gp_Pnt& theP,
const Handle(GeomAdaptor_HSurfaceOfRevolution)& theS,
const Handle(GeomAdaptor_SurfaceOfRevolution)& theS,
const Standard_Real theTolU,
const Standard_Real theTolV)
{
@@ -270,7 +270,7 @@ Extrema_ExtPRevS::Extrema_ExtPRevS (const gp_Pnt&
//purpose :
//=======================================================================
void Extrema_ExtPRevS::Initialize (const Handle(GeomAdaptor_HSurfaceOfRevolution)& theS,
void Extrema_ExtPRevS::Initialize (const Handle(GeomAdaptor_SurfaceOfRevolution)& theS,
const Standard_Real theUmin,
const Standard_Real theUsup,
const Standard_Real theVmin,
@@ -286,12 +286,12 @@ void Extrema_ExtPRevS::Initialize (const Handle(GeomAdaptor_HSurfaceOfRevolution
myNbExt = 0;
myIsAnalyticallyComputable = Standard_False;
Handle(Adaptor3d_HCurve) anACurve = theS->BasisCurve();
Handle(Adaptor3d_Curve) anACurve = theS->BasisCurve();
if (myS != theS)
{
myS = theS;
myPosition = GetPosition (theS->ChangeSurface());
myPosition = GetPosition (*theS);
myIsAnalyticallyComputable =
IsCaseAnalyticallyComputable (anACurve->GetType(), myPosition, theS->AxeOfRevolution());
}
@@ -300,12 +300,12 @@ void Extrema_ExtPRevS::Initialize (const Handle(GeomAdaptor_HSurfaceOfRevolution
{
Standard_Integer aNbu = 32, aNbv = 32;
if (HasSingularity (theS->ChangeSurface()))
if (HasSingularity (*theS))
{
aNbv = 100;
}
myExtPS.Initialize (theS->ChangeSurface(),
myExtPS.Initialize (*theS,
aNbu,
aNbv,
theUmin,
@@ -334,7 +334,7 @@ void Extrema_ExtPRevS::Perform(const gp_Pnt& P)
return;
}
Handle(Adaptor3d_HCurve) anACurve = myS->BasisCurve();
Handle(Adaptor3d_Curve) anACurve = myS->BasisCurve();
gp_Ax1 Ax = myS->AxeOfRevolution();
gp_Vec Dir = Ax.Direction(), Z = myPosition.Direction();
@@ -406,7 +406,7 @@ void Extrema_ExtPRevS::Perform(const gp_Pnt& P)
}
V = newV;
if ( !IsExtremum (U, V, P, &(myS->ChangeSurface()), E, Dist2,
if ( !IsExtremum (U, V, P, myS.get(), E, Dist2,
Standard_True, anExt.IsMin(i))) {
continue;
}
@@ -432,7 +432,7 @@ void Extrema_ExtPRevS::Perform(const gp_Pnt& P)
}
V = newV;
if ( !IsExtremum (U, V, P, &(myS->ChangeSurface()), E, Dist2,
if ( !IsExtremum (U, V, P, myS.get(), E, Dist2,
Standard_False, anExt.IsMin(i))) continue;
} else {
E = myS->Value(U,V);
@@ -479,7 +479,7 @@ void Extrema_ExtPRevS::Perform(const gp_Pnt& P)
}
V = newV;
if ( !IsExtremum (U, V, P, &(myS->ChangeSurface()), E, Dist2,
if ( !IsExtremum (U, V, P, myS.get(), E, Dist2,
Standard_True, anExt.IsMin(i))) continue;
} else if (V < myvinf) {
// if ( !IsExtremum (U, V = myvinf, P, myS, E, Dist2,
@@ -502,7 +502,7 @@ void Extrema_ExtPRevS::Perform(const gp_Pnt& P)
}
V = newV;
if ( !IsExtremum (U, V, P, &(myS->ChangeSurface()), E, Dist2,
if ( !IsExtremum (U, V, P, myS.get(), E, Dist2,
Standard_False, anExt.IsMin(i))) continue;
} else {
E = myS->Value(U,V);

23
src/Extrema/Extrema_ExtPRevS.hxx
View File

@@ -17,24 +17,11 @@
#ifndef _Extrema_ExtPRevS_HeaderFile
#define _Extrema_ExtPRevS_HeaderFile
#include <Standard.hxx>
#include <Standard_Type.hxx>
#include <Standard_Real.hxx>
#include <GeomAdaptor_SurfaceOfRevolution.hxx>
#include <gp_Ax2.hxx>
#include <Extrema_GenExtPS.hxx>
#include <Standard_Boolean.hxx>
#include <Standard_Integer.hxx>
#include <Extrema_POnSurf.hxx>
#include <Standard_Transient.hxx>
class GeomAdaptor_HSurfaceOfRevolution;
class StdFail_NotDone;
class Standard_OutOfRange;
class gp_Pnt;
class Extrema_POnSurf;
class Extrema_ExtPRevS;
DEFINE_STANDARD_HANDLE(Extrema_ExtPRevS, Standard_Transient)
//! It calculates all the extremum (minimum and
@@ -50,13 +37,13 @@ public:
//! It calculates all the distances between a point
//! from gp and a SurfacePtr from Adaptor3d.
Standard_EXPORT Extrema_ExtPRevS(const gp_Pnt& P, const Handle(GeomAdaptor_HSurfaceOfRevolution)& S, const Standard_Real Umin, const Standard_Real Usup, const Standard_Real Vmin, const Standard_Real Vsup, const Standard_Real TolU, const Standard_Real TolV);
Standard_EXPORT Extrema_ExtPRevS(const gp_Pnt& P, const Handle(GeomAdaptor_SurfaceOfRevolution)& S, const Standard_Real Umin, const Standard_Real Usup, const Standard_Real Vmin, const Standard_Real Vsup, const Standard_Real TolU, const Standard_Real TolV);
//! It calculates all the distances between a point
//! from gp and a SurfacePtr from Adaptor3d.
Standard_EXPORT Extrema_ExtPRevS(const gp_Pnt& P, const Handle(GeomAdaptor_HSurfaceOfRevolution)& S, const Standard_Real TolU, const Standard_Real TolV);
Standard_EXPORT Extrema_ExtPRevS(const gp_Pnt& P, const Handle(GeomAdaptor_SurfaceOfRevolution)& S, const Standard_Real TolU, const Standard_Real TolV);
Standard_EXPORT void Initialize (const Handle(GeomAdaptor_HSurfaceOfRevolution)& S, const Standard_Real Umin, const Standard_Real Usup, const Standard_Real Vmin, const Standard_Real Vsup, const Standard_Real TolU, const Standard_Real TolV);
Standard_EXPORT void Initialize (const Handle(GeomAdaptor_SurfaceOfRevolution)& S, const Standard_Real Umin, const Standard_Real Usup, const Standard_Real Vmin, const Standard_Real Vsup, const Standard_Real TolU, const Standard_Real TolV);
Standard_EXPORT void Perform (const gp_Pnt& P);
@@ -85,7 +72,7 @@ protected:
private:
Handle(GeomAdaptor_HSurfaceOfRevolution) myS;
Handle(GeomAdaptor_SurfaceOfRevolution) myS;
Standard_Real myvinf;
Standard_Real myvsup;
Standard_Real mytolv;

8
src/Extrema/Extrema_ExtPS.cxx
View File

@@ -14,8 +14,8 @@
//-----------------------------------------------------------------
#include <GeomAdaptor_HSurfaceOfLinearExtrusion.hxx>
#include <GeomAdaptor_HSurfaceOfRevolution.hxx>
#include <GeomAdaptor_SurfaceOfLinearExtrusion.hxx>
#include <GeomAdaptor_SurfaceOfRevolution.hxx>
#include <Adaptor3d_Surface.hxx>
#include <ElCLib.hxx>
#include <Extrema_ExtPExtS.hxx>
@@ -301,7 +301,7 @@ void Extrema_ExtPS::Perform(const gp_Pnt& thePoint)
{
if (myExtPExtS.IsNull())
{
Handle(GeomAdaptor_HSurfaceOfLinearExtrusion) aS (new GeomAdaptor_HSurfaceOfLinearExtrusion (
Handle(GeomAdaptor_SurfaceOfLinearExtrusion) aS (new GeomAdaptor_SurfaceOfLinearExtrusion (
GeomAdaptor_SurfaceOfLinearExtrusion (myS->BasisCurve(), myS->Direction())));
myExtPExtS = new Extrema_ExtPExtS (thePoint, aS, myuinf, myusup, myvinf, myvsup, mytolu, mytolv);
@@ -327,7 +327,7 @@ void Extrema_ExtPS::Perform(const gp_Pnt& thePoint)
{
if (myExtPRevS.IsNull())
{
Handle(GeomAdaptor_HSurfaceOfRevolution) aS (new GeomAdaptor_HSurfaceOfRevolution (
Handle(GeomAdaptor_SurfaceOfRevolution) aS (new GeomAdaptor_SurfaceOfRevolution (
GeomAdaptor_SurfaceOfRevolution (myS->BasisCurve(), myS->AxeOfRevolution())));
myExtPRevS = new Extrema_ExtPRevS (thePoint, aS, myuinf, myusup, myvinf, myvsup, mytolu, mytolv);

10
src/Extrema/Extrema_GenExtCS.cxx
View File

@@ -17,9 +17,9 @@
#include <Extrema_GenExtCS.hxx>
#include <Adaptor3d_Curve.hxx>
#include <Adaptor3d_HCurve.hxx>
#include <Adaptor3d_Curve.hxx>
#include <Adaptor3d_Surface.hxx>
#include <Adaptor3d_Surface.hxx>
#include <Adaptor3d_HSurface.hxx>
#include <Geom_OffsetCurve.hxx>
#include <Extrema_GlobOptFuncCS.hxx>
#include <Extrema_GlobOptFuncConicS.hxx>
@@ -90,15 +90,15 @@ static void GetSurfMaxParamVals (const Adaptor3d_Surface& theS,
if (theS.GetType() == GeomAbs_SurfaceOfExtrusion)
{
theUmax = GetCurvMaxParamVal (theS.BasisCurve()->Curve());
theUmax = GetCurvMaxParamVal (*theS.BasisCurve());
}
else if (theS.GetType() == GeomAbs_SurfaceOfRevolution)
{
theVmax = GetCurvMaxParamVal (theS.BasisCurve()->Curve());
theVmax = GetCurvMaxParamVal (*theS.BasisCurve());
}
else if (theS.GetType() == GeomAbs_OffsetSurface)
{
GetSurfMaxParamVals (theS.BasisSurface()->Surface(), theUmax, theVmax);
GetSurfMaxParamVals (*theS.BasisSurface(), theUmax, theVmax);
}
}

19
src/Extrema/Extrema_GenExtPS.cxx
View File

@@ -16,15 +16,14 @@
// Modified by skv - Thu Sep 30 15:21:07 2004 OCC593
#include <Extrema_GenExtPS.hxx>
#include <Adaptor3d_Curve.hxx>
#include <Adaptor3d_HCurve.hxx>
#include <Adaptor3d_HSurface.hxx>
#include <Adaptor3d_Surface.hxx>
#include <Bnd_Array1OfSphere.hxx>
#include <Bnd_HArray1OfSphere.hxx>
#include <Bnd_Sphere.hxx>
#include <Extrema_ExtFlag.hxx>
#include <Extrema_GenExtPS.hxx>
#include <Extrema_HUBTreeOfSphere.hxx>
#include <Extrema_POnSurf.hxx>
#include <Extrema_POnSurfParams.hxx>
@@ -363,8 +362,10 @@ void Extrema_GenExtPS::GetGridPoints( const Adaptor3d_Surface& theSurf)
{
//creation parametric points for BSpline and Bezier surfaces
//with taking into account of Degree and NbKnots of BSpline or Bezier geometry
if(theSurf.GetType() == GeomAbs_OffsetSurface)
GetGridPoints(theSurf.BasisSurface()->Surface());
if (theSurf.GetType() == GeomAbs_OffsetSurface)
{
GetGridPoints (*theSurf.BasisSurface());
}
//parametric points for BSpline surfaces
else if( theSurf.GetType() == GeomAbs_BSplineSurface)
{
@@ -399,9 +400,9 @@ void Extrema_GenExtPS::GetGridPoints( const Adaptor3d_Surface& theSurf)
{
Handle(TColStd_HArray1OfReal) anArrKnots;
Standard_Integer aDegree = 0;
if(theSurf.BasisCurve()->Curve().GetType() == GeomAbs_BSplineCurve)
if(theSurf.BasisCurve()->GetType() == GeomAbs_BSplineCurve)
{
Handle(Geom_BSplineCurve) aBspl = theSurf.BasisCurve()->Curve().BSpline();
Handle(Geom_BSplineCurve) aBspl = theSurf.BasisCurve()->BSpline();
if(!aBspl.IsNull())
{
anArrKnots = new TColStd_HArray1OfReal(1,aBspl->NbKnots());
@@ -411,9 +412,9 @@ void Extrema_GenExtPS::GetGridPoints( const Adaptor3d_Surface& theSurf)
}
}
if(theSurf.BasisCurve()->Curve().GetType() == GeomAbs_BezierCurve)
if(theSurf.BasisCurve()->GetType() == GeomAbs_BezierCurve)
{
Handle(Geom_BezierCurve) aBez = theSurf.BasisCurve()->Curve().Bezier();
Handle(Geom_BezierCurve) aBez = theSurf.BasisCurve()->Bezier();
if(!aBez.IsNull())
{
anArrKnots = new TColStd_HArray1OfReal(1,2);