From 338ca530244e35ce6cce63f1570744f6e12dee97 Mon Sep 17 00:00:00 2001 From: mnt Date: Thu, 6 Jul 2017 16:28:26 +0300 Subject: [PATCH] RNV: Remove deprecated code. --- src/CurveCreator/CurveCreator_Utils.cxx | 2 +- src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx | 2 +- src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx | 4 ++-- src/MeasureGUI/MeasureGUI_DimensionCreateTool.cxx | 9 ++------- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/CurveCreator/CurveCreator_Utils.cxx b/src/CurveCreator/CurveCreator_Utils.cxx index 5f53caea4..53f68259f 100644 --- a/src/CurveCreator/CurveCreator_Utils.cxx +++ b/src/CurveCreator/CurveCreator_Utils.cxx @@ -146,7 +146,7 @@ gp_Pnt CurveCreator_Utils::ConvertClickToPoint( int x, int y, Handle(V3d_View) a // we need the projection to the XOY plane // 1. find a point in the plane of the eye and the normal to the plane Standard_Real X, Y, Z; - Quantity_Parameter Vx, Vy, Vz; + Standard_Real Vx, Vy, Vz; aView->ConvertWithProj( x, y, X, Y, Z, Vx, Vy, Vz ); // 2. build a ray from the point by the normal to the XOY plane and intersect it diff --git a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx index dd3318aac..170878a03 100644 --- a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx @@ -2029,7 +2029,7 @@ GEOMImpl_IMeasureOperations::AreCoordsInside(Handle(GEOM_Object) theShape project.NbPoints() > 0 && project.LowerDistance() <= tolerance ) { - Quantity_Parameter u, v; + Standard_Real u, v; project.LowerDistanceParameters(u, v); gp_Pnt2d uv( u, v ); BRepClass_FaceClassifier FC ( face, uv, tolerance ); diff --git a/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx b/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx index 57d842242..c9cde5f0f 100644 --- a/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ProjectionDriver.cxx @@ -160,7 +160,7 @@ Standard_Integer GEOMImpl_ProjectionDriver::Execute(LOGBOOK& log) const Standard_ConstructionError::Raise("No solution found"); } - Quantity_Parameter U, V; + Standard_Real U, V; proj.LowerDistanceParameters(U, V); gp_Pnt2d aProjPnt (U, V); @@ -170,7 +170,7 @@ Standard_Integer GEOMImpl_ProjectionDriver::Execute(LOGBOOK& log) const bool isSol = false; double minDist = RealLast(); for (int i = 1; i <= nbPoints; i++) { - Quantity_Parameter Ui, Vi; + Standard_Real Ui, Vi; proj.Parameters(i, Ui, Vi); aProjPnt = gp_Pnt2d(Ui, Vi); aClsf.Perform(aFace, aProjPnt, tol); diff --git a/src/MeasureGUI/MeasureGUI_DimensionCreateTool.cxx b/src/MeasureGUI/MeasureGUI_DimensionCreateTool.cxx index a3587cf0d..06d3cba25 100644 --- a/src/MeasureGUI/MeasureGUI_DimensionCreateTool.cxx +++ b/src/MeasureGUI/MeasureGUI_DimensionCreateTool.cxx @@ -76,11 +76,6 @@ #include #include -#if OCC_VERSION_LARGE >= 0x07010000 -#include -#endif - - // plane associated with custom data struct PlaneAndSegment { @@ -1151,8 +1146,8 @@ template TPlane MeasureGUI_DimensionCreateTool::SelectPlaneForProjection( const NCollection_Sequence& thePlanes, const Handle(V3d_View)& theView ) const { - Quantity_Parameter U[3]; - Quantity_Parameter N[3]; + Standard_Real U[3]; + Standard_Real N[3]; theView->Up( U[0], U[1], U[2] ); theView->Proj( N[0], N[1], N[2] );