X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROCurveCreator%2FCurveCreator_Widget.cxx;h=ea0b5098a0cdff39cf4e25d4d25090589c7a3449;hb=f8d32cb2595584ebe43d5a664a457500e17e454d;hp=66534638175a8a784e944b657fc2302d2a2edddf;hpb=5de801b5e40ccbf7761fd4a0f115e117123fb12e;p=modules%2Fhydro.git

diff --git a/src/HYDROCurveCreator/CurveCreator_Widget.cxx b/src/HYDROCurveCreator/CurveCreator_Widget.cxx
index 66534638..ea0b5098 100644
--- a/src/HYDROCurveCreator/CurveCreator_Widget.cxx
+++ b/src/HYDROCurveCreator/CurveCreator_Widget.cxx
@@ -52,15 +52,10 @@
 #include <AIS_ListOfInteractive.hxx>
 #include <AIS_ListIteratorOfListOfInteractive.hxx>
 #include <AIS_Shape.hxx>
-#include <AIS_Point.hxx>
-#include <AIS_Line.hxx>
 #include <AIS_LocalContext.hxx>
 #include <Geom_Point.hxx>
 #include <Geom_BSplineCurve.hxx>
 #include <Geom_Line.hxx>
-#include <StdSelect_BRepOwner.hxx>
-#include <SelectMgr_Selection.hxx>
-#include <Select3D_SensitivePoint.hxx>
 
 #include <QHBoxLayout>
 #include <QVBoxLayout>
@@ -102,8 +97,6 @@
 
 
 
-const double LOCAL_SELECTION_TOLERANCE = 0.0001;
-
 CurveCreator_Widget::CurveCreator_Widget(QWidget* parent,
                                          CurveCreator_ICurve *theCurve,
                                          Qt::WindowFlags fl,
@@ -333,18 +326,6 @@ int CurveCreator_Widget::changeInteractionStyle( int theStyle )
   return aPrevStyle;
 }
 
-/**
- * Set interaction style in the OCC viewer
- * \param theStyle a new style
- * \return the previous style
- */
-void CurveCreator_Widget::setObjectsSelected(const AIS_ListOfInteractive& theList)
-{
-  OCCViewer_Viewer* aViewer = getOCCViewer();
-  if ( aViewer )
-    aViewer->setObjectsSelected(theList);
-}
-
 //=======================================================================
 // function: reset
 // purpose: reset the widget viewer, close local context, clear selection
@@ -1311,133 +1292,16 @@ void CurveCreator_Widget::getSelectedPoints( CurveCreator_ICurve::SectionToPoint
   thePoints = myLocalPoints;
 }
 
-
-bool CurveCreator_Widget::isIntersectVertexToPoint( const TopoDS_Vertex& theVertex,
-                               const CurveCreator_ICurve::SectionToPoint& theSToPoint )
-{
-  bool isIntersect = false;
-  if ( theVertex.IsNull() )
-    return isIntersect;
-
-  gp_Pnt aSPoint;
-  CurveCreator_UtilsICurve::getPoint( myCurve, theSToPoint.first, theSToPoint.second,
-                                      aSPoint );
-  gp_Pnt aVertexPoint = BRep_Tool::Pnt( theVertex );
-  isIntersect = fabs( aVertexPoint.X() - aSPoint.X() ) < LOCAL_SELECTION_TOLERANCE &&
-                fabs( aVertexPoint.Y() - aSPoint.Y() ) < LOCAL_SELECTION_TOLERANCE;
-
-  return isIntersect;
-}
-
-
 void CurveCreator_Widget::setSelectedPoints( const CurveCreator_ICurve::SectionToPointList& thePoints )
 {
   if ( myDragStarted )
     return;
-
-  Handle(AIS_InteractiveContext) ic = getAISContext();
-  if ( ic.IsNull() || !ic->HasOpenedContext() )
+  Handle(AIS_InteractiveContext) aContext = getAISContext();
+  if ( aContext.IsNull() || !aContext->HasOpenedContext() )
     return;
 
-  AIS_ListOfInteractive aListToSelect;
-  AIS_ListOfInteractive aDisplayedList;
-  ic->DisplayedObjects( aDisplayedList );
-  ic->ClearSelected( Standard_False );
-
-  bool isSelectedVertex = false;
-
-  //ASL: std::vector<TopoDS_Vertex> aVetexVec;
-  for ( AIS_ListIteratorOfListOfInteractive it( aDisplayedList ); it.More(); it.Next() )
-  {
-    Handle(AIS_InteractiveObject) anAIS = it.Value();
-    if ( anAIS.IsNull() )
-      continue;
-    Handle(AIS_Shape) anAISShape = Handle(AIS_Shape)::DownCast( anAIS );
-    if ( anAISShape.IsNull() )
-      continue;
-
-
-    /*ASL: const TopoDS_Shape& aShape = anAISShape->Shape();
-    TopExp_Explorer aExpV( aShape, TopAbs_VERTEX);
-    for ( ; aExpV.More(); aExpV.Next() )
-    {
-      const TopoDS_Vertex& aVertex = TopoDS::Vertex( aExpV.Current() );
-      aVetexVec.push_back( aVertex );
-    }*/
-
-
-    //ASL: we convert list of point indices to list of points coordinates
-    int aSize = thePoints.size();
-    std::vector<gp_Pnt> aPntsToSelect( aSize );
-
-    CurveCreator_ICurve::SectionToPointList::const_iterator
-      aPIt = thePoints.begin(), aPLast = thePoints.end();
-    CurveCreator_ICurve::SectionToPoint aSToPoint;
-    for( int i=0; aPIt != aPLast; aPIt++, i++ )
-    {
-      gp_Pnt aPntToSelect;
-      CurveCreator_UtilsICurve::getPoint( myCurve, aPIt->first, aPIt->second, aPntToSelect );
-      aPntsToSelect[i] = aPntToSelect;
-    }
-
-
-    //ASL: we switch off automatic highlight to improve performance of selection
-    ic->SetAutomaticHilight( Standard_False );
-
-    Handle_SelectMgr_Selection aSelection = anAISShape->Selection( AIS_Shape::SelectionMode( TopAbs_VERTEX ) );
-    for( aSelection->Init(); aSelection->More(); aSelection->Next() )
-    {
-      Handle_SelectBasics_SensitiveEntity aSenEntity = aSelection->Sensitive();
-      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 )
-        {
-          ic->AddOrRemoveSelected( anOwner, Standard_False );
-          break;
-        }
-      }
-    }
-  }
-
-  /*ASL: std::vector<TopoDS_Vertex>::const_iterator aVecIt = aVetexVec.begin(), aVecLast = aVetexVec.end(); 
-  CurveCreator_ICurve::SectionToPointList::const_iterator anIt = thePoints.begin(),
-                                                          aLast = thePoints.end();
-  int aSize = aVetexVec.size();
-  CurveCreator_ICurve::SectionToPoint aSToPoint;
-  int anAddedSize = 0;
-  for( ; anIt != aLast; anIt++ ) {
-    aSToPoint = *anIt;
-
-    for ( aVecIt = aVetexVec.begin(); aVecIt != aVecLast; aVecIt++ )
-    {
-      TopoDS_Vertex aVertex = TopoDS::Vertex( *aVecIt );
-      if ( isIntersectVertexToPoint( aVertex, aSToPoint ) ) {
-        ic->AddOrRemoveSelected( aVertex, Standard_False );
-        isSelectedVertex = true;
-        anAddedSize++;
-      }
-    }
-  }*/
-
-  //ASL: we switch on again automatic highlight (otherwise selection will not be shown)
-  //     and call HilightPicked to draw selected owners
-  ic->SetAutomaticHilight( Standard_True );
-  ic->LocalContext()->HilightPicked( Standard_True );
+  CurveCreator_Utils::setSelectedPoints( aContext, myCurve, thePoints );
 
-  //ic->UpdateCurrentViewer();
-  if ( !isSelectedVertex )
-    setObjectsSelected( aListToSelect );
   updateLocalPointView();
 }