From 09324e85c82abb29d60a3ec6d871a0e5919ffda1 Mon Sep 17 00:00:00 2001 From: kgv Date: Tue, 6 Jun 2017 15:30:19 +0300 Subject: [PATCH] 0028799: Coding Rules - elimilate confusing Quantity aliases of Standard_Real type Aliases to Standard_Real within Quantity package have been marked as deprecated. --- src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx | 2 +- src/BRepFill/BRepFill_Filling.cxx | 2 +- src/BRepSweep/BRepSweep_Revol.hxx | 21 +---- src/BRepSweep/BRepSweep_Rotation.hxx | 23 +----- src/Geom2dAPI/Geom2dAPI_ExtremaCurveCurve.hxx | 12 ++- .../Geom2dAPI_ProjectPointOnCurve.hxx | 27 ++----- src/GeomAPI/GeomAPI_ExtremaCurveCurve.cxx | 6 +- src/GeomAPI/GeomAPI_ExtremaCurveCurve.hxx | 28 ++----- src/GeomAPI/GeomAPI_ExtremaCurveSurface.hxx | 26 ++---- src/GeomAPI/GeomAPI_ExtremaSurfaceSurface.hxx | 26 ++---- src/GeomAPI/GeomAPI_IntCS.cxx | 14 ++-- src/GeomAPI/GeomAPI_IntCS.hxx | 5 +- src/GeomAPI/GeomAPI_ProjectPointOnCurve.hxx | 30 ++----- src/GeomAPI/GeomAPI_ProjectPointOnSurf.hxx | 31 +++----- src/Quantity/FILES | 4 - src/Quantity/Quantity_AbsorbedDose.hxx | 2 +- src/Quantity/Quantity_Acceleration.hxx | 1 + src/Quantity/Quantity_AcousticIntensity.hxx | 2 +- src/Quantity/Quantity_Activity.hxx | 2 +- src/Quantity/Quantity_Admittance.hxx | 2 +- src/Quantity/Quantity_AmountOfSubstance.hxx | 1 + src/Quantity/Quantity_AngularVelocity.hxx | 1 + src/Quantity/Quantity_Area.hxx | 1 + src/Quantity/Quantity_Array1OfCoefficient.hxx | 26 ------ src/Quantity/Quantity_Capacitance.hxx | 2 +- src/Quantity/Quantity_Coefficient.hxx | 2 +- .../Quantity_CoefficientOfExpansion.hxx | 2 +- src/Quantity/Quantity_Color.cxx | 4 +- src/Quantity/Quantity_Color.hxx | 5 +- src/Quantity/Quantity_Concentration.hxx | 2 +- src/Quantity/Quantity_Conductivity.hxx | 2 +- src/Quantity/Quantity_Constant.hxx | 2 +- src/Quantity/Quantity_Consumption.hxx | 2 +- src/Quantity/Quantity_Content.hxx | 2 +- src/Quantity/Quantity_Convert.cxx | 7 +- src/Quantity/Quantity_Convert.hxx | 79 ++++++++++--------- src/Quantity/Quantity_Convert.lxx | 71 ----------------- src/Quantity/Quantity_Date.hxx | 27 ++----- src/Quantity/Quantity_Date.lxx | 19 ----- src/Quantity/Quantity_Density.hxx | 1 + src/Quantity/Quantity_DoseEquivalent.hxx | 2 +- src/Quantity/Quantity_ElectricCapacitance.hxx | 2 +- src/Quantity/Quantity_ElectricCharge.hxx | 2 +- src/Quantity/Quantity_ElectricCurrent.hxx | 2 +- .../Quantity_ElectricFieldStrength.hxx | 2 +- src/Quantity/Quantity_ElectricPotential.hxx | 2 +- src/Quantity/Quantity_Energy.hxx | 2 +- src/Quantity/Quantity_Enthalpy.hxx | 2 +- src/Quantity/Quantity_Entropy.hxx | 2 +- src/Quantity/Quantity_Factor.hxx | 2 +- src/Quantity/Quantity_Force.hxx | 2 +- src/Quantity/Quantity_Frequency.hxx | 1 + src/Quantity/Quantity_Illuminance.hxx | 2 +- src/Quantity/Quantity_Impedance.hxx | 2 +- src/Quantity/Quantity_Index.hxx | 2 +- src/Quantity/Quantity_Inductance.hxx | 2 +- src/Quantity/Quantity_KinematicViscosity.hxx | 2 +- src/Quantity/Quantity_KineticMoment.hxx | 2 +- src/Quantity/Quantity_Length.hxx | 1 + src/Quantity/Quantity_Luminance.hxx | 2 +- src/Quantity/Quantity_LuminousEfficacity.hxx | 2 +- src/Quantity/Quantity_LuminousExposition.hxx | 2 +- src/Quantity/Quantity_LuminousFlux.hxx | 2 +- src/Quantity/Quantity_LuminousIntensity.hxx | 2 +- .../Quantity_MagneticFieldStrength.hxx | 2 +- src/Quantity/Quantity_MagneticFlux.hxx | 2 +- src/Quantity/Quantity_MagneticFluxDensity.hxx | 2 +- src/Quantity/Quantity_Mass.hxx | 1 + src/Quantity/Quantity_MassFlow.hxx | 2 +- src/Quantity/Quantity_MolarConcentration.hxx | 2 +- src/Quantity/Quantity_MolarMass.hxx | 2 +- src/Quantity/Quantity_MolarVolume.hxx | 2 +- src/Quantity/Quantity_Molarity.hxx | 2 +- src/Quantity/Quantity_MomentOfAForce.hxx | 2 +- src/Quantity/Quantity_MomentOfInertia.hxx | 2 +- src/Quantity/Quantity_Momentum.hxx | 2 +- src/Quantity/Quantity_Normality.hxx | 2 +- src/Quantity/Quantity_Parameter.hxx | 2 +- src/Quantity/Quantity_Period.hxx | 20 ----- src/Quantity/Quantity_Period.lxx | 35 -------- src/Quantity/Quantity_PlaneAngle.hxx | 1 + src/Quantity/Quantity_Power.hxx | 2 +- src/Quantity/Quantity_Pressure.hxx | 2 +- src/Quantity/Quantity_Quotient.hxx | 2 +- src/Quantity/Quantity_Rate.hxx | 2 +- src/Quantity/Quantity_Ratio.hxx | 2 +- src/Quantity/Quantity_Reluctance.hxx | 2 +- src/Quantity/Quantity_Resistance.hxx | 2 +- src/Quantity/Quantity_Resistivity.hxx | 2 +- src/Quantity/Quantity_Scalaire.hxx | 1 + src/Quantity/Quantity_SolidAngle.hxx | 1 + src/Quantity/Quantity_SoundIntensity.hxx | 2 +- .../Quantity_SpecificHeatCapacity.hxx | 2 +- src/Quantity/Quantity_Speed.hxx | 1 + src/Quantity/Quantity_SurfaceTension.hxx | 2 +- src/Quantity/Quantity_Temperature.hxx | 1 + src/Quantity/Quantity_ThermalConductivity.hxx | 2 +- src/Quantity/Quantity_Torque.hxx | 2 +- src/Quantity/Quantity_Velocity.hxx | 1 + src/Quantity/Quantity_Viscosity.hxx | 2 +- src/Quantity/Quantity_Volume.hxx | 1 + src/Quantity/Quantity_VolumeFlow.hxx | 2 +- src/Quantity/Quantity_Weight.hxx | 2 +- src/Quantity/Quantity_Work.hxx | 2 +- src/VrmlAPI/VrmlAPI_Writer.hxx | 31 ++------ src/VrmlConverter/VrmlConverter_Drawer.cxx | 4 +- src/VrmlConverter/VrmlConverter_Drawer.hxx | 23 +----- src/VrmlConverter/VrmlConverter_Projector.cxx | 14 ++-- src/VrmlConverter/VrmlConverter_Projector.hxx | 17 +--- ...mlConverter_WFDeflectionRestrictedFace.cxx | 8 +- ...mlConverter_WFDeflectionRestrictedFace.hxx | 24 +----- 111 files changed, 224 insertions(+), 590 deletions(-) delete mode 100644 src/Quantity/Quantity_Array1OfCoefficient.hxx delete mode 100644 src/Quantity/Quantity_Convert.lxx delete mode 100644 src/Quantity/Quantity_Date.lxx delete mode 100644 src/Quantity/Quantity_Period.lxx diff --git a/src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx b/src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx index c0b7e470aa..83bb7150b3 100644 --- a/src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx +++ b/src/BRepFeat/BRepFeat_MakeRevolutionForm.cxx @@ -164,7 +164,7 @@ void BRepFeat_MakeRevolutionForm::Init(const TopoDS_Shape& Sbase, Handle(Geom_Curve) c = BRep_Tool::Curve(e, f, l); Handle(Geom2d_Curve) c2d = GeomAPI::To2d(c, Plane->Pln()); Geom2dAPI_ExtremaCurveCurve extr(ln2d, c2d, LineFirst, LineLast,f,l); - Quantity_Length L = RealLast(); + Standard_Real L = RealLast(); if(extr.NbExtrema() >= 1) { L = extr.LowerDistance(); } diff --git a/src/BRepFill/BRepFill_Filling.cxx b/src/BRepFill/BRepFill_Filling.cxx index b0c8ccddcf..5fe70c8265 100644 --- a/src/BRepFill/BRepFill_Filling.cxx +++ b/src/BRepFill/BRepFill_Filling.cxx @@ -576,7 +576,7 @@ void BRepFill_Filling::Build() for (j = 1; j <= myFreeConstraints.Length(); j++) { GeomAPI_ProjectPointOnSurf Projector; - Quantity_Parameter U1, V1, U2, V2; + Standard_Real U1, V1, U2, V2; CurFace = myFreeConstraints(j).myFace; Handle( BRepAdaptor_HSurface ) HSurf = new BRepAdaptor_HSurface(); diff --git a/src/BRepSweep/BRepSweep_Revol.hxx b/src/BRepSweep/BRepSweep_Revol.hxx index eb94dd3f8d..b78906755d 100644 --- a/src/BRepSweep/BRepSweep_Revol.hxx +++ b/src/BRepSweep/BRepSweep_Revol.hxx @@ -22,7 +22,6 @@ #include #include -#include #include #include class Standard_ConstructionError; @@ -43,7 +42,7 @@ public: //! Builds the Revol of meridian S axis A and angle D. If //! C is true S is copied. - Standard_EXPORT BRepSweep_Revol(const TopoDS_Shape& S, const gp_Ax1& A, const Quantity_PlaneAngle D, const Standard_Boolean C = Standard_False); + Standard_EXPORT BRepSweep_Revol(const TopoDS_Shape& S, const gp_Ax1& A, const Standard_Real D, const Standard_Boolean C = Standard_False); //! Builds the Revol of meridian S axis A and angle 2*Pi. //! If C is true S is copied. @@ -76,20 +75,10 @@ public: Standard_EXPORT gp_Ax1 Axe() const; //! returns the angle. - Standard_EXPORT Quantity_PlaneAngle Angle() const; - - - - -protected: - - - - + Standard_EXPORT Standard_Real Angle() const; private: - //! builds the NumShape. Standard_EXPORT Sweep_NumShape NumShape (const Standard_Real D) const; @@ -108,10 +97,4 @@ private: }; - - - - - - #endif // _BRepSweep_Revol_HeaderFile diff --git a/src/BRepSweep/BRepSweep_Rotation.hxx b/src/BRepSweep/BRepSweep_Rotation.hxx index 58b4b6451d..2adc5e4183 100644 --- a/src/BRepSweep/BRepSweep_Rotation.hxx +++ b/src/BRepSweep/BRepSweep_Rotation.hxx @@ -24,7 +24,6 @@ #include #include #include -#include #include #include class Standard_ConstructionError; @@ -45,7 +44,7 @@ public: //! Creates a topology by rotating around A with the //! angle D. - Standard_EXPORT BRepSweep_Rotation(const TopoDS_Shape& S, const Sweep_NumShape& N, const TopLoc_Location& L, const gp_Ax1& A, const Quantity_PlaneAngle D, const Standard_Boolean C); + Standard_EXPORT BRepSweep_Rotation(const TopoDS_Shape& S, const Sweep_NumShape& N, const TopLoc_Location& L, const gp_Ax1& A, const Standard_Real D, const Standard_Boolean C); //! Builds the vertex addressed by [aGenV,aDirV], with its //! geometric part, but without subcomponents. @@ -139,31 +138,13 @@ public: Standard_EXPORT gp_Ax1 Axe() const; //! returns the angle. - Standard_EXPORT Quantity_PlaneAngle Angle() const; - - - - -protected: - - - - + Standard_EXPORT Standard_Real Angle() const; private: - - Standard_Real myAng; gp_Ax1 myAxe; - }; - - - - - - #endif // _BRepSweep_Rotation_HeaderFile diff --git a/src/Geom2dAPI/Geom2dAPI_ExtremaCurveCurve.hxx b/src/Geom2dAPI/Geom2dAPI_ExtremaCurveCurve.hxx index 436f92d9ce..6e49db3278 100644 --- a/src/Geom2dAPI/Geom2dAPI_ExtremaCurveCurve.hxx +++ b/src/Geom2dAPI/Geom2dAPI_ExtremaCurveCurve.hxx @@ -25,8 +25,6 @@ #include #include #include -#include -#include class Standard_OutOfRange; class StdFail_NotDone; class Geom2d_Curve; @@ -72,7 +70,7 @@ public: //! Warning //! Use the function NbExtrema to obtain the number //! of solutions. If this algorithm fails, NbExtrema returns 0. - Standard_EXPORT Geom2dAPI_ExtremaCurveCurve(const Handle(Geom2d_Curve)& C1, const Handle(Geom2d_Curve)& C2, const Quantity_Parameter U1min, const Quantity_Parameter U1max, const Quantity_Parameter U2min, const Quantity_Parameter U2max); + Standard_EXPORT Geom2dAPI_ExtremaCurveCurve(const Handle(Geom2d_Curve)& C1, const Handle(Geom2d_Curve)& C2, const Standard_Real U1min, const Standard_Real U1max, const Standard_Real U2min, const Standard_Real U2max); //! Returns the number of extrema computed by this algorithm. //! Note: if this algorithm fails, NbExtrema returns 0. @@ -96,7 +94,7 @@ Standard_EXPORT operator Standard_Integer() const; //! Standard_OutOfRange if Index is not in the range [ //! 1,NbExtrema ], where NbExtrema is the //! number of extrema computed by this algorithm. - Standard_EXPORT void Parameters (const Standard_Integer Index, Quantity_Parameter& U1, Quantity_Parameter& U2) const; + Standard_EXPORT void Parameters (const Standard_Integer Index, Standard_Real& U1, Standard_Real& U2) const; //! Computes the distance between the end points of the //! extremum of index Index computed by this algorithm. @@ -104,7 +102,7 @@ Standard_EXPORT operator Standard_Integer() const; //! Standard_OutOfRange if Index is not in the range [ //! 1,NbExtrema ], where NbExtrema is the //! number of extrema computed by this algorithm. - Standard_EXPORT Quantity_Length Distance (const Standard_Integer Index) const; + Standard_EXPORT Standard_Real Distance (const Standard_Integer Index) const; //! Returns the points P1 on the first curve and P2 on //! the second curve, which are the ends of the shortest @@ -117,12 +115,12 @@ Standard_EXPORT operator Standard_Integer() const; //! are the ends of the shortest extremum computed by this algorithm. //! Exceptions //! StdFail_NotDone if this algorithm fails. - Standard_EXPORT void LowerDistanceParameters (Quantity_Parameter& U1, Quantity_Parameter& U2) const; + Standard_EXPORT void LowerDistanceParameters (Standard_Real& U1, Standard_Real& U2) const; //! Computes the distance between the end points of the //! shortest extremum computed by this algorithm. //! Exceptions - StdFail_NotDone if this algorithm fails. - Standard_EXPORT Quantity_Length LowerDistance() const; + Standard_EXPORT Standard_Real LowerDistance() const; Standard_EXPORT operator Standard_Real() const; const Extrema_ExtCC2d& Extrema() const; diff --git a/src/Geom2dAPI/Geom2dAPI_ProjectPointOnCurve.hxx b/src/Geom2dAPI/Geom2dAPI_ProjectPointOnCurve.hxx index 2e0bf3ec4f..260e1e94dd 100644 --- a/src/Geom2dAPI/Geom2dAPI_ProjectPointOnCurve.hxx +++ b/src/Geom2dAPI/Geom2dAPI_ProjectPointOnCurve.hxx @@ -25,8 +25,6 @@ #include #include #include -#include -#include class Standard_OutOfRange; class StdFail_NotDone; class gp_Pnt2d; @@ -57,7 +55,7 @@ public: //! Warning //! Use the function NbPoints to obtain the number of solutions. If //! projection fails, NbPoints returns 0. - Standard_EXPORT Geom2dAPI_ProjectPointOnCurve(const gp_Pnt2d& P, const Handle(Geom2d_Curve)& Curve, const Quantity_Parameter Umin, const Quantity_Parameter Usup); + Standard_EXPORT Geom2dAPI_ProjectPointOnCurve(const gp_Pnt2d& P, const Handle(Geom2d_Curve)& Curve, const Standard_Real Umin, const Standard_Real Usup); //! Initializes this algorithm with the given arguments, and //! computes the orthogonal projections of a point

on a curve @@ -66,7 +64,7 @@ public: //! Initializes this algorithm with the given arguments, and //! computes the orthogonal projections of the point P onto the portion //! of the curve Curve limited by the two points of parameter Umin and Usup. - Standard_EXPORT void Init (const gp_Pnt2d& P, const Handle(Geom2d_Curve)& Curve, const Quantity_Parameter Umin, const Quantity_Parameter Usup); + Standard_EXPORT void Init (const gp_Pnt2d& P, const Handle(Geom2d_Curve)& Curve, const Standard_Real Umin, const Standard_Real Usup); //! return the number of of computed //! orthogonal projectionn points. @@ -86,7 +84,7 @@ Standard_EXPORT operator Standard_Integer() const; //! Exceptions //! Standard_OutOfRange if Index is not in the range [ 1,NbPoints ], where //! NbPoints is the number of solution points. - Standard_EXPORT Quantity_Parameter Parameter (const Standard_Integer Index) const; + Standard_EXPORT Standard_Real Parameter (const Standard_Integer Index) const; //! Returns the parameter on the curve //! of a point which is the orthogonal projection. Index is a number of a @@ -94,7 +92,7 @@ Standard_EXPORT operator Standard_Integer() const; //! Exceptions //! Standard_OutOfRange if Index is not in the range [ 1,NbPoints ], where //! NbPoints is the number of solution points - Standard_EXPORT void Parameter (const Standard_Integer Index, Quantity_Parameter& U) const; + Standard_EXPORT void Parameter (const Standard_Integer Index, Standard_Real& U) const; //! Computes the distance between the //! point and its computed orthogonal projection on the curve. Index is a @@ -102,7 +100,7 @@ Standard_EXPORT operator Standard_Integer() const; //! Exceptions //! Standard_OutOfRange if Index is not in the range [ 1,NbPoints ], where //! NbPoints is the number of solution points. - Standard_EXPORT Quantity_Length Distance (const Standard_Integer Index) const; + Standard_EXPORT Standard_Real Distance (const Standard_Integer Index) const; //! Returns the nearest orthogonal projection of the point on the curve. //! Exceptions @@ -114,31 +112,20 @@ Standard_EXPORT operator gp_Pnt2d() const; //! of the nearest orthogonal projection of the point. //! Exceptions //! StdFail_NotDone if this algorithm fails. - Standard_EXPORT Quantity_Parameter LowerDistanceParameter() const; + Standard_EXPORT Standard_Real LowerDistanceParameter() const; //! Computes the distance between the //! point and its nearest orthogonal projection on the curve. //! Exceptions //! StdFail_NotDone if this algorithm fails. - Standard_EXPORT Quantity_Length LowerDistance() const; + Standard_EXPORT Standard_Real LowerDistance() const; Standard_EXPORT operator Standard_Real() const; //! return the algorithmic object from Extrema const Extrema_ExtPC2d& Extrema() const; - - - -protected: - - - - - private: - - Standard_Boolean myIsDone; Standard_Integer myIndex; Extrema_ExtPC2d myExtPC; diff --git a/src/GeomAPI/GeomAPI_ExtremaCurveCurve.cxx b/src/GeomAPI/GeomAPI_ExtremaCurveCurve.cxx index e608044c38..f09b294d47 100644 --- a/src/GeomAPI/GeomAPI_ExtremaCurveCurve.cxx +++ b/src/GeomAPI/GeomAPI_ExtremaCurveCurve.cxx @@ -303,8 +303,8 @@ Standard_Boolean GeomAPI_ExtremaCurveCurve::TotalNearestPoints(gp_Pnt& P1,gp_Pnt } -Standard_Boolean GeomAPI_ExtremaCurveCurve::TotalLowerDistanceParameters(Quantity_Parameter& U1, - Quantity_Parameter& U2) +Standard_Boolean GeomAPI_ExtremaCurveCurve::TotalLowerDistanceParameters(Standard_Real& U1, + Standard_Real& U2) { if(!myTotalExt) { @@ -322,7 +322,7 @@ Standard_Boolean GeomAPI_ExtremaCurveCurve::TotalLowerDistanceParameters(Quantit } -Quantity_Length GeomAPI_ExtremaCurveCurve::TotalLowerDistance() +Standard_Real GeomAPI_ExtremaCurveCurve::TotalLowerDistance() { if(!myTotalExt) { diff --git a/src/GeomAPI/GeomAPI_ExtremaCurveCurve.hxx b/src/GeomAPI/GeomAPI_ExtremaCurveCurve.hxx index e508f3461d..9aa545c0f9 100644 --- a/src/GeomAPI/GeomAPI_ExtremaCurveCurve.hxx +++ b/src/GeomAPI/GeomAPI_ExtremaCurveCurve.hxx @@ -27,8 +27,6 @@ #include #include #include -#include -#include class Standard_OutOfRange; class StdFail_NotDone; class Geom_Curve; @@ -80,7 +78,7 @@ public: //! Warning //! Use the function NbExtrema to obtain the number //! of solutions. If this algorithm fails, NbExtrema returns 0. - Standard_EXPORT GeomAPI_ExtremaCurveCurve(const Handle(Geom_Curve)& C1, const Handle(Geom_Curve)& C2, const Quantity_Parameter U1min, const Quantity_Parameter U1max, const Quantity_Parameter U2min, const Quantity_Parameter U2max); + Standard_EXPORT GeomAPI_ExtremaCurveCurve(const Handle(Geom_Curve)& C1, const Handle(Geom_Curve)& C2, const Standard_Real U1min, const Standard_Real U1max, const Standard_Real U2min, const Standard_Real U2max); //! Initializes this algorithm with the given arguments //! and computes the extrema between the curves C1 and C2 @@ -95,7 +93,7 @@ public: //! Warning //! Use the function NbExtrema to obtain the number //! of solutions. If this algorithm fails, NbExtrema returns 0. - Standard_EXPORT void Init (const Handle(Geom_Curve)& C1, const Handle(Geom_Curve)& C2, const Quantity_Parameter U1min, const Quantity_Parameter U1max, const Quantity_Parameter U2min, const Quantity_Parameter U2max); + Standard_EXPORT void Init (const Handle(Geom_Curve)& C1, const Handle(Geom_Curve)& C2, const Standard_Real U1min, const Standard_Real U1max, const Standard_Real U2min, const Standard_Real U2max); //! Returns the number of extrema computed by this algorithm. //! Note: if this algorithm fails, NbExtrema returns 0. @@ -118,7 +116,7 @@ Standard_EXPORT operator Standard_Integer() const; //! Standard_OutOfRange if Index is not in the range [ //! 1,NbExtrema ], where NbExtrema is the //! number of extrema computed by this algorithm. - Standard_EXPORT void Parameters (const Standard_Integer Index, Quantity_Parameter& U1, Quantity_Parameter& U2) const; + Standard_EXPORT void Parameters (const Standard_Integer Index, Standard_Real& U1, Standard_Real& U2) const; //! Computes the distance between the end points of the //! extremum of index Index computed by this algorithm. @@ -126,7 +124,7 @@ Standard_EXPORT operator Standard_Integer() const; //! Standard_OutOfRange if Index is not in the range [ //! 1,NbExtrema ], where NbExtrema is the //! number of extrema computed by this algorithm. - Standard_EXPORT Quantity_Length Distance (const Standard_Integer Index) const; + Standard_EXPORT Standard_Real Distance (const Standard_Integer Index) const; //! Returns the points P1 on the first curve and P2 on //! the second curve, which are the ends of the shortest @@ -138,12 +136,12 @@ Standard_EXPORT operator Standard_Integer() const; //! curve and U2 of the point on the second curve, which //! are the ends of the shortest extremum computed by this algorithm. //! Exceptions StdFail_NotDone if this algorithm fails. - Standard_EXPORT void LowerDistanceParameters (Quantity_Parameter& U1, Quantity_Parameter& U2) const; + Standard_EXPORT void LowerDistanceParameters (Standard_Real& U1, Standard_Real& U2) const; //! Computes the distance between the end points of the //! shortest extremum computed by this algorithm. //! Exceptions StdFail_NotDone if this algorithm fails. - Standard_EXPORT Quantity_Length LowerDistance() const; + Standard_EXPORT Standard_Real LowerDistance() const; Standard_EXPORT operator Standard_Real() const; //! return the algorithmic object from Extrema @@ -157,24 +155,14 @@ Standard_EXPORT operator Standard_Real() const; //! set in and the parameters of the couple //! solution points which represents the total nearest //! solution. - Standard_EXPORT Standard_Boolean TotalLowerDistanceParameters (Quantity_Parameter& U1, Quantity_Parameter& U2); + Standard_EXPORT Standard_Boolean TotalLowerDistanceParameters (Standard_Real& U1, Standard_Real& U2); //! return the distance of the total nearest couple solution //! point. //! if is not done - Standard_EXPORT Quantity_Length TotalLowerDistance(); - - - - -protected: - - - - + Standard_EXPORT Standard_Real TotalLowerDistance(); private: - Standard_EXPORT void TotalPerform(); diff --git a/src/GeomAPI/GeomAPI_ExtremaCurveSurface.hxx b/src/GeomAPI/GeomAPI_ExtremaCurveSurface.hxx index 1d76316a86..6e08b14d75 100644 --- a/src/GeomAPI/GeomAPI_ExtremaCurveSurface.hxx +++ b/src/GeomAPI/GeomAPI_ExtremaCurveSurface.hxx @@ -24,8 +24,6 @@ #include #include #include -#include -#include class Standard_OutOfRange; class StdFail_NotDone; class Geom_Curve; @@ -83,7 +81,7 @@ public: //! Warning //! Use the function NbExtrema to obtain the number //! of solutions. If this algorithm fails, NbExtrema returns 0. - Standard_EXPORT GeomAPI_ExtremaCurveSurface(const Handle(Geom_Curve)& Curve, const Handle(Geom_Surface)& Surface, const Quantity_Parameter Wmin, const Quantity_Parameter Wmax, const Quantity_Parameter Umin, const Quantity_Parameter Umax, const Quantity_Parameter Vmin, const Quantity_Parameter Vmax); + Standard_EXPORT GeomAPI_ExtremaCurveSurface(const Handle(Geom_Curve)& Curve, const Handle(Geom_Surface)& Surface, const Standard_Real Wmin, const Standard_Real Wmax, const Standard_Real Umin, const Standard_Real Umax, const Standard_Real Vmin, const Standard_Real Vmax); //! Computes the extrema distances between the //! curve and the surface . @@ -97,7 +95,7 @@ public: //! Warning //! Use the function NbExtrema to obtain the number //! of solutions. If this algorithm fails, NbExtrema returns 0. - Standard_EXPORT void Init (const Handle(Geom_Curve)& Curve, const Handle(Geom_Surface)& Surface, const Quantity_Parameter Wmin, const Quantity_Parameter Wmax, const Quantity_Parameter Umin, const Quantity_Parameter Umax, const Quantity_Parameter Vmin, const Quantity_Parameter Vmax); + Standard_EXPORT void Init (const Handle(Geom_Curve)& Curve, const Handle(Geom_Surface)& Surface, const Standard_Real Wmin, const Standard_Real Wmax, const Standard_Real Umin, const Standard_Real Umax, const Standard_Real Vmin, const Standard_Real Vmax); //! Returns the number of extrema computed by this algorithm. //! Note: if this algorithm fails, NbExtrema returns 0. @@ -120,7 +118,7 @@ Standard_EXPORT operator Standard_Integer() const; //! Standard_OutOfRange if Index is not in the range [ //! 1,NbExtrema ], where NbExtrema is the //! number of extrema computed by this algorithm. - Standard_EXPORT void Parameters (const Standard_Integer Index, Quantity_Parameter& W, Quantity_Parameter& U, Quantity_Parameter& V) const; + Standard_EXPORT void Parameters (const Standard_Integer Index, Standard_Real& W, Standard_Real& U, Standard_Real& V) const; //! Computes the distance between the end points of the //! extremum of index Index computed by this algorithm. @@ -128,7 +126,7 @@ Standard_EXPORT operator Standard_Integer() const; //! Standard_OutOfRange if index is not in the range [ //! 1,NbExtrema ], where NbExtrema is the //! number of extrema computed by this algorithm. - Standard_EXPORT Quantity_Length Distance (const Standard_Integer Index) const; + Standard_EXPORT Standard_Real Distance (const Standard_Integer Index) const; //! Returns the points PC on the curve and PS on the //! surface, which are the ends of the shortest extremum computed by this algorithm. @@ -139,35 +137,23 @@ Standard_EXPORT operator Standard_Integer() const; //! and (U,V) of the point on the surface, which are the //! ends of the shortest extremum computed by this algorithm. //! Exceptions - StdFail_NotDone if this algorithm fails. - Standard_EXPORT void LowerDistanceParameters (Quantity_Parameter& W, Quantity_Parameter& U, Quantity_Parameter& V) const; + Standard_EXPORT void LowerDistanceParameters (Standard_Real& W, Standard_Real& U, Standard_Real& V) const; //! Computes the distance between the end points of the //! shortest extremum computed by this algorithm. //! Exceptions - StdFail_NotDone if this algorithm fails. - Standard_EXPORT Quantity_Length LowerDistance() const; + Standard_EXPORT Standard_Real LowerDistance() const; Standard_EXPORT operator Standard_Real() const; //! Returns the algorithmic object from Extrema const Extrema_ExtCS& Extrema() const; - - - -protected: - - - - - private: - - Standard_Boolean myIsDone; Standard_Integer myIndex; Extrema_ExtCS myExtCS; - }; diff --git a/src/GeomAPI/GeomAPI_ExtremaSurfaceSurface.hxx b/src/GeomAPI/GeomAPI_ExtremaSurfaceSurface.hxx index 255864897b..894dc85f9e 100644 --- a/src/GeomAPI/GeomAPI_ExtremaSurfaceSurface.hxx +++ b/src/GeomAPI/GeomAPI_ExtremaSurfaceSurface.hxx @@ -24,8 +24,6 @@ #include #include #include -#include -#include class Standard_OutOfRange; class StdFail_NotDone; class Geom_Surface; @@ -80,7 +78,7 @@ public: //! the u parametric direction, and by the two //! values of parameter (V2min,V2max) in the v //! parametric direction. - Standard_EXPORT GeomAPI_ExtremaSurfaceSurface(const Handle(Geom_Surface)& S1, const Handle(Geom_Surface)& S2, const Quantity_Parameter U1min, const Quantity_Parameter U1max, const Quantity_Parameter V1min, const Quantity_Parameter V1max, const Quantity_Parameter U2min, const Quantity_Parameter U2max, const Quantity_Parameter V2min, const Quantity_Parameter V2max); + Standard_EXPORT GeomAPI_ExtremaSurfaceSurface(const Handle(Geom_Surface)& S1, const Handle(Geom_Surface)& S2, const Standard_Real U1min, const Standard_Real U1max, const Standard_Real V1min, const Standard_Real V1max, const Standard_Real U2min, const Standard_Real U2max, const Standard_Real V2min, const Standard_Real V2max); //! Initializes this algorithm with the given arguments //! and computes the extrema distances between the @@ -97,7 +95,7 @@ public: //! values of parameter (U2min,U2max) in the u //! parametric direction, and by the two values of //! parameter (V2min,V2max) in the v parametric direction. - Standard_EXPORT void Init (const Handle(Geom_Surface)& S1, const Handle(Geom_Surface)& S2, const Quantity_Parameter U1min, const Quantity_Parameter U1max, const Quantity_Parameter V1min, const Quantity_Parameter V1max, const Quantity_Parameter U2min, const Quantity_Parameter U2max, const Quantity_Parameter V2min, const Quantity_Parameter V2max); + Standard_EXPORT void Init (const Handle(Geom_Surface)& S1, const Handle(Geom_Surface)& S2, const Standard_Real U1min, const Standard_Real U1max, const Standard_Real V1min, const Standard_Real V1max, const Standard_Real U2min, const Standard_Real U2max, const Standard_Real V2min, const Standard_Real V2max); //! Returns the number of extrema computed by this algorithm. //! Note: if this algorithm fails, NbExtrema returns 0. @@ -121,7 +119,7 @@ Standard_EXPORT operator Standard_Integer() const; //! Standard_OutOfRange if Index is not in the range [ //! 1,NbExtrema ], where NbExtrema is the //! number of extrema computed by this algorithm. - Standard_EXPORT void Parameters (const Standard_Integer Index, Quantity_Parameter& U1, Quantity_Parameter& V1, Quantity_Parameter& U2, Quantity_Parameter& V2) const; + Standard_EXPORT void Parameters (const Standard_Integer Index, Standard_Real& U1, Standard_Real& V1, Standard_Real& U2, Standard_Real& V2) const; //! Computes the distance between the end points of the //! extremum of index Index computed by this algorithm. @@ -129,7 +127,7 @@ Standard_EXPORT operator Standard_Integer() const; //! Standard_OutOfRange if Index is not in the range [ //! 1,NbExtrema ], where NbExtrema is the //! number of extrema computed by this algorithm. - Standard_EXPORT Quantity_Length Distance (const Standard_Integer Index) const; + Standard_EXPORT Standard_Real Distance (const Standard_Integer Index) const; //! Returns the points P1 on the first surface and P2 on //! the second surface, which are the ends of the @@ -142,35 +140,23 @@ Standard_EXPORT operator Standard_Integer() const; //! surface, which are the ends of the shortest extremum //! computed by this algorithm. //! Exceptions - StdFail_NotDone if this algorithm fails. - Standard_EXPORT void LowerDistanceParameters (Quantity_Parameter& U1, Quantity_Parameter& V1, Quantity_Parameter& U2, Quantity_Parameter& V2) const; + Standard_EXPORT void LowerDistanceParameters (Standard_Real& U1, Standard_Real& V1, Standard_Real& U2, Standard_Real& V2) const; //! Computes the distance between the end points of the //! shortest extremum computed by this algorithm. //! Exceptions StdFail_NotDone if this algorithm fails. - Standard_EXPORT Quantity_Length LowerDistance() const; + Standard_EXPORT Standard_Real LowerDistance() const; Standard_EXPORT operator Standard_Real() const; //! return the algorithmic object from Extrema const Extrema_ExtSS& Extrema() const; - - - -protected: - - - - - private: - - Standard_Boolean myIsDone; Standard_Integer myIndex; Extrema_ExtSS myExtSS; - }; diff --git a/src/GeomAPI/GeomAPI_IntCS.cxx b/src/GeomAPI/GeomAPI_IntCS.cxx index c803c4cd60..8f4e4c7a52 100644 --- a/src/GeomAPI/GeomAPI_IntCS.cxx +++ b/src/GeomAPI/GeomAPI_IntCS.cxx @@ -106,9 +106,9 @@ const gp_Pnt& GeomAPI_IntCS::Point(const Standard_Integer Index) const //======================================================================= void GeomAPI_IntCS::Parameters(const Standard_Integer Index, - Quantity_Parameter& U, - Quantity_Parameter& V, - Quantity_Parameter& W) const + Standard_Real& U, + Standard_Real& V, + Standard_Real& W) const { const IntCurveSurface_IntersectionPoint& ThePoint = myIntCS.Point(Index); @@ -156,10 +156,10 @@ Handle(Geom_Curve) GeomAPI_IntCS::Segment(const Standard_Integer Index) const //======================================================================= void GeomAPI_IntCS::Parameters(const Standard_Integer Index, - Quantity_Parameter& U1, - Quantity_Parameter& V1, - Quantity_Parameter& U2, - Quantity_Parameter& V2) const + Standard_Real& U1, + Standard_Real& V1, + Standard_Real& U2, + Standard_Real& V2) const { const IntCurveSurface_IntersectionPoint& FirstPoint = myIntCS.Segment(Index).FirstPoint(); diff --git a/src/GeomAPI/GeomAPI_IntCS.hxx b/src/GeomAPI/GeomAPI_IntCS.hxx index 28762a5148..a4134d7a6f 100644 --- a/src/GeomAPI/GeomAPI_IntCS.hxx +++ b/src/GeomAPI/GeomAPI_IntCS.hxx @@ -24,7 +24,6 @@ #include #include #include -#include class Geom_Curve; class StdFail_NotDone; class Standard_OutOfRange; @@ -79,7 +78,7 @@ public: //! StdFail_NotDone if intersection algorithm fails or is not initialized. //! Standard_OutOfRange if Index is not in the range [ 1,NbPoints ], where //! NbPoints is the number of computed intersection points. - Standard_EXPORT void Parameters (const Standard_Integer Index, Quantity_Parameter& U, Quantity_Parameter& V, Quantity_Parameter& W) const; + Standard_EXPORT void Parameters (const Standard_Integer Index, Standard_Real& U, Standard_Real& V, Standard_Real& W) const; //! Returns the number of computed //! intersection segments in case of tangential intersection. @@ -103,7 +102,7 @@ public: //! StdFail_NotDone if intersection algorithm fails or is not initialized. //! Standard_OutOfRange if Index is not in the range [ 1,NbSegments ], //! where NbSegments is the number of computed intersection segments. - Standard_EXPORT void Parameters (const Standard_Integer Index, Quantity_Parameter& U1, Quantity_Parameter& V1, Quantity_Parameter& U2, Quantity_Parameter& V2) const; + Standard_EXPORT void Parameters (const Standard_Integer Index, Standard_Real& U1, Standard_Real& V1, Standard_Real& U2, Standard_Real& V2) const; diff --git a/src/GeomAPI/GeomAPI_ProjectPointOnCurve.hxx b/src/GeomAPI/GeomAPI_ProjectPointOnCurve.hxx index 0fdedec694..f1939067b2 100644 --- a/src/GeomAPI/GeomAPI_ProjectPointOnCurve.hxx +++ b/src/GeomAPI/GeomAPI_ProjectPointOnCurve.hxx @@ -25,8 +25,6 @@ #include #include #include -#include -#include class Standard_OutOfRange; class StdFail_NotDone; class gp_Pnt; @@ -54,7 +52,7 @@ public: //! Create the projection of a point

on a curve //! limited by the two points of parameter Umin and Usup. - Standard_EXPORT GeomAPI_ProjectPointOnCurve(const gp_Pnt& P, const Handle(Geom_Curve)& Curve, const Quantity_Parameter Umin, const Quantity_Parameter Usup); + Standard_EXPORT GeomAPI_ProjectPointOnCurve(const gp_Pnt& P, const Handle(Geom_Curve)& Curve, const Standard_Real Umin, const Standard_Real Usup); //! Init the projection of a point

on a curve //! @@ -62,11 +60,11 @@ public: //! Init the projection of a point

on a curve //! limited by the two points of parameter Umin and Usup. - Standard_EXPORT void Init (const gp_Pnt& P, const Handle(Geom_Curve)& Curve, const Quantity_Parameter Umin, const Quantity_Parameter Usup); + Standard_EXPORT void Init (const gp_Pnt& P, const Handle(Geom_Curve)& Curve, const Standard_Real Umin, const Standard_Real Usup); //! Init the projection of a point

on a curve //! limited by the two points of parameter Umin and Usup. - Standard_EXPORT void Init (const Handle(Geom_Curve)& Curve, const Quantity_Parameter Umin, const Quantity_Parameter Usup); + Standard_EXPORT void Init (const Handle(Geom_Curve)& Curve, const Standard_Real Umin, const Standard_Real Usup); //! Performs the projection of a point on the current curve. Standard_EXPORT void Perform (const gp_Pnt& P); @@ -90,7 +88,7 @@ Standard_EXPORT operator Standard_Integer() const; //! Exceptions //! Standard_OutOfRange if Index is not in the range [ 1,NbPoints ], where //! NbPoints is the number of solution points. - Standard_EXPORT Quantity_Parameter Parameter (const Standard_Integer Index) const; + Standard_EXPORT Standard_Real Parameter (const Standard_Integer Index) const; //! Returns the parameter on the curve //! of the point, which is the orthogonal projection. Index is a @@ -98,14 +96,14 @@ Standard_EXPORT operator Standard_Integer() const; //! Exceptions //! Standard_OutOfRange if Index is not in the range [ 1,NbPoints ], where //! NbPoints is the number of solution points.- - Standard_EXPORT void Parameter (const Standard_Integer Index, Quantity_Parameter& U) const; + Standard_EXPORT void Parameter (const Standard_Integer Index, Standard_Real& U) const; //! Computes the distance between the //! point and its orthogonal projection on the curve. Index is a number of a computed point. //! Exceptions //! Standard_OutOfRange if Index is not in the range [ 1,NbPoints ], where //! NbPoints is the number of solution points. - Standard_EXPORT Quantity_Length Distance (const Standard_Integer Index) const; + Standard_EXPORT Standard_Real Distance (const Standard_Integer Index) const; //! Returns the nearest orthogonal //! projection of the point on the curve. @@ -116,36 +114,24 @@ Standard_EXPORT operator gp_Pnt() const; //! Returns the parameter on the curve //! of the nearest orthogonal projection of the point. //! Exceptions: StdFail_NotDone if this algorithm fails. - Standard_EXPORT Quantity_Parameter LowerDistanceParameter() const; + Standard_EXPORT Standard_Real LowerDistanceParameter() const; //! Computes the distance between the //! point and its nearest orthogonal projection on the curve. //! Exceptions: StdFail_NotDone if this algorithm fails. - Standard_EXPORT Quantity_Length LowerDistance() const; + Standard_EXPORT Standard_Real LowerDistance() const; Standard_EXPORT operator Standard_Real() const; //! return the algorithmic object from Extrema const Extrema_ExtPC& Extrema() const; - - - -protected: - - - - - private: - - Standard_Boolean myIsDone; Standard_Integer myIndex; Extrema_ExtPC myExtPC; GeomAdaptor_Curve myC; - }; diff --git a/src/GeomAPI/GeomAPI_ProjectPointOnSurf.hxx b/src/GeomAPI/GeomAPI_ProjectPointOnSurf.hxx index 2619f446b8..0d1ad5acda 100644 --- a/src/GeomAPI/GeomAPI_ProjectPointOnSurf.hxx +++ b/src/GeomAPI/GeomAPI_ProjectPointOnSurf.hxx @@ -28,8 +28,6 @@ #include #include #include -#include -#include class Standard_OutOfRange; class StdFail_NotDone; class gp_Pnt; @@ -62,11 +60,11 @@ public: //! [Umin,Usup] [Vmin,Vsup] of the surface. Standard_EXPORT GeomAPI_ProjectPointOnSurf(const gp_Pnt& P, const Handle(Geom_Surface)& Surface, const Standard_Real Tolerance, const Extrema_ExtAlgo Algo = Extrema_ExtAlgo_Grad); - Standard_EXPORT GeomAPI_ProjectPointOnSurf(const gp_Pnt& P, const Handle(Geom_Surface)& Surface, const Quantity_Parameter Umin, const Quantity_Parameter Usup, const Quantity_Parameter Vmin, const Quantity_Parameter Vsup, const Standard_Real Tolerance, const Extrema_ExtAlgo Algo = Extrema_ExtAlgo_Grad); + Standard_EXPORT GeomAPI_ProjectPointOnSurf(const gp_Pnt& P, const Handle(Geom_Surface)& Surface, const Standard_Real Umin, const Standard_Real Usup, const Standard_Real Vmin, const Standard_Real Vsup, const Standard_Real Tolerance, const Extrema_ExtAlgo Algo = Extrema_ExtAlgo_Grad); //! Init the projection of a point

on a surface //! - Standard_EXPORT GeomAPI_ProjectPointOnSurf(const gp_Pnt& P, const Handle(Geom_Surface)& Surface, const Quantity_Parameter Umin, const Quantity_Parameter Usup, const Quantity_Parameter Vmin, const Quantity_Parameter Vsup, const Extrema_ExtAlgo Algo = Extrema_ExtAlgo_Grad); + Standard_EXPORT GeomAPI_ProjectPointOnSurf(const gp_Pnt& P, const Handle(Geom_Surface)& Surface, const Standard_Real Umin, const Standard_Real Usup, const Standard_Real Vmin, const Standard_Real Vsup, const Extrema_ExtAlgo Algo = Extrema_ExtAlgo_Grad); Standard_EXPORT void Init (const gp_Pnt& P, const Handle(Geom_Surface)& Surface, const Standard_Real Tolerance, const Extrema_ExtAlgo Algo = Extrema_ExtAlgo_Grad); @@ -75,16 +73,16 @@ public: //! [Umin,Usup] [Vmin,Vsup] of the surface. Standard_EXPORT void Init (const gp_Pnt& P, const Handle(Geom_Surface)& Surface, const Extrema_ExtAlgo Algo = Extrema_ExtAlgo_Grad); - Standard_EXPORT void Init (const gp_Pnt& P, const Handle(Geom_Surface)& Surface, const Quantity_Parameter Umin, const Quantity_Parameter Usup, const Quantity_Parameter Vmin, const Quantity_Parameter Vsup, const Standard_Real Tolerance, const Extrema_ExtAlgo Algo = Extrema_ExtAlgo_Grad); + Standard_EXPORT void Init (const gp_Pnt& P, const Handle(Geom_Surface)& Surface, const Standard_Real Umin, const Standard_Real Usup, const Standard_Real Vmin, const Standard_Real Vsup, const Standard_Real Tolerance, const Extrema_ExtAlgo Algo = Extrema_ExtAlgo_Grad); //! Init the projection for many points on a surface //! . The solutions will be computed in the domain //! [Umin,Usup] [Vmin,Vsup] of the surface. - Standard_EXPORT void Init (const gp_Pnt& P, const Handle(Geom_Surface)& Surface, const Quantity_Parameter Umin, const Quantity_Parameter Usup, const Quantity_Parameter Vmin, const Quantity_Parameter Vsup, const Extrema_ExtAlgo Algo = Extrema_ExtAlgo_Grad); + Standard_EXPORT void Init (const gp_Pnt& P, const Handle(Geom_Surface)& Surface, const Standard_Real Umin, const Standard_Real Usup, const Standard_Real Vmin, const Standard_Real Vsup, const Extrema_ExtAlgo Algo = Extrema_ExtAlgo_Grad); - Standard_EXPORT void Init (const Handle(Geom_Surface)& Surface, const Quantity_Parameter Umin, const Quantity_Parameter Usup, const Quantity_Parameter Vmin, const Quantity_Parameter Vsup, const Standard_Real Tolerance, const Extrema_ExtAlgo Algo = Extrema_ExtAlgo_Grad); + Standard_EXPORT void Init (const Handle(Geom_Surface)& Surface, const Standard_Real Umin, const Standard_Real Usup, const Standard_Real Vmin, const Standard_Real Vsup, const Standard_Real Tolerance, const Extrema_ExtAlgo Algo = Extrema_ExtAlgo_Grad); - Standard_EXPORT void Init (const Handle(Geom_Surface)& Surface, const Quantity_Parameter Umin, const Quantity_Parameter Usup, const Quantity_Parameter Vmin, const Quantity_Parameter Vsup, const Extrema_ExtAlgo Algo = Extrema_ExtAlgo_Grad); + Standard_EXPORT void Init (const Handle(Geom_Surface)& Surface, const Standard_Real Umin, const Standard_Real Usup, const Standard_Real Vmin, const Standard_Real Vsup, const Extrema_ExtAlgo Algo = Extrema_ExtAlgo_Grad); //! Sets the Extrema search algorithm - Grad or Tree.
//! By default the Extrema is initialized with Grad algorithm. @@ -123,7 +121,7 @@ Standard_EXPORT operator Standard_Integer() const; //! Exceptions //! Standard_OutOfRange if Index is not in the range [ 1,NbPoints ], where //! NbPoints is the number of solution points. - Standard_EXPORT void Parameters (const Standard_Integer Index, Quantity_Parameter& U, Quantity_Parameter& V) const; + Standard_EXPORT void Parameters (const Standard_Integer Index, Standard_Real& U, Standard_Real& V) const; //! Computes the distance between the //! point and its orthogonal projection on the surface. Index is a number @@ -131,7 +129,7 @@ Standard_EXPORT operator Standard_Integer() const; //! Exceptions //! Standard_OutOfRange if Index is not in the range [ 1,NbPoints ], where //! NbPoints is the number of solution points. - Standard_EXPORT Quantity_Length Distance (const Standard_Integer Index) const; + Standard_EXPORT Standard_Real Distance (const Standard_Integer Index) const; //! Returns the nearest orthogonal projection of the point //! on the surface. @@ -144,27 +142,18 @@ Standard_EXPORT operator gp_Pnt() const; //! surface of the nearest computed orthogonal projection of the point. //! Exceptions //! StdFail_NotDone if projection fails. - Standard_EXPORT void LowerDistanceParameters (Quantity_Parameter& U, Quantity_Parameter& V) const; + Standard_EXPORT void LowerDistanceParameters (Standard_Real& U, Standard_Real& V) const; //! Computes the distance between the //! point and its nearest orthogonal projection on the surface. //! Exceptions //! StdFail_NotDone if projection fails. - Standard_EXPORT Quantity_Length LowerDistance() const; + Standard_EXPORT Standard_Real LowerDistance() const; Standard_EXPORT operator Standard_Real() const; //! return the algorithmic object from Extrema const Extrema_ExtPS& Extrema() const; - - - -protected: - - - - - private: diff --git a/src/Quantity/FILES b/src/Quantity/FILES index 0f3e8068b6..c1c98e6899 100755 --- a/src/Quantity/FILES +++ b/src/Quantity/FILES @@ -6,7 +6,6 @@ Quantity_Admittance.hxx Quantity_AmountOfSubstance.hxx Quantity_AngularVelocity.hxx Quantity_Area.hxx -Quantity_Array1OfCoefficient.hxx Quantity_Array1OfColor.hxx Quantity_Array2OfColor.hxx Quantity_Capacitance.hxx @@ -25,10 +24,8 @@ Quantity_Consumption.hxx Quantity_Content.hxx Quantity_Convert.cxx Quantity_Convert.hxx -Quantity_Convert.lxx Quantity_Date.cxx Quantity_Date.hxx -Quantity_Date.lxx Quantity_DateDefinitionError.hxx Quantity_Density.hxx Quantity_DoseEquivalent.hxx @@ -73,7 +70,6 @@ Quantity_Normality.hxx Quantity_Parameter.hxx Quantity_Period.cxx Quantity_Period.hxx -Quantity_Period.lxx Quantity_PeriodDefinitionError.hxx Quantity_PhysicalQuantity.hxx Quantity_PlaneAngle.hxx diff --git a/src/Quantity/Quantity_AbsorbedDose.hxx b/src/Quantity/Quantity_AbsorbedDose.hxx index 66913a162f..718b9e1396 100644 --- a/src/Quantity/Quantity_AbsorbedDose.hxx +++ b/src/Quantity/Quantity_AbsorbedDose.hxx @@ -22,7 +22,7 @@ //! Defined as the energy absorbed per unit mass in an //! irradiated medium. //! It is measured in grays. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_AbsorbedDose; #endif // _Quantity_AbsorbedDose_HeaderFile diff --git a/src/Quantity/Quantity_Acceleration.hxx b/src/Quantity/Quantity_Acceleration.hxx index d5ece2ce59..3b0e732329 100644 --- a/src/Quantity/Quantity_Acceleration.hxx +++ b/src/Quantity/Quantity_Acceleration.hxx @@ -22,6 +22,7 @@ //! Defined as the change of velocity per unit time. //! It is a vector quantity. //! It is measured in metres per second per second. +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Acceleration; #endif // _Quantity_Acceleration_HeaderFile diff --git a/src/Quantity/Quantity_AcousticIntensity.hxx b/src/Quantity/Quantity_AcousticIntensity.hxx index 7e8e151f60..1d9de177ce 100644 --- a/src/Quantity/Quantity_AcousticIntensity.hxx +++ b/src/Quantity/Quantity_AcousticIntensity.hxx @@ -23,7 +23,7 @@ //! levels. The conventional unit, the bel, is the base ten //! logarithm of the ratio of the two pressures. In practice //! the decibel (one tenth of a bel) is used. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_AcousticIntensity; #endif // _Quantity_AcousticIntensity_HeaderFile diff --git a/src/Quantity/Quantity_Activity.hxx b/src/Quantity/Quantity_Activity.hxx index aa23119850..e33179e00c 100644 --- a/src/Quantity/Quantity_Activity.hxx +++ b/src/Quantity/Quantity_Activity.hxx @@ -22,7 +22,7 @@ //! Defined as the number of atoms of a radioactive //! substance which disintegrate per unit time. It is //! measured in becquerels (one disintegration per second). - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Activity; #endif // _Quantity_Activity_HeaderFile diff --git a/src/Quantity/Quantity_Admittance.hxx b/src/Quantity/Quantity_Admittance.hxx index 17bf9623ae..4b82e64f16 100644 --- a/src/Quantity/Quantity_Admittance.hxx +++ b/src/Quantity/Quantity_Admittance.hxx @@ -23,7 +23,7 @@ //! It is measured in Siemens (reciprocal Ohms). //! The square of the admittance is equal to the sum of the //! squares of the conductance and the susceptance. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Admittance; #endif // _Quantity_Admittance_HeaderFile diff --git a/src/Quantity/Quantity_AmountOfSubstance.hxx b/src/Quantity/Quantity_AmountOfSubstance.hxx index 219fa04997..9d1e92952a 100644 --- a/src/Quantity/Quantity_AmountOfSubstance.hxx +++ b/src/Quantity/Quantity_AmountOfSubstance.hxx @@ -24,6 +24,7 @@ //! Amount of substance is measured in moles. //! For all substances the number of molecules in a mole //! is given by Avogadro's Constant. +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_AmountOfSubstance; #endif // _Quantity_AmountOfSubstance_HeaderFile diff --git a/src/Quantity/Quantity_AngularVelocity.hxx b/src/Quantity/Quantity_AngularVelocity.hxx index 849891b0f1..1bbd5d47e8 100644 --- a/src/Quantity/Quantity_AngularVelocity.hxx +++ b/src/Quantity/Quantity_AngularVelocity.hxx @@ -22,6 +22,7 @@ //! Defined as the rate at which a body moves around an axis. //! It is quantified as change in direction per unit time. //! It is measured in radians per second. +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_AngularVelocity; #endif // _Quantity_AngularVelocity_HeaderFile diff --git a/src/Quantity/Quantity_Area.hxx b/src/Quantity/Quantity_Area.hxx index 0122bb132f..765fed1f4a 100644 --- a/src/Quantity/Quantity_Area.hxx +++ b/src/Quantity/Quantity_Area.hxx @@ -21,6 +21,7 @@ //! Defined as superficial extension. //! It is measured in square metres. +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Area; #endif // _Quantity_Area_HeaderFile diff --git a/src/Quantity/Quantity_Array1OfCoefficient.hxx b/src/Quantity/Quantity_Array1OfCoefficient.hxx deleted file mode 100644 index acd1f6640c..0000000000 --- a/src/Quantity/Quantity_Array1OfCoefficient.hxx +++ /dev/null @@ -1,26 +0,0 @@ -// Created on: 1994-02-08 -// Created by: Gilles DEBARBOUILLE -// Copyright (c) 1994-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -#ifndef Quantity_Array1OfCoefficient_HeaderFile -#define Quantity_Array1OfCoefficient_HeaderFile - -#include -#include - -typedef NCollection_Array1 Quantity_Array1OfCoefficient; - - -#endif diff --git a/src/Quantity/Quantity_Capacitance.hxx b/src/Quantity/Quantity_Capacitance.hxx index a196cbc959..e2da179794 100644 --- a/src/Quantity/Quantity_Capacitance.hxx +++ b/src/Quantity/Quantity_Capacitance.hxx @@ -26,7 +26,7 @@ //! them. //! It is measured in farads (coulomb per volt). //! In practice micro-, nano-, and pico-farads are used. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Capacitance; #endif // _Quantity_Capacitance_HeaderFile diff --git a/src/Quantity/Quantity_Coefficient.hxx b/src/Quantity/Quantity_Coefficient.hxx index d2a5281af4..df7c203481 100644 --- a/src/Quantity/Quantity_Coefficient.hxx +++ b/src/Quantity/Quantity_Coefficient.hxx @@ -19,7 +19,7 @@ #include +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Coefficient; - #endif // _Quantity_Coefficient_HeaderFile diff --git a/src/Quantity/Quantity_CoefficientOfExpansion.hxx b/src/Quantity/Quantity_CoefficientOfExpansion.hxx index 5b5f532c54..6f0f42fab0 100644 --- a/src/Quantity/Quantity_CoefficientOfExpansion.hxx +++ b/src/Quantity/Quantity_CoefficientOfExpansion.hxx @@ -26,7 +26,7 @@ //! For a gas there are coefficients for constant pressure //! and constant volume changes. //! It is measured in units of reciprocal degree kelvin. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_CoefficientOfExpansion; #endif // _Quantity_CoefficientOfExpansion_HeaderFile diff --git a/src/Quantity/Quantity_Color.cxx b/src/Quantity/Quantity_Color.cxx index 9c07c29c41..3c056ff8eb 100644 --- a/src/Quantity/Quantity_Color.cxx +++ b/src/Quantity/Quantity_Color.cxx @@ -121,7 +121,7 @@ Quantity_Color::Quantity_Color (const NCollection_Vec3& theRgb) } } -void Quantity_Color::ChangeContrast (const Quantity_Rate ADelta) { +void Quantity_Color::ChangeContrast (const Standard_Real ADelta) { Standard_ShortReal MyHue, MyLight, MySaturation; @@ -136,7 +136,7 @@ Standard_ShortReal MyHue, MyLight, MySaturation; } } -void Quantity_Color::ChangeIntensity (const Quantity_Rate ADelta) { +void Quantity_Color::ChangeIntensity (const Standard_Real ADelta) { Standard_ShortReal MyHue, MyLight, MySaturation; diff --git a/src/Quantity/Quantity_Color.hxx b/src/Quantity/Quantity_Color.hxx index 544b2ee027..a31c38da5d 100644 --- a/src/Quantity/Quantity_Color.hxx +++ b/src/Quantity/Quantity_Color.hxx @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -84,7 +83,7 @@ public: //! The variation is expressed as a percentage of the //! current value. //! It is a variation of the saturation. - Standard_EXPORT void ChangeContrast (const Quantity_Rate ADelta); + Standard_EXPORT void ChangeContrast (const Standard_Real ADelta); //! Increases or decreases the intensity by . //! is a percentage. Any value greater than zero @@ -92,7 +91,7 @@ public: //! The variation is expressed as a percentage of the //! current value. //! It is a variation of the lightness. - Standard_EXPORT void ChangeIntensity (const Quantity_Rate ADelta); + Standard_EXPORT void ChangeIntensity (const Standard_Real ADelta); //! Updates the colour from the definition of the //! colour . diff --git a/src/Quantity/Quantity_Concentration.hxx b/src/Quantity/Quantity_Concentration.hxx index 1723b81189..fb42468cc8 100644 --- a/src/Quantity/Quantity_Concentration.hxx +++ b/src/Quantity/Quantity_Concentration.hxx @@ -24,7 +24,7 @@ //! solution. For certain purposes percentage by weight or //! volume can be used, and parts per million (ppm) is used //! for trace elements. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Concentration; #endif // _Quantity_Concentration_HeaderFile diff --git a/src/Quantity/Quantity_Conductivity.hxx b/src/Quantity/Quantity_Conductivity.hxx index 92d827c56b..c81f71376c 100644 --- a/src/Quantity/Quantity_Conductivity.hxx +++ b/src/Quantity/Quantity_Conductivity.hxx @@ -22,7 +22,7 @@ //! Defined as the current density divided by the electrical //! field strength. It is also the reciprocal of resistivity. //! It is measured in Siemens per metre. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Conductivity; #endif // _Quantity_Conductivity_HeaderFile diff --git a/src/Quantity/Quantity_Constant.hxx b/src/Quantity/Quantity_Constant.hxx index b720d08f26..ec92e0bbc3 100644 --- a/src/Quantity/Quantity_Constant.hxx +++ b/src/Quantity/Quantity_Constant.hxx @@ -19,7 +19,7 @@ #include +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Constant; - #endif // _Quantity_Constant_HeaderFile diff --git a/src/Quantity/Quantity_Consumption.hxx b/src/Quantity/Quantity_Consumption.hxx index 00dbc896f7..bead3e33e6 100644 --- a/src/Quantity/Quantity_Consumption.hxx +++ b/src/Quantity/Quantity_Consumption.hxx @@ -23,7 +23,7 @@ //! travelled, or distance travelled per unit of fuel. //! It is measured in litres per 100 kilometres or in //! miles per gallon (UK or US). - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Consumption; #endif // _Quantity_Consumption_HeaderFile diff --git a/src/Quantity/Quantity_Content.hxx b/src/Quantity/Quantity_Content.hxx index 56e1435b9b..3bda391454 100644 --- a/src/Quantity/Quantity_Content.hxx +++ b/src/Quantity/Quantity_Content.hxx @@ -19,7 +19,7 @@ #include +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Content; - #endif // _Quantity_Content_HeaderFile diff --git a/src/Quantity/Quantity_Convert.cxx b/src/Quantity/Quantity_Convert.cxx index 5ab4ceacd7..ea217e8f0f 100644 --- a/src/Quantity/Quantity_Convert.cxx +++ b/src/Quantity/Quantity_Convert.cxx @@ -12,12 +12,10 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. - -#include #include #include -Standard_EXPORT Quantity_Array1OfCoefficient ConvertTable(1,68); +Standard_EXPORT NCollection_Array1 ConvertTable(1,68); static Standard_CString theEnums[] = { // En attendant la methode "Elements" de Standard_Type "Quantity_MASS", "Quantity_PLANEANGLE", @@ -98,7 +96,6 @@ Quantity_Convert::Quantity_Convert () { for (Standard_Integer i = 1 ; i <= 68 ; i++) ConvertTable(i) = 1; } - //---------------------------------------------------------------------------- // IsPhysicalQuantity //---------------------------------------------------------------------------- @@ -123,5 +120,3 @@ Standard_Boolean Quantity_Convert::IsPhysicalQuantity return Find; } - - diff --git a/src/Quantity/Quantity_Convert.hxx b/src/Quantity/Quantity_Convert.hxx index 2820f2aba1..4e7968648e 100644 --- a/src/Quantity/Quantity_Convert.hxx +++ b/src/Quantity/Quantity_Convert.hxx @@ -17,44 +17,71 @@ #ifndef _Quantity_Convert_HeaderFile #define _Quantity_Convert_HeaderFile +#include #include #include #include - -#include -#include #include #include +#include + class TCollection_AsciiString; +#ifndef __Quantity_API + #if defined(_WIN32) && !defined(HAVE_NO_DLL) + #ifdef __Quantity_DLL + #define __Quantity_API __declspec(dllexport) + #else + #define __Quantity_API __declspec(dllimport) + #endif + #else + #define __Quantity_API + #endif +#endif + +extern __Quantity_API NCollection_Array1 ConvertTable; //! Services to manage units conversion between Front-ends and Engines. //! This conversion is managed by a table of correspondance between the quantities //! and their "conversion coefficient". //! This table is implemented like an external array (TCollection_Array1) regarding //! to the quantities enumeration. -class Quantity_Convert +class Standard_DEPRECATED("This class is deprecated - UnitsAPI should be used instead") Quantity_Convert { public: DEFINE_STANDARD_ALLOC - //! Creates an object; Standard_EXPORT Quantity_Convert(); //! Updates the conversion table (correspondances between //! Quantities and conversion coefficients). - static void SetQuantity (const Quantity_PhysicalQuantity aQuantity, const Quantity_Coefficient aCoef); - - //! Converts, from the conversion table, the value - //! from the user system to the SI system. - static Standard_Real ConvertUserToSI (const Quantity_PhysicalQuantity aQuantity, const Standard_Real aVal); - - //! Converts, from the conversion table, the value - //! from the SI system to the user system. - static Standard_Real ConvertSIToUser (const Quantity_PhysicalQuantity aQuantity, const Standard_Real aVal); - + static void SetQuantity (const Quantity_PhysicalQuantity theQuantity, + const Standard_Real theCoef) + { + if (theQuantity > 0 && theQuantity <= 68) + { + ConvertTable (theQuantity) = theCoef; + } + } + + //! Converts, from the conversion table, the value theVal from the user system to the SI system. + static Standard_Real ConvertUserToSI (const Quantity_PhysicalQuantity theQuantity, + const Standard_Real theVal) + { + return theQuantity > 0 && theQuantity <= 68 + ? theVal * ConvertTable (theQuantity) + : theVal; + } + + //! Converts, from the conversion table, the value theVal from the SI system to the user system. + static Standard_Real ConvertSIToUser (const Quantity_PhysicalQuantity theQuantity, const Standard_Real theVal) + { + return theQuantity > 0 && theQuantity <= 68 + ? (theVal / ConvertTable (theQuantity)) + : theVal; + } //! if (aType is a physical quantity) //! returns True and the name of the associated PhysicalQuantity . @@ -62,28 +89,6 @@ public: //! returns False. Standard_EXPORT static Standard_Boolean IsPhysicalQuantity (const TCollection_AsciiString& aTypeName, TCollection_AsciiString& anEnum); - - - -protected: - - - - - -private: - - - - - }; - -#include - - - - - #endif // _Quantity_Convert_HeaderFile diff --git a/src/Quantity/Quantity_Convert.lxx b/src/Quantity/Quantity_Convert.lxx deleted file mode 100644 index b75c5b5e57..0000000000 --- a/src/Quantity/Quantity_Convert.lxx +++ /dev/null @@ -1,71 +0,0 @@ -// Created by: M. MERCIEN -// Copyright (c) 1998-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -//----------------------------------------------------------------------------- -// inline methods for Convert from Quantity -//----------------------------------------------------------------------------- -#include - - -#ifndef __Quantity_API -# if defined(_WIN32) && !defined(HAVE_NO_DLL) -# ifdef __Quantity_DLL -# define __Quantity_API __declspec( dllexport ) -# else -# define __Quantity_API __declspec( dllimport ) -# endif // __Quantity_DLL -# else -# define __Quantity_API -# endif // _WIN32 -#endif // __Quantity_API - - -extern __Quantity_API Quantity_Array1OfCoefficient ConvertTable; - - -//---------------------------------------------------------------------------- -// SetQuantity -//---------------------------------------------------------------------------- -inline void Quantity_Convert::SetQuantity (const Quantity_PhysicalQuantity aQuantity, - const Quantity_Coefficient aCoef) { -// ...Update du coefficient de conversion - if (aQuantity > 0 && aQuantity <= 68) ConvertTable(aQuantity) = aCoef; -} - -//---------------------------------------------------------------------------- -// ConvertUserToSI -//---------------------------------------------------------------------------- -inline Quantity_Coefficient Quantity_Convert::ConvertUserToSI - (const Quantity_PhysicalQuantity aQuantity , - const Standard_Real aVal) { -// ...Conversion de la valeur aVal, du Systeme Utilisateur en Systeme International - if (aQuantity > 0 && aQuantity <= 68) - return (aVal*ConvertTable(aQuantity)); - else - return aVal; -} - -//---------------------------------------------------------------------------- -// ConvertSIToUser -//---------------------------------------------------------------------------- -inline Quantity_Coefficient Quantity_Convert::ConvertSIToUser - (const Quantity_PhysicalQuantity aQuantity , - const Standard_Real aVal) { -// ...Conversion de la valeur aVal, du Systeme International au Systeme Utilisateur - if (aQuantity > 0 && aQuantity <= 68) - return (aVal/ConvertTable(aQuantity)); - else - return aVal; -} diff --git a/src/Quantity/Quantity_Date.hxx b/src/Quantity/Quantity_Date.hxx index 18605be4d8..97ac924afc 100644 --- a/src/Quantity/Quantity_Date.hxx +++ b/src/Quantity/Quantity_Date.hxx @@ -27,7 +27,6 @@ class Quantity_DateDefinitionError; class Standard_OutOfRange; class Quantity_Period; - //! This class provides services to manage date information. //! A date represents the following time intervals: //! year, month, day, hour, minute, second, @@ -43,7 +42,6 @@ public: DEFINE_STANDARD_ALLOC - //! Constructs a default date //! (00:00 GMT, January 1, 1979 (zero hour)); use the function //! SetValues to define the required date; or @@ -176,32 +174,17 @@ Standard_Boolean operator > (const Quantity_Date& anOther) const //! Returns true if a year is a leap year. //! The leap years are divisable by 4 and not by 100 except //! the years divisable by 400. - static Standard_Boolean IsLeap (const Standard_Integer yy); - - - - -protected: - - - - + static Standard_Boolean IsLeap (const Standard_Integer yy) + { + return ((yy % 4 == 0) && (yy % 100 != 0)) + || (yy % 400) == 0; + } private: - - Standard_Integer mySec; Standard_Integer myUSec; - }; - -#include - - - - - #endif // _Quantity_Date_HeaderFile diff --git a/src/Quantity/Quantity_Date.lxx b/src/Quantity/Quantity_Date.lxx deleted file mode 100644 index 1845b67aee..0000000000 --- a/src/Quantity/Quantity_Date.lxx +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) 1998-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -inline Standard_Boolean Quantity_Date::IsLeap (const Standard_Integer yy){ - -return (((yy % 4 == 0) && (yy % 100 != 0)) || (yy % 400) == 0) - ? Standard_True : Standard_False; -} diff --git a/src/Quantity/Quantity_Density.hxx b/src/Quantity/Quantity_Density.hxx index 238d56bc81..657df93493 100644 --- a/src/Quantity/Quantity_Density.hxx +++ b/src/Quantity/Quantity_Density.hxx @@ -21,6 +21,7 @@ //! Defined as mass per unit volume. //! It is measured in kilograms per cubic metre. +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Density; #endif // _Quantity_Density_HeaderFile diff --git a/src/Quantity/Quantity_DoseEquivalent.hxx b/src/Quantity/Quantity_DoseEquivalent.hxx index ccbf7e4db1..bb9956aa11 100644 --- a/src/Quantity/Quantity_DoseEquivalent.hxx +++ b/src/Quantity/Quantity_DoseEquivalent.hxx @@ -23,7 +23,7 @@ //! quality factor related to the effect of a particular //! type of radiation on biological tissue. //! It is measured in sieverts. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_DoseEquivalent; #endif // _Quantity_DoseEquivalent_HeaderFile diff --git a/src/Quantity/Quantity_ElectricCapacitance.hxx b/src/Quantity/Quantity_ElectricCapacitance.hxx index 562f95806b..2d662df97b 100644 --- a/src/Quantity/Quantity_ElectricCapacitance.hxx +++ b/src/Quantity/Quantity_ElectricCapacitance.hxx @@ -22,7 +22,7 @@ //! Defined for a capacitor as the ratio of the charge on //! either conductor to the potential between them. //! It is measured in farads (coulomb per volt). - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_ElectricCapacitance; #endif // _Quantity_ElectricCapacitance_HeaderFile diff --git a/src/Quantity/Quantity_ElectricCharge.hxx b/src/Quantity/Quantity_ElectricCharge.hxx index 2a369aafc9..c8d577f605 100644 --- a/src/Quantity/Quantity_ElectricCharge.hxx +++ b/src/Quantity/Quantity_ElectricCharge.hxx @@ -23,7 +23,7 @@ //! more commonly viewed as the product of electric current //! and time. //! It is measured in coulombs (ampere-second). - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_ElectricCharge; #endif // _Quantity_ElectricCharge_HeaderFile diff --git a/src/Quantity/Quantity_ElectricCurrent.hxx b/src/Quantity/Quantity_ElectricCurrent.hxx index aa3a0d7523..087b537349 100644 --- a/src/Quantity/Quantity_ElectricCurrent.hxx +++ b/src/Quantity/Quantity_ElectricCurrent.hxx @@ -21,7 +21,7 @@ //! Defined as the amount of charge flowing per unit time. //! It is measured in amperes (coulombs per second). - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_ElectricCurrent; #endif // _Quantity_ElectricCurrent_HeaderFile diff --git a/src/Quantity/Quantity_ElectricFieldStrength.hxx b/src/Quantity/Quantity_ElectricFieldStrength.hxx index f7cccbc487..0886565ed0 100644 --- a/src/Quantity/Quantity_ElectricFieldStrength.hxx +++ b/src/Quantity/Quantity_ElectricFieldStrength.hxx @@ -22,7 +22,7 @@ //! Defined as the force exerted on a unit charge at a //! given point in space. //! It is measured in volts per metre. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_ElectricFieldStrength; #endif // _Quantity_ElectricFieldStrength_HeaderFile diff --git a/src/Quantity/Quantity_ElectricPotential.hxx b/src/Quantity/Quantity_ElectricPotential.hxx index 8e9327626e..6458d1f231 100644 --- a/src/Quantity/Quantity_ElectricPotential.hxx +++ b/src/Quantity/Quantity_ElectricPotential.hxx @@ -25,7 +25,7 @@ //! Volts are in practice used to measure differences //! in potential e.g. the electromotive force generated when //! a conductor cuts a magnetic field. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_ElectricPotential; #endif // _Quantity_ElectricPotential_HeaderFile diff --git a/src/Quantity/Quantity_Energy.hxx b/src/Quantity/Quantity_Energy.hxx index 56ed36e11a..df0de7ff05 100644 --- a/src/Quantity/Quantity_Energy.hxx +++ b/src/Quantity/Quantity_Energy.hxx @@ -37,7 +37,7 @@ //! the observed mass and the rest mass of a body multiplied //! by the square of the speed of light. //! It is measured in joules (newton-metres). - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Energy; #endif // _Quantity_Energy_HeaderFile diff --git a/src/Quantity/Quantity_Enthalpy.hxx b/src/Quantity/Quantity_Enthalpy.hxx index 2943676cec..9c6dc1207c 100644 --- a/src/Quantity/Quantity_Enthalpy.hxx +++ b/src/Quantity/Quantity_Enthalpy.hxx @@ -24,7 +24,7 @@ //! process at constant pressure the change in enthalpy is //! equal to the quantity of heat absorbed (or lost). //! It is measured in joules. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Enthalpy; #endif // _Quantity_Enthalpy_HeaderFile diff --git a/src/Quantity/Quantity_Entropy.hxx b/src/Quantity/Quantity_Entropy.hxx index 91ea21c04a..28483897e1 100644 --- a/src/Quantity/Quantity_Entropy.hxx +++ b/src/Quantity/Quantity_Entropy.hxx @@ -28,7 +28,7 @@ //! unavailability of its internal energy to do work in a //! cyclical process. //! A change in entropy is measured in joules per degree kelvin. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Entropy; #endif // _Quantity_Entropy_HeaderFile diff --git a/src/Quantity/Quantity_Factor.hxx b/src/Quantity/Quantity_Factor.hxx index d347194a8e..0ec239ed34 100644 --- a/src/Quantity/Quantity_Factor.hxx +++ b/src/Quantity/Quantity_Factor.hxx @@ -19,7 +19,7 @@ #include +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Factor; - #endif // _Quantity_Factor_HeaderFile diff --git a/src/Quantity/Quantity_Force.hxx b/src/Quantity/Quantity_Force.hxx index 45e9557f3d..aaf00109a2 100644 --- a/src/Quantity/Quantity_Force.hxx +++ b/src/Quantity/Quantity_Force.hxx @@ -23,7 +23,7 @@ //! and the acceleration that the force produces. //! It is a vector quantity. //! It is measured in newtons. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Force; #endif // _Quantity_Force_HeaderFile diff --git a/src/Quantity/Quantity_Frequency.hxx b/src/Quantity/Quantity_Frequency.hxx index 00b7413f89..6a9e827849 100644 --- a/src/Quantity/Quantity_Frequency.hxx +++ b/src/Quantity/Quantity_Frequency.hxx @@ -21,6 +21,7 @@ //! Defined as the number of oscillations per unit time. //! It is measured in cycles per second. +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Frequency; #endif // _Quantity_Frequency_HeaderFile diff --git a/src/Quantity/Quantity_Illuminance.hxx b/src/Quantity/Quantity_Illuminance.hxx index 35b4512f25..d4c9644318 100644 --- a/src/Quantity/Quantity_Illuminance.hxx +++ b/src/Quantity/Quantity_Illuminance.hxx @@ -21,7 +21,7 @@ //! Defined as the incident luminous flux per unit area. //! It is measured in lux (lumen per square metre). - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Illuminance; #endif // _Quantity_Illuminance_HeaderFile diff --git a/src/Quantity/Quantity_Impedance.hxx b/src/Quantity/Quantity_Impedance.hxx index 494c27e649..c01e99d338 100644 --- a/src/Quantity/Quantity_Impedance.hxx +++ b/src/Quantity/Quantity_Impedance.hxx @@ -23,7 +23,7 @@ //! in a circuit. Includes the contributions of resistance, //! inductance, and capacitance. //! It is measured in Ohms. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Impedance; #endif // _Quantity_Impedance_HeaderFile diff --git a/src/Quantity/Quantity_Index.hxx b/src/Quantity/Quantity_Index.hxx index 330ee8bec3..98866c2da9 100644 --- a/src/Quantity/Quantity_Index.hxx +++ b/src/Quantity/Quantity_Index.hxx @@ -19,7 +19,7 @@ #include +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Index; - #endif // _Quantity_Index_HeaderFile diff --git a/src/Quantity/Quantity_Inductance.hxx b/src/Quantity/Quantity_Inductance.hxx index 62e4db46d5..4f174afc1c 100644 --- a/src/Quantity/Quantity_Inductance.hxx +++ b/src/Quantity/Quantity_Inductance.hxx @@ -23,7 +23,7 @@ //! induced when the current in a circuit changes at //! unit rate. //! It is measured in henrys (webers per ampere). - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Inductance; #endif // _Quantity_Inductance_HeaderFile diff --git a/src/Quantity/Quantity_KinematicViscosity.hxx b/src/Quantity/Quantity_KinematicViscosity.hxx index eda9039151..52d1ffff9d 100644 --- a/src/Quantity/Quantity_KinematicViscosity.hxx +++ b/src/Quantity/Quantity_KinematicViscosity.hxx @@ -24,7 +24,7 @@ //! perfect fluid to include terms due to a real fluid. //! It is quantified as area per unit time. //! It is measured in square metres per second. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_KinematicViscosity; #endif // _Quantity_KinematicViscosity_HeaderFile diff --git a/src/Quantity/Quantity_KineticMoment.hxx b/src/Quantity/Quantity_KineticMoment.hxx index b389cf06df..e85cf3bb8d 100644 --- a/src/Quantity/Quantity_KineticMoment.hxx +++ b/src/Quantity/Quantity_KineticMoment.hxx @@ -22,7 +22,7 @@ //! Defined as the product of momentum of a body //! and the distance of its centre of gravity from an axis. //! It is measured in kilogram-square-metres per second. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_KineticMoment; #endif // _Quantity_KineticMoment_HeaderFile diff --git a/src/Quantity/Quantity_Length.hxx b/src/Quantity/Quantity_Length.hxx index 2a35724595..7711de3f5c 100644 --- a/src/Quantity/Quantity_Length.hxx +++ b/src/Quantity/Quantity_Length.hxx @@ -21,6 +21,7 @@ //! Defined as spatial extension. //! It is measured in metres. +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Length; #endif // _Quantity_Length_HeaderFile diff --git a/src/Quantity/Quantity_Luminance.hxx b/src/Quantity/Quantity_Luminance.hxx index a740b71b85..6038e08a57 100644 --- a/src/Quantity/Quantity_Luminance.hxx +++ b/src/Quantity/Quantity_Luminance.hxx @@ -22,7 +22,7 @@ //! It is defined the luminous flux per unit area per unit //! solid angle. //! It is measured in candelas per square metre. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Luminance; #endif // _Quantity_Luminance_HeaderFile diff --git a/src/Quantity/Quantity_LuminousEfficacity.hxx b/src/Quantity/Quantity_LuminousEfficacity.hxx index fe38899139..8f386dcc49 100644 --- a/src/Quantity/Quantity_LuminousEfficacity.hxx +++ b/src/Quantity/Quantity_LuminousEfficacity.hxx @@ -22,7 +22,7 @@ //! Defined as the ratio of luminous flux emitted by a //! source to the power it consumes. //! It is measured in lumens per watt. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_LuminousEfficacity; #endif // _Quantity_LuminousEfficacity_HeaderFile diff --git a/src/Quantity/Quantity_LuminousExposition.hxx b/src/Quantity/Quantity_LuminousExposition.hxx index 9615ab9d78..09352286d3 100644 --- a/src/Quantity/Quantity_LuminousExposition.hxx +++ b/src/Quantity/Quantity_LuminousExposition.hxx @@ -21,7 +21,7 @@ //! Defined as the quantity of illuminance with time. //! It is measured in lux-seconds. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_LuminousExposition; #endif // _Quantity_LuminousExposition_HeaderFile diff --git a/src/Quantity/Quantity_LuminousFlux.hxx b/src/Quantity/Quantity_LuminousFlux.hxx index 78df0f0b2d..955c0a45fe 100644 --- a/src/Quantity/Quantity_LuminousFlux.hxx +++ b/src/Quantity/Quantity_LuminousFlux.hxx @@ -25,7 +25,7 @@ //! is related to the radiant flux of the source by the //! spectral luminous efficiency. //! It is measured in lumens. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_LuminousFlux; #endif // _Quantity_LuminousFlux_HeaderFile diff --git a/src/Quantity/Quantity_LuminousIntensity.hxx b/src/Quantity/Quantity_LuminousIntensity.hxx index e1e51448d3..ca4eef85fa 100644 --- a/src/Quantity/Quantity_LuminousIntensity.hxx +++ b/src/Quantity/Quantity_LuminousIntensity.hxx @@ -22,7 +22,7 @@ //! Defined as the luminous flux emitted per unit solid //! angle in a given direction by a point source. //! It is measured in candelas. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_LuminousIntensity; #endif // _Quantity_LuminousIntensity_HeaderFile diff --git a/src/Quantity/Quantity_MagneticFieldStrength.hxx b/src/Quantity/Quantity_MagneticFieldStrength.hxx index 56a731231e..d52e3c8218 100644 --- a/src/Quantity/Quantity_MagneticFieldStrength.hxx +++ b/src/Quantity/Quantity_MagneticFieldStrength.hxx @@ -24,7 +24,7 @@ //! Its integral along a closed line is equal to the //! magnetomotive force. //! It is measured in amperes per metre. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_MagneticFieldStrength; #endif // _Quantity_MagneticFieldStrength_HeaderFile diff --git a/src/Quantity/Quantity_MagneticFlux.hxx b/src/Quantity/Quantity_MagneticFlux.hxx index 56d12063df..638ded78c8 100644 --- a/src/Quantity/Quantity_MagneticFlux.hxx +++ b/src/Quantity/Quantity_MagneticFlux.hxx @@ -22,7 +22,7 @@ //! Defined as the product of a given area and the //! average magnetic flux density normal to it. //! It is measured in webers (tesla-square-metre). - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_MagneticFlux; #endif // _Quantity_MagneticFlux_HeaderFile diff --git a/src/Quantity/Quantity_MagneticFluxDensity.hxx b/src/Quantity/Quantity_MagneticFluxDensity.hxx index 580692fe63..a03014e689 100644 --- a/src/Quantity/Quantity_MagneticFluxDensity.hxx +++ b/src/Quantity/Quantity_MagneticFluxDensity.hxx @@ -25,7 +25,7 @@ //! and the magnetic field strength and with a direction at any //! given point the same as that of the magnetic field. //! It is measured in teslas (webers per square metre). - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_MagneticFluxDensity; #endif // _Quantity_MagneticFluxDensity_HeaderFile diff --git a/src/Quantity/Quantity_Mass.hxx b/src/Quantity/Quantity_Mass.hxx index 2f9e70db15..7705d87c27 100644 --- a/src/Quantity/Quantity_Mass.hxx +++ b/src/Quantity/Quantity_Mass.hxx @@ -22,6 +22,7 @@ //! Defined as a quantity of matter. Gives rise to the //! inertial and gravitational properties of a body. //! It is measured in kilograms. +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Mass; #endif // _Quantity_Mass_HeaderFile diff --git a/src/Quantity/Quantity_MassFlow.hxx b/src/Quantity/Quantity_MassFlow.hxx index a0f8cad01c..4d0c476fd9 100644 --- a/src/Quantity/Quantity_MassFlow.hxx +++ b/src/Quantity/Quantity_MassFlow.hxx @@ -21,7 +21,7 @@ //! Defined as mass per unit time. //! It is measured in kilograms per second. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_MassFlow; #endif // _Quantity_MassFlow_HeaderFile diff --git a/src/Quantity/Quantity_MolarConcentration.hxx b/src/Quantity/Quantity_MolarConcentration.hxx index 1f1ff1f77f..47ddf7873b 100644 --- a/src/Quantity/Quantity_MolarConcentration.hxx +++ b/src/Quantity/Quantity_MolarConcentration.hxx @@ -21,7 +21,7 @@ //! Defined as the concentration in moles per litre of //! solution. It is also called molarity. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_MolarConcentration; #endif // _Quantity_MolarConcentration_HeaderFile diff --git a/src/Quantity/Quantity_MolarMass.hxx b/src/Quantity/Quantity_MolarMass.hxx index 652383d154..e076ef0c1c 100644 --- a/src/Quantity/Quantity_MolarMass.hxx +++ b/src/Quantity/Quantity_MolarMass.hxx @@ -23,7 +23,7 @@ //! mole. One mole of any substance contains Avogadro's //! Constant of molecules. //! It is measured in kilograms per mole. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_MolarMass; #endif // _Quantity_MolarMass_HeaderFile diff --git a/src/Quantity/Quantity_MolarVolume.hxx b/src/Quantity/Quantity_MolarVolume.hxx index 6f6811542c..d18759639b 100644 --- a/src/Quantity/Quantity_MolarVolume.hxx +++ b/src/Quantity/Quantity_MolarVolume.hxx @@ -23,7 +23,7 @@ //! One mole of any substance contains Avogadro's //! Constant of molecules. //! It is measured in cubic metres per mole. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_MolarVolume; #endif // _Quantity_MolarVolume_HeaderFile diff --git a/src/Quantity/Quantity_Molarity.hxx b/src/Quantity/Quantity_Molarity.hxx index c4f69ce84a..f521739b7b 100644 --- a/src/Quantity/Quantity_Molarity.hxx +++ b/src/Quantity/Quantity_Molarity.hxx @@ -21,7 +21,7 @@ //! Defined as the concentration in moles per kilogram of //! solvent. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Molarity; #endif // _Quantity_Molarity_HeaderFile diff --git a/src/Quantity/Quantity_MomentOfAForce.hxx b/src/Quantity/Quantity_MomentOfAForce.hxx index 8a3d0abe9c..608ddd8fa7 100644 --- a/src/Quantity/Quantity_MomentOfAForce.hxx +++ b/src/Quantity/Quantity_MomentOfAForce.hxx @@ -22,7 +22,7 @@ //! Defined as the product of a force and the //! perpendicular distance to an axis. //! It is measured in newtons x metres. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_MomentOfAForce; #endif // _Quantity_MomentOfAForce_HeaderFile diff --git a/src/Quantity/Quantity_MomentOfInertia.hxx b/src/Quantity/Quantity_MomentOfInertia.hxx index 3697a3b276..edee2d888c 100644 --- a/src/Quantity/Quantity_MomentOfInertia.hxx +++ b/src/Quantity/Quantity_MomentOfInertia.hxx @@ -23,7 +23,7 @@ //! and the square of the distance of its centre of gravity //! from an axis. //! It is measured in kilogram-square-metres. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_MomentOfInertia; #endif // _Quantity_MomentOfInertia_HeaderFile diff --git a/src/Quantity/Quantity_Momentum.hxx b/src/Quantity/Quantity_Momentum.hxx index 91147e30a1..d6be6e6177 100644 --- a/src/Quantity/Quantity_Momentum.hxx +++ b/src/Quantity/Quantity_Momentum.hxx @@ -22,7 +22,7 @@ //! Defined as the product of mass and velocity. //! It is a vector quantity. //! It is measured in kilogram-metres per second. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Momentum; #endif // _Quantity_Momentum_HeaderFile diff --git a/src/Quantity/Quantity_Normality.hxx b/src/Quantity/Quantity_Normality.hxx index d098ef7c6c..1929834398 100644 --- a/src/Quantity/Quantity_Normality.hxx +++ b/src/Quantity/Quantity_Normality.hxx @@ -19,7 +19,7 @@ #include +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Normality; - #endif // _Quantity_Normality_HeaderFile diff --git a/src/Quantity/Quantity_Parameter.hxx b/src/Quantity/Quantity_Parameter.hxx index 74f61a0b9c..1a888f1229 100644 --- a/src/Quantity/Quantity_Parameter.hxx +++ b/src/Quantity/Quantity_Parameter.hxx @@ -19,7 +19,7 @@ #include +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Parameter; - #endif // _Quantity_Parameter_HeaderFile diff --git a/src/Quantity/Quantity_Period.hxx b/src/Quantity/Quantity_Period.hxx index 2299a5cb84..81c126b45b 100644 --- a/src/Quantity/Quantity_Period.hxx +++ b/src/Quantity/Quantity_Period.hxx @@ -25,7 +25,6 @@ #include class Quantity_PeriodDefinitionError; - //! Manages date intervals. For example, a Period object //! gives the interval between two dates. //! A period is expressed in seconds and microseconds. @@ -35,7 +34,6 @@ public: DEFINE_STANDARD_ALLOC - //! Creates a Period //! With: 0 <= dd //! 0 <= hh @@ -139,29 +137,11 @@ Standard_Boolean operator > (const Quantity_Period& anOther) const //! 0 <= mics Standard_EXPORT static Standard_Boolean IsValid (const Standard_Integer ss, const Standard_Integer mics = 0); - - - -protected: - - - - - private: - - Standard_Integer mySec; Standard_Integer myUSec; - }; - - - - - - #endif // _Quantity_Period_HeaderFile diff --git a/src/Quantity/Quantity_Period.lxx b/src/Quantity/Quantity_Period.lxx deleted file mode 100644 index 4324b61e8d..0000000000 --- a/src/Quantity/Quantity_Period.lxx +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright (c) 1998-1999 Matra Datavision -// Copyright (c) 1999-2014 OPEN CASCADE SAS -// -// This file is part of Open CASCADE Technology software library. -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License version 2.1 as published -// by the Free Software Foundation, with special exception defined in the file -// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT -// distribution for complete text of the license and disclaimer of any warranty. -// -// Alternatively, this file may be used under the terms of Open CASCADE -// commercial license or contractual agreement. - -inline Standard_Real Quantity_Period::MillisecondPeriod(){ - return (1E+3); -} - -inline Standard_Real Quantity_Period::SecondPeriod(){ - return (1E+6); -} - - -inline Standard_Real Quantity_Period::MinutePeriod(){ - return (60.0E+6); -} - -inline Standard_Real Quantity_Period::HourPeriod(){ - return (3600.0E+6); -} - -inline Standard_Real Quantity_Period::DayPeriod(){ - return (86400.0E+6); -} - diff --git a/src/Quantity/Quantity_PlaneAngle.hxx b/src/Quantity/Quantity_PlaneAngle.hxx index d2d15dd8dc..f9a91fb1d3 100644 --- a/src/Quantity/Quantity_PlaneAngle.hxx +++ b/src/Quantity/Quantity_PlaneAngle.hxx @@ -21,6 +21,7 @@ //! Defined as a difference in direction. //! It is measured in radians. +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_PlaneAngle; #endif // _Quantity_PlaneAngle_HeaderFile diff --git a/src/Quantity/Quantity_Power.hxx b/src/Quantity/Quantity_Power.hxx index 086fc7b0af..2e275cf722 100644 --- a/src/Quantity/Quantity_Power.hxx +++ b/src/Quantity/Quantity_Power.hxx @@ -26,7 +26,7 @@ //! and the current. For AC the root-mean-square values //! are multiplied by the cosine of the phase angle. //! It is measured in watts (joules per second). - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Power; #endif // _Quantity_Power_HeaderFile diff --git a/src/Quantity/Quantity_Pressure.hxx b/src/Quantity/Quantity_Pressure.hxx index 3c8e3556bb..440eb9cecb 100644 --- a/src/Quantity/Quantity_Pressure.hxx +++ b/src/Quantity/Quantity_Pressure.hxx @@ -23,7 +23,7 @@ //! unit area. In a fluid it is defined as the product //! of the depth, density, and free fall acceleration. //! It is measured in pascals (newtons per square metre). - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Pressure; #endif // _Quantity_Pressure_HeaderFile diff --git a/src/Quantity/Quantity_Quotient.hxx b/src/Quantity/Quantity_Quotient.hxx index a3dd258063..63e944ad31 100644 --- a/src/Quantity/Quantity_Quotient.hxx +++ b/src/Quantity/Quantity_Quotient.hxx @@ -19,7 +19,7 @@ #include +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Quotient; - #endif // _Quantity_Quotient_HeaderFile diff --git a/src/Quantity/Quantity_Rate.hxx b/src/Quantity/Quantity_Rate.hxx index 615f1f21e4..ac46520d67 100644 --- a/src/Quantity/Quantity_Rate.hxx +++ b/src/Quantity/Quantity_Rate.hxx @@ -19,7 +19,7 @@ #include +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Rate; - #endif // _Quantity_Rate_HeaderFile diff --git a/src/Quantity/Quantity_Ratio.hxx b/src/Quantity/Quantity_Ratio.hxx index fda4c8646d..9d5ffe565d 100644 --- a/src/Quantity/Quantity_Ratio.hxx +++ b/src/Quantity/Quantity_Ratio.hxx @@ -19,7 +19,7 @@ #include +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Ratio; - #endif // _Quantity_Ratio_HeaderFile diff --git a/src/Quantity/Quantity_Reluctance.hxx b/src/Quantity/Quantity_Reluctance.hxx index 8632860245..525e212ac8 100644 --- a/src/Quantity/Quantity_Reluctance.hxx +++ b/src/Quantity/Quantity_Reluctance.hxx @@ -23,7 +23,7 @@ //! to a magnetic circuit to the magnetic flux in the circuit. //! It is measured in reciprocal henrys. //! Its reciprocal is permanence. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Reluctance; #endif // _Quantity_Reluctance_HeaderFile diff --git a/src/Quantity/Quantity_Resistance.hxx b/src/Quantity/Quantity_Resistance.hxx index 3dbd542bd9..132b869509 100644 --- a/src/Quantity/Quantity_Resistance.hxx +++ b/src/Quantity/Quantity_Resistance.hxx @@ -22,7 +22,7 @@ //! Defined as the ratio of the potential difference //! across a conductor to the current flowing through it. //! It is measured in ohms. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Resistance; #endif // _Quantity_Resistance_HeaderFile diff --git a/src/Quantity/Quantity_Resistivity.hxx b/src/Quantity/Quantity_Resistivity.hxx index 87c4fd681f..6ccf832399 100644 --- a/src/Quantity/Quantity_Resistivity.hxx +++ b/src/Quantity/Quantity_Resistivity.hxx @@ -23,7 +23,7 @@ //! cross-section per unit length. //! It is measured in Ohm-metres. //! It is the reciprocal of the conductivity. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Resistivity; #endif // _Quantity_Resistivity_HeaderFile diff --git a/src/Quantity/Quantity_Scalaire.hxx b/src/Quantity/Quantity_Scalaire.hxx index 351520c8aa..dc66a2735e 100644 --- a/src/Quantity/Quantity_Scalaire.hxx +++ b/src/Quantity/Quantity_Scalaire.hxx @@ -19,6 +19,7 @@ #include +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Scalaire; diff --git a/src/Quantity/Quantity_SolidAngle.hxx b/src/Quantity/Quantity_SolidAngle.hxx index 4c3d1d792d..752f9acb73 100644 --- a/src/Quantity/Quantity_SolidAngle.hxx +++ b/src/Quantity/Quantity_SolidAngle.hxx @@ -21,6 +21,7 @@ //! Defined as an angle formed by three or more planes. //! It is measured in steradians. +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_SolidAngle; #endif // _Quantity_SolidAngle_HeaderFile diff --git a/src/Quantity/Quantity_SoundIntensity.hxx b/src/Quantity/Quantity_SoundIntensity.hxx index 031811b1a7..dc5fb61783 100644 --- a/src/Quantity/Quantity_SoundIntensity.hxx +++ b/src/Quantity/Quantity_SoundIntensity.hxx @@ -24,7 +24,7 @@ //! square of the root-mean-square sound pressure, divided by //! the density of the medium and by the speed of sound. //! It is measured in watts per square metre. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_SoundIntensity; #endif // _Quantity_SoundIntensity_HeaderFile diff --git a/src/Quantity/Quantity_SpecificHeatCapacity.hxx b/src/Quantity/Quantity_SpecificHeatCapacity.hxx index 0b51f4de29..287f2acdea 100644 --- a/src/Quantity/Quantity_SpecificHeatCapacity.hxx +++ b/src/Quantity/Quantity_SpecificHeatCapacity.hxx @@ -29,7 +29,7 @@ //! degree of temperature. //! It is measured in joules per kilogram per degree //! kelvin. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_SpecificHeatCapacity; #endif // _Quantity_SpecificHeatCapacity_HeaderFile diff --git a/src/Quantity/Quantity_Speed.hxx b/src/Quantity/Quantity_Speed.hxx index 8fa641bb35..ef305f3e3f 100644 --- a/src/Quantity/Quantity_Speed.hxx +++ b/src/Quantity/Quantity_Speed.hxx @@ -21,6 +21,7 @@ //! Defined as distance covered per unit time. //! It is measured in metres per second. +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Speed; #endif // _Quantity_Speed_HeaderFile diff --git a/src/Quantity/Quantity_SurfaceTension.hxx b/src/Quantity/Quantity_SurfaceTension.hxx index f493bfc539..aa84cea8df 100644 --- a/src/Quantity/Quantity_SurfaceTension.hxx +++ b/src/Quantity/Quantity_SurfaceTension.hxx @@ -22,7 +22,7 @@ //! Defined as the force required to hold unit length //! of a plane liquid surface. //! It is measured in newtons per metre. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_SurfaceTension; #endif // _Quantity_SurfaceTension_HeaderFile diff --git a/src/Quantity/Quantity_Temperature.hxx b/src/Quantity/Quantity_Temperature.hxx index 9c85e1ab79..4a88f34afe 100644 --- a/src/Quantity/Quantity_Temperature.hxx +++ b/src/Quantity/Quantity_Temperature.hxx @@ -22,6 +22,7 @@ //! Defined as a measure of the average kinetic energy //! of the molecules in a body. //! It is measured in degrees kelvin. +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Temperature; #endif // _Quantity_Temperature_HeaderFile diff --git a/src/Quantity/Quantity_ThermalConductivity.hxx b/src/Quantity/Quantity_ThermalConductivity.hxx index b4b9353cc2..a11bdf9da5 100644 --- a/src/Quantity/Quantity_ThermalConductivity.hxx +++ b/src/Quantity/Quantity_ThermalConductivity.hxx @@ -23,7 +23,7 @@ //! area inside a body. Quantified as work per unit time //! per unit length per unit of temperature. //! It is measured in watts per metre per degee kelvin. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_ThermalConductivity; #endif // _Quantity_ThermalConductivity_HeaderFile diff --git a/src/Quantity/Quantity_Torque.hxx b/src/Quantity/Quantity_Torque.hxx index 843b9e44f4..43a711fab4 100644 --- a/src/Quantity/Quantity_Torque.hxx +++ b/src/Quantity/Quantity_Torque.hxx @@ -23,7 +23,7 @@ //! perpendicular distance to an axis or as the //! the product of a force couple. //! It is measured in newtons x metres. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Torque; #endif // _Quantity_Torque_HeaderFile diff --git a/src/Quantity/Quantity_Velocity.hxx b/src/Quantity/Quantity_Velocity.hxx index e0af14241f..e6696aa8dd 100644 --- a/src/Quantity/Quantity_Velocity.hxx +++ b/src/Quantity/Quantity_Velocity.hxx @@ -22,6 +22,7 @@ //! Defined as distance covered per unit time in a //! given direction. It is a vector quantity. //! It is measured in metres per second. +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Velocity; #endif // _Quantity_Velocity_HeaderFile diff --git a/src/Quantity/Quantity_Viscosity.hxx b/src/Quantity/Quantity_Viscosity.hxx index 11961afe59..6dfa64216e 100644 --- a/src/Quantity/Quantity_Viscosity.hxx +++ b/src/Quantity/Quantity_Viscosity.hxx @@ -24,7 +24,7 @@ //! and time. For a liquid it generally decreases with //! temperature; for a gas it increases. //! It is measured in pascal-seconds. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Viscosity; #endif // _Quantity_Viscosity_HeaderFile diff --git a/src/Quantity/Quantity_Volume.hxx b/src/Quantity/Quantity_Volume.hxx index 027c79143f..6a88bfd282 100644 --- a/src/Quantity/Quantity_Volume.hxx +++ b/src/Quantity/Quantity_Volume.hxx @@ -21,6 +21,7 @@ //! Defined as an extension in three dimensions. //! It is measured in cubic metres. +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Volume; #endif // _Quantity_Volume_HeaderFile diff --git a/src/Quantity/Quantity_VolumeFlow.hxx b/src/Quantity/Quantity_VolumeFlow.hxx index 790be2e416..017cd03dc8 100644 --- a/src/Quantity/Quantity_VolumeFlow.hxx +++ b/src/Quantity/Quantity_VolumeFlow.hxx @@ -21,7 +21,7 @@ //! Defined as volume per unit time. //! It is measured in cubic metres per second. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_VolumeFlow; #endif // _Quantity_VolumeFlow_HeaderFile diff --git a/src/Quantity/Quantity_Weight.hxx b/src/Quantity/Quantity_Weight.hxx index 73c8597334..537ee6adb3 100644 --- a/src/Quantity/Quantity_Weight.hxx +++ b/src/Quantity/Quantity_Weight.hxx @@ -24,7 +24,7 @@ //! It is quantified as the product of the mass of the body //! and the local value of the acceleration of free fall. //! It is measured in newtons. - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Weight; #endif // _Quantity_Weight_HeaderFile diff --git a/src/Quantity/Quantity_Work.hxx b/src/Quantity/Quantity_Work.hxx index 1dd2167a4e..55c00c2920 100644 --- a/src/Quantity/Quantity_Work.hxx +++ b/src/Quantity/Quantity_Work.hxx @@ -26,7 +26,7 @@ //! In electrical terms, the product of a charge and the //! potential difference it traverses. //! It is measured in joules (newton-metres). - +Standard_DEPRECATED("This type is deprecated - Standard_Real should be used instead") typedef Standard_Real Quantity_Work; #endif // _Quantity_Work_HeaderFile diff --git a/src/VrmlAPI/VrmlAPI_Writer.hxx b/src/VrmlAPI/VrmlAPI_Writer.hxx index fd0d89939f..77b33b03e3 100644 --- a/src/VrmlAPI/VrmlAPI_Writer.hxx +++ b/src/VrmlAPI/VrmlAPI_Writer.hxx @@ -22,7 +22,6 @@ #include #include -#include #include #include #include @@ -106,12 +105,8 @@ public: //! VRML format of the passed version and writes it to the file identified by aFile. Standard_EXPORT void Write (const TopoDS_Shape& aShape, const Standard_CString aFile, const Standard_Integer aVersion = 2) const; - - - protected: - //! Converts the shape aShape to VRML format of version 1.0 and writes it //! to the file identified by aFileName using default parameters. Standard_EXPORT void write_v1 (const TopoDS_Shape& aShape, const Standard_CString aFileName) const; @@ -120,13 +115,8 @@ protected: //! to the file identified by aFileName using default parameters. Standard_EXPORT void write_v2 (const TopoDS_Shape& aShape, const Standard_CString aFileName) const; - - - private: - - VrmlAPI_RepresentationOfShape myRepresentation; Handle(VrmlConverter_Drawer) myDrawer; Standard_Real myDeflection; @@ -142,21 +132,14 @@ private: Handle(Vrml_Material) myWireMaterial; Handle(Vrml_Material) myFreeBoundsMaterial; Handle(Vrml_Material) myUnfreeBoundsMaterial; - Quantity_Length DX; - Quantity_Length DY; - Quantity_Length DZ; - Quantity_Length XUp; - Quantity_Length YUp; - Quantity_Length ZUp; - Quantity_Length Focus; - + Standard_Real DX; + Standard_Real DY; + Standard_Real DZ; + Standard_Real XUp; + Standard_Real YUp; + Standard_Real ZUp; + Standard_Real Focus; }; - - - - - - #endif // _VrmlAPI_Writer_HeaderFile diff --git a/src/VrmlConverter/VrmlConverter_Drawer.cxx b/src/VrmlConverter/VrmlConverter_Drawer.cxx index 6168660dc5..2b470fa0ea 100644 --- a/src/VrmlConverter/VrmlConverter_Drawer.cxx +++ b/src/VrmlConverter/VrmlConverter_Drawer.cxx @@ -46,12 +46,12 @@ Aspect_TypeOfDeflection VrmlConverter_Drawer::TypeOfDeflection() const return myTypeOfDeflection; } -void VrmlConverter_Drawer::SetMaximalChordialDeviation(const Quantity_Length aChordialDeviation) +void VrmlConverter_Drawer::SetMaximalChordialDeviation(const Standard_Real aChordialDeviation) { myChordialDeviation = aChordialDeviation; } -Quantity_Length VrmlConverter_Drawer::MaximalChordialDeviation() const +Standard_Real VrmlConverter_Drawer::MaximalChordialDeviation() const { return myChordialDeviation; } diff --git a/src/VrmlConverter/VrmlConverter_Drawer.hxx b/src/VrmlConverter/VrmlConverter_Drawer.hxx index 593f3c609d..86b4d42416 100644 --- a/src/VrmlConverter/VrmlConverter_Drawer.hxx +++ b/src/VrmlConverter/VrmlConverter_Drawer.hxx @@ -22,7 +22,6 @@ #include #include -#include #include #include #include @@ -60,11 +59,11 @@ public: //! VrmlConverter_DeflectionCurve //! VrmlConverter_WFDeflectionRestrictedFace //! VrmlConverter_WFDeflectionShape - Standard_EXPORT void SetMaximalChordialDeviation (const Quantity_Length aChordialDeviation); + Standard_EXPORT void SetMaximalChordialDeviation (const Standard_Real aChordialDeviation); //! returns the maximal chordial deviation. //! Default value: 0.1 - Standard_EXPORT Quantity_Length MaximalChordialDeviation() const; + Standard_EXPORT Standard_Real MaximalChordialDeviation() const; //! default 0.001 Standard_EXPORT void SetDeviationCoefficient (const Standard_Real aCoefficient); @@ -213,19 +212,10 @@ public: //! sets LineAspect for the seen lines. Standard_EXPORT void SetSeenLineAspect (const Handle(VrmlConverter_LineAspect)& anAspect); - - - DEFINE_STANDARD_RTTIEXT(VrmlConverter_Drawer,MMgt_TShared) -protected: - - - - private: - Handle(VrmlConverter_IsoAspect) myUIsoAspect; Handle(VrmlConverter_IsoAspect) myVIsoAspect; Standard_Integer myNbPoints; @@ -238,7 +228,7 @@ private: Standard_Boolean myWireDraw; Handle(VrmlConverter_LineAspect) myLineAspect; Handle(VrmlConverter_ShadingAspect) myShadingAspect; - Quantity_Length myChordialDeviation; + Standard_Real myChordialDeviation; Aspect_TypeOfDeflection myTypeOfDeflection; Standard_Real myMaximalParameterValue; Standard_Real myDeviationCoefficient; @@ -247,13 +237,6 @@ private: Handle(VrmlConverter_LineAspect) myHiddenLineAspect; Handle(VrmlConverter_LineAspect) mySeenLineAspect; - }; - - - - - - #endif // _VrmlConverter_Drawer_HeaderFile diff --git a/src/VrmlConverter/VrmlConverter_Projector.cxx b/src/VrmlConverter/VrmlConverter_Projector.cxx index c38cd4ad8e..d8f04a539f 100644 --- a/src/VrmlConverter/VrmlConverter_Projector.cxx +++ b/src/VrmlConverter/VrmlConverter_Projector.cxx @@ -33,13 +33,13 @@ IMPLEMENT_STANDARD_RTTIEXT(VrmlConverter_Projector,MMgt_TShared) VrmlConverter_Projector::VrmlConverter_Projector (const TopTools_Array1OfShape& Shapes, - const Quantity_Length Focus, - const Quantity_Length DX, - const Quantity_Length DY, - const Quantity_Length DZ, - const Quantity_Length XUp, - const Quantity_Length YUp, - const Quantity_Length ZUp, + const Standard_Real Focus, + const Standard_Real DX, + const Standard_Real DY, + const Standard_Real DZ, + const Standard_Real XUp, + const Standard_Real YUp, + const Standard_Real ZUp, const VrmlConverter_TypeOfCamera Camera, const VrmlConverter_TypeOfLight Light) diff --git a/src/VrmlConverter/VrmlConverter_Projector.hxx b/src/VrmlConverter/VrmlConverter_Projector.hxx index 01ea264f12..9f6aa530b6 100644 --- a/src/VrmlConverter/VrmlConverter_Projector.hxx +++ b/src/VrmlConverter/VrmlConverter_Projector.hxx @@ -31,7 +31,6 @@ #include #include #include -#include #include class HLRAlgo_Projector; @@ -51,7 +50,7 @@ class VrmlConverter_Projector : public MMgt_TShared public: - Standard_EXPORT VrmlConverter_Projector(const TopTools_Array1OfShape& Shapes, const Quantity_Length Focus, const Quantity_Length DX, const Quantity_Length DY, const Quantity_Length DZ, const Quantity_Length XUp, const Quantity_Length YUp, const Quantity_Length ZUp, const VrmlConverter_TypeOfCamera Camera = VrmlConverter_NoCamera, const VrmlConverter_TypeOfLight Light = VrmlConverter_NoLight); + Standard_EXPORT VrmlConverter_Projector(const TopTools_Array1OfShape& Shapes, const Standard_Real Focus, const Standard_Real DX, const Standard_Real DY, const Standard_Real DZ, const Standard_Real XUp, const Standard_Real YUp, const Standard_Real ZUp, const VrmlConverter_TypeOfCamera Camera = VrmlConverter_NoCamera, const VrmlConverter_TypeOfLight Light = VrmlConverter_NoLight); Standard_EXPORT void SetCamera (const VrmlConverter_TypeOfCamera aCamera); @@ -73,16 +72,8 @@ public: Standard_EXPORT HLRAlgo_Projector Projector() const; - - - DEFINE_STANDARD_RTTIEXT(VrmlConverter_Projector,MMgt_TShared) -protected: - - - - private: @@ -99,10 +90,4 @@ private: }; - - - - - - #endif // _VrmlConverter_Projector_HeaderFile diff --git a/src/VrmlConverter/VrmlConverter_WFDeflectionRestrictedFace.cxx b/src/VrmlConverter/VrmlConverter_WFDeflectionRestrictedFace.cxx index b927e1be8f..89c9410fa3 100644 --- a/src/VrmlConverter/VrmlConverter_WFDeflectionRestrictedFace.cxx +++ b/src/VrmlConverter/VrmlConverter_WFDeflectionRestrictedFace.cxx @@ -79,7 +79,7 @@ void VrmlConverter_WFDeflectionRestrictedFace::Add const Handle(BRepAdaptor_HSurface)& aFace, const Standard_Boolean DrawUIso, const Standard_Boolean DrawVIso, - const Quantity_Length Deflection, + const Standard_Real Deflection, const Standard_Integer NBUiso, const Standard_Integer NBViso, const Handle(VrmlConverter_Drawer)& aDrawer) @@ -317,7 +317,7 @@ void VrmlConverter_WFDeflectionRestrictedFace::Add const Handle(BRepAdaptor_HSurface)& aFace, const Handle (VrmlConverter_Drawer)& aDrawer){ - Quantity_Length Deflection = GetDeflection(aFace, aDrawer); + Standard_Real Deflection = GetDeflection(aFace, aDrawer); Standard_Integer finu = aDrawer->UIsoAspect()->Number(); Standard_Integer finv = aDrawer->VIsoAspect()->Number(); @@ -344,7 +344,7 @@ void VrmlConverter_WFDeflectionRestrictedFace::AddUIso const Handle(BRepAdaptor_HSurface)& aFace, const Handle (VrmlConverter_Drawer)& aDrawer) { - Quantity_Length Deflection = GetDeflection(aFace, aDrawer); + Standard_Real Deflection = GetDeflection(aFace, aDrawer); Standard_Integer finu = aDrawer->UIsoAspect()->Number(); Standard_Integer finv = aDrawer->VIsoAspect()->Number(); @@ -369,7 +369,7 @@ void VrmlConverter_WFDeflectionRestrictedFace::AddVIso const Handle(BRepAdaptor_HSurface)& aFace, const Handle (VrmlConverter_Drawer)& aDrawer) { - Quantity_Length Deflection = GetDeflection(aFace, aDrawer); + Standard_Real Deflection = GetDeflection(aFace, aDrawer); Standard_Integer finu = aDrawer->UIsoAspect()->Number(); Standard_Integer finv = aDrawer->VIsoAspect()->Number(); diff --git a/src/VrmlConverter/VrmlConverter_WFDeflectionRestrictedFace.hxx b/src/VrmlConverter/VrmlConverter_WFDeflectionRestrictedFace.hxx index 8ddb12daee..7fe121994b 100644 --- a/src/VrmlConverter/VrmlConverter_WFDeflectionRestrictedFace.hxx +++ b/src/VrmlConverter/VrmlConverter_WFDeflectionRestrictedFace.hxx @@ -23,7 +23,6 @@ #include #include -#include #include class BRepAdaptor_HSurface; class VrmlConverter_Drawer; @@ -52,29 +51,8 @@ public: Standard_EXPORT static void AddVIso (Standard_OStream& anOStream, const Handle(BRepAdaptor_HSurface)& aFace, const Handle(VrmlConverter_Drawer)& aDrawer); - Standard_EXPORT static void Add (Standard_OStream& anOStream, const Handle(BRepAdaptor_HSurface)& aFace, const Standard_Boolean DrawUIso, const Standard_Boolean DrawVIso, const Quantity_Length Deflection, const Standard_Integer NBUiso, const Standard_Integer NBViso, const Handle(VrmlConverter_Drawer)& aDrawer); - - - - -protected: - - - - - -private: - - - - + Standard_EXPORT static void Add (Standard_OStream& anOStream, const Handle(BRepAdaptor_HSurface)& aFace, const Standard_Boolean DrawUIso, const Standard_Boolean DrawVIso, const Standard_Real Deflection, const Standard_Integer NBUiso, const Standard_Integer NBViso, const Handle(VrmlConverter_Drawer)& aDrawer); }; - - - - - - #endif // _VrmlConverter_WFDeflectionRestrictedFace_HeaderFile