From: isn <isn@opencascade.com>
Date: Wed, 29 Nov 2017 12:52:09 +0000 (+0300)
Subject: Merge remote-tracking branch 'remotes/origin/hydro/imps_2017_salome_83' into HEAD
X-Git-Tag: v2.1.1__salome84
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fhydro%2Fimps_2017_salome_84;p=modules%2Fgeom.git

Merge remote-tracking branch 'remotes/origin/hydro/imps_2017_salome_83' into HEAD

Conflicts:
	src/CurveCreator/CurveCreator_Utils.cxx
---

e093baaf913215eb4070acc4d31ce1b3f9d1c3eb
diff --cc src/CurveCreator/CurveCreator_Utils.cxx
index 77de8c2d8,20b16f4c4..6408b38dc
--- a/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 ) );
+ 
+   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() );
 +  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++ )
-     {
        bool isIntersect = fabs( aPntsToSelect[i].X() - anOwnerPnt.X() ) < LOCAL_SELECTION_TOLERANCE &&
                           fabs( aPntsToSelect[i].Y() - anOwnerPnt.Y() ) < LOCAL_SELECTION_TOLERANCE;
        if( isIntersect )