]> SALOME platform Git repositories - modules/hydro.git/commitdiff
Salome HOME
It removes AIS curve presentation.
authornds <nds@opencascade.com>
Wed, 4 Dec 2013 12:02:36 +0000 (12:02 +0000)
committernds <nds@opencascade.com>
Wed, 4 Dec 2013 12:02:36 +0000 (12:02 +0000)
src/HYDROCurveCreator/CurveCreator_Curve.cxx
src/HYDROCurveCreator/CurveCreator_Curve.hxx
src/HYDROCurveCreator/CurveCreator_ICurve.hxx
src/HYDROCurveCreator/CurveCreator_Utils.cxx
src/HYDROCurveCreator/CurveCreator_Utils.h
src/HYDROCurveCreator/CurveCreator_Widget.cxx
src/HYDROCurveCreator/CurveCreator_Widget.h

index 7e814ade601bf9866a61b389c28608b0f9014461..1ce68e6c1fef900fa5998c6527b09f0e19c042ac 100644 (file)
@@ -46,6 +46,7 @@ CurveCreator_Curve::CurveCreator_Curve( const CurveCreator::Dimension theDimensi
 : myIsLocked  (false),
   myDimension (theDimension),
   myDisplayer (NULL),
+  myAISShape  (NULL),
   myNbUndos   (0),
   myNbRedos   (0),
   myUndoDepth (-1),
@@ -244,6 +245,7 @@ void CurveCreator_Curve::redisplayCurve()
 {
   if( myDisplayer ) {
     myDisplayer->erase( false );
+    myAISShape = NULL;
     myDisplayer->display( constructWire(), true );
   }
 }
@@ -362,8 +364,10 @@ bool CurveCreator_Curve::redo()
 bool CurveCreator_Curve::clearInternal()
 {
   // erase curve from the viewer
-  if( myDisplayer )
+  if( myDisplayer ) {
     myDisplayer->erase( true );
+    myAISShape = NULL;
+  }
   // Delete all allocated data.
   int i = 0;
   const int aNbSections = getNbSections();
@@ -939,14 +943,23 @@ CurveCreator::Coordinates CurveCreator_Curve::getPoints( const int theISection )
 /***********************************************/
 /***       Presentation methods              ***/
 /***********************************************/
-std::vector<Handle_AIS_InteractiveObject> CurveCreator_Curve::constructWire() const
+std::vector<Handle_AIS_InteractiveObject> CurveCreator_Curve::constructWire()
 {
   std::vector<Handle_AIS_InteractiveObject> aCurveRepresentation;
 
   TopoDS_Shape aShape;
   CurveCreator_Utils::constructShape( this, aShape );
 
-  AIS_Shape* anAISShape = new AIS_Shape( aShape );
-  aCurveRepresentation.push_back( anAISShape );
+  myAISShape = new AIS_Shape( aShape );
+  aCurveRepresentation.push_back( myAISShape );
   return aCurveRepresentation;
 }
+
+//=======================================================================
+// function: getAISObject
+// purpose:
+//=======================================================================
+Handle_AIS_InteractiveObject CurveCreator_Curve::getAISObject() const
+{
+  return myAISShape;
+}
\ No newline at end of file
index abefa0d5d729a6af305c5fe4441bd4d6e5f4830c..ffa89c9c1439a120e64636fc99c1c3b0aa217e9b 100644 (file)
@@ -36,6 +36,7 @@
 
 struct CurveCreator_Section;
 class CurveCreator_Displayer;
+class AIS_Shape;
 
 /**
  *  The CurveCreator_Curve object is represented as one or more sets of
@@ -261,13 +262,19 @@ public:
   /***********************************************/
   /***       Presentation methods              ***/
   /***********************************************/
-  virtual ListAISObjects constructWire() const;
+  virtual ListAISObjects constructWire();
+
+  /**
+   *  Get the curve AIS object
+   */
+  virtual Handle_AIS_InteractiveObject getAISObject() const;
 
 public:
   bool                            myIsLocked;
   CurveCreator::Sections          mySections;   //!< curve data
   CurveCreator::Dimension         myDimension;  //!< curve dimension
   CurveCreator_Displayer*         myDisplayer;  //!< curve displayer
+  AIS_Shape*                      myAISShape;   //!< AIS shape
 
 private:
 
index 821343e3493f3be387f27b6e715d50309d9c48de..ed6b3c2e42270bdfafb57b330dd4e85b17dace9c 100644 (file)
@@ -179,7 +179,9 @@ public:
   /***********************************************/
   /***       Presentation methods              ***/
   /***********************************************/
-  virtual ListAISObjects constructWire() const = 0;
+  virtual ListAISObjects constructWire() = 0;
+
+  virtual Handle_AIS_InteractiveObject getAISObject() const = 0;
 };
 
 #endif
index e237e6ee69c3ec77f69f2da87834ae1db8124fc3..fa5e741707e16e1e3f9bc9bd25d8ebfd0f2ee3de 100644 (file)
@@ -36,6 +36,7 @@
 #include <AIS_Shape.hxx>
 #include <AIS_Line.hxx>
 #include <AIS_Trihedron.hxx>
+#include <AIS_LocalContext.hxx>
 
 #include <Geom_Point.hxx>
 #include <Geom_BSplineCurve.hxx>
@@ -44,6 +45,8 @@
 #include <TopExp_Explorer.hxx>
 #include <GeomAPI_ProjectPointOnCurve.hxx>
 #include <SelectMgr_EntityOwner.hxx>
+#include <SelectMgr_Selection.hxx>
+#include <Select3D_SensitivePoint.hxx>
 
 #include <BRep_Tool.hxx>
 #include <BRep_Builder.hxx>
@@ -204,6 +207,73 @@ void CurveCreator_Utils::getSelectedPoints( Handle(AIS_InteractiveContext) theCo
   }
 }
 
+void CurveCreator_Utils::setSelectedPoints( Handle(AIS_InteractiveContext) theContext,
+                                            const CurveCreator_ICurve* theCurve,
+                                            const CurveCreator_ICurve::SectionToPointList& thePoints )
+{
+  AIS_ListOfInteractive aDisplayedList;
+  theContext->DisplayedObjects( aDisplayedList );
+  theContext->ClearSelected( Standard_False );
+
+  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: 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( theCurve, aPIt->first, aPIt->second, aPntToSelect );
+      aPntsToSelect[i] = aPntToSelect;
+    }
+
+
+    //ASL: we switch off automatic highlight to improve performance of selection
+    theContext->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 )
+        {
+          theContext->AddOrRemoveSelected( anOwner, Standard_False );
+          break;
+        }
+      }
+    }
+  }
+
+  //ASL: we switch on again automatic highlight (otherwise selection will not be shown)
+  //     and call HilightPicked to draw selected owners
+  theContext->SetAutomaticHilight( Standard_True );
+  theContext->LocalContext()->HilightPicked( Standard_True );
+}
+
 //=======================================================================
 // function : setLocalPointContext
 // purpose  : Open/close the viewer local context
index 0bdf5d5957cf428ebf944321fa3cff35db0012fc..ab4a3503fe2447636b1ed52b670916de76699b57 100644 (file)
@@ -77,6 +77,17 @@ public:
                                          const CurveCreator_ICurve* theCurve,
                                          CurveCreator_ICurve::SectionToPointList& thePoints );
 
+  /**
+   * Set selected points to the context
+   * \param theContext the viewer context
+   * \param thePoints the curve point indices to be selected in the context
+   */
+  CURVECREATOR_EXPORT static void setSelectedPoints(
+                                         Handle(AIS_InteractiveContext) theContext,
+                                         const CurveCreator_ICurve* theCurve,
+                                         const CurveCreator_ICurve::SectionToPointList& thePoints =
+                                               CurveCreator_ICurve::SectionToPointList() );
+
   /*!
    * \brief Sets the local point context for the 3D viewer.
    * \param theOpen The flag to open or close the local context.
index f3c5b8e85f2c971c216cc6264cbd0a406be343c0..ea0b5098a0cdff39cf4e25d4d25090589c7a3449 100644 (file)
@@ -56,9 +56,6 @@
 #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>
 
 
 
-const double LOCAL_SELECTION_TOLERANCE = 0.0001;
-
 CurveCreator_Widget::CurveCreator_Widget(QWidget* parent,
                                          CurveCreator_ICurve *theCurve,
                                          Qt::WindowFlags fl,
@@ -331,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
@@ -1309,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();
 }
 
index e3ac5af039514bd3cfe7040676abe86229b6a670..399711e8a79bffc9bb4f24becfc4bf9622c74bc2 100644 (file)
@@ -63,7 +63,6 @@ public:
   Handle(AIS_InteractiveContext) getAISContext();
   OCCViewer_ViewPort3d* getViewPort();
   int changeInteractionStyle( int theStyle );
-  void setObjectsSelected(const AIS_ListOfInteractive& theList);
 
   void reset();
   void setCurve( CurveCreator_ICurve* theCurve );
@@ -166,8 +165,6 @@ private:
   void setDragStarted( const bool theState, const QPoint& thePoint = QPoint() );
 
   void getSelectedPoints( CurveCreator_ICurve::SectionToPointList& thePoints );
-  bool isIntersectVertexToPoint( const TopoDS_Vertex& theVertex,
-                               const CurveCreator_ICurve::SectionToPoint& theSToPoint );
   void setSelectedPoints( const CurveCreator_ICurve::SectionToPointList& =
                                CurveCreator_ICurve::SectionToPointList() );