Merge changes for HYDRO project : hydro/imps_2017_salome_83 branch.

diff --cc src/CurveCreator/CurveCreator_Diff.cxx
Simple merge

diff --cc src/CurveCreator/CurveCreator_Utils.cxx
index 77de8c2d83c924cac5400ae1828e7b18387ab552,20b16f4c455befdf6d7fc645f21eb15cda741b05..22fd00e6b6b0c65113c31cc899940a1caeecd726
--- 1/src/CurveCreator/CurveCreator_Utils.cxx
--- 2/src/CurveCreator/CurveCreator_Utils.cxx
+++ b/src/CurveCreator/CurveCreator_Utils.cxx
@@@ -617,24 -617,28 +615,24 @@@ void CurveCreator_Utils::setSelectedPoi
    theContext->SetAutomaticHilight( Standard_False );
  
    Handle(SelectMgr_Selection) aSelection = anAISShape->Selection( AIS_Shape::SelectionMode( TopAbs_VERTEX ) );
-   for( aSelection->Init(); aSelection->More(); aSelection->Next() )
-   {    
-     const Handle(SelectMgr_SensitiveEntity) aHSenEntity = aSelection->Sensitive();
-     if( aHSenEntity.IsNull() )
-       continue;
-     Handle(SelectBasics_SensitiveEntity) aSenEntity = aHSenEntity->BaseSensitive();
- 
-     Handle(Select3D_SensitivePoint) aSenPnt = Handle(Select3D_SensitivePoint)::DownCast( aSenEntity );
  
-     gp_Pnt anOwnerPnt = aSenPnt->Point();
-     Handle(SelectMgr_EntityOwner) anOwner = Handle(SelectMgr_EntityOwner)::DownCast( aSenPnt->OwnerId() );
+   CurveCreator_ICurve::SectionToPointList::const_iterator anIt = thePoints.begin(),
+                                                           aLast = thePoints.end();
+   bool isFound = false;
+   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 );
+   
+       gp_Pnt anOwnerPnt = aSenPnt->Point();
+       Handle(SelectMgr_EntityOwner) anOwner = Handle(SelectMgr_EntityOwner)::DownCast( aSenPnt->OwnerId() );
  
-     CurveCreator_ICurve::SectionToPointList::const_iterator anIt = thePoints.begin(),
-                                                                    aLast = thePoints.end();
-     bool isFound = false;
-     for( int i=0; i<aSize; i++ )
-     {
        bool isIntersect = fabs( aPntsToSelect[i].X() - anOwnerPnt.X() ) < LOCAL_SELECTION_TOLERANCE &&
                           fabs( aPntsToSelect[i].Y() - anOwnerPnt.Y() ) < LOCAL_SELECTION_TOLERANCE;
        if( isIntersect )

diff --cc src/CurveCreator/CurveCreator_Widget.cxx
Simple merge