Merge changes for HYDRO project : hydro/imps_2017_salome_83 branch.

[modules/geom.git] / src / CurveCreator / CurveCreator_Utils.cxx

diff --git a/src/CurveCreator/CurveCreator_Utils.cxx b/src/CurveCreator/CurveCreator_Utils.cxx
index 20b16f4c455befdf6d7fc645f21eb15cda741b05..22fd00e6b6b0c65113c31cc899940a1caeecd726 100644 (file)
--- a/src/CurveCreator/CurveCreator_Utils.cxx
+++ b/src/CurveCreator/CurveCreator_Utils.cxx
@@ -23,8 +23,6 @@
 #include "CurveCreator_Section.hxx"
 #include "CurveCreator_UtilsICurve.hxx"
 
-#include <Basics_OCCTVersion.hxx>
-
 #include <GEOMUtils.hxx>
 
 #include <gp_Pln.hxx>
@@ -146,7 +144,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
@@ -624,15 +622,11 @@ void CurveCreator_Utils::setSelectedPoints( Handle(AIS_InteractiveContext) theCo
   for( int i=0; i<aSize; i++ )
   {
     for( aSelection->Init(); aSelection->More(); aSelection->Next() )
-    {    
-#if OCC_VERSION_LARGE > 0x06080100
+    {
       const Handle(SelectMgr_SensitiveEntity) aHSenEntity = aSelection->Sensitive();
       if( aHSenEntity.IsNull() )
         continue;
       Handle(SelectBasics_SensitiveEntity) aSenEntity = aHSenEntity->BaseSensitive();
-#else
-      Handle(SelectBasics_SensitiveEntity) aSenEntity = aSelection->Sensitive();
-#endif
 
       Handle(Select3D_SensitivePoint) aSenPnt = Handle(Select3D_SensitivePoint)::DownCast( aSenEntity );