X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROCurveCreator%2FCurveCreator_Widget.h;h=6f073f165f7696cc88b320f642f8dc03d0ff868d;hb=8edd427af3997521bda72ca3c416cc1d490565d5;hp=72b3d64a3b4aa092b4824ca5ddf6b035b6f4d7f7;hpb=2e8638b48abbc8f106cbed3c054c35be1e9b8639;p=modules%2Fhydro.git

diff --git a/src/HYDROCurveCreator/CurveCreator_Widget.h b/src/HYDROCurveCreator/CurveCreator_Widget.h
index 72b3d64a..6f073f16 100644
--- a/src/HYDROCurveCreator/CurveCreator_Widget.h
+++ b/src/HYDROCurveCreator/CurveCreator_Widget.h
@@ -20,26 +20,30 @@
 #ifndef CURVECREATOR_WIDGET_H
 #define CURVECREATOR_WIDGET_H
 
-//#include "CurveCreator_ICurve.hxx"
-#include "CurveCreator.hxx"
 #include "CurveCreator_Macro.hxx"
+#include "CurveCreator.hxx"
+#include "CurveCreator_ICurve.hxx"
 
 #include <QWidget>
 #include <QMap>
 
 #include <SUIT_ViewWindow.h>
 #include <AIS_InteractiveObject.hxx>
+#include <AIS_InteractiveContext.hxx>
 
 #include <Geom_Curve.hxx>
 #include <V3d_View.hxx>
 #include <gp_Pnt.hxx>
+#include <TopoDS_Vertex.hxx> // TODO - remove
 
 class OCCViewer_Viewer;
+class OCCViewer_ViewPort3d;
+
+class AIS_ListOfInteractive;
 
 class QAction;
 class QPixmap;
 class QTableWidget;
-class CurveCreator_ICurve;
 class CurveCreator_TreeView;
 class CurveCreator_NewPointDlg;
 class CurveCreator_NewSectionDlg;
@@ -52,8 +56,15 @@ public:
                                 CurveCreator_ICurve *theCurve,
                                 Qt::WindowFlags fl=0 );
 
+  // OCC viewer manipulation
   void setOCCViewer( OCCViewer_Viewer* theViewer );
-  OCCViewer_Viewer* getOCCViewer();
+
+  Handle(AIS_InteractiveContext) getAISContext();
+  OCCViewer_ViewPort3d* getViewPort();
+  int changeInteractionStyle( int theStyle );
+  void setObjectsSelected(const AIS_ListOfInteractive& theList);
+
+  void reset();
 
   //! Return unique section name
   std::string getUniqSectionName(CurveCreator_ICurve* theCurve) const;
@@ -104,6 +115,10 @@ protected slots:
   void     onMouseMove( SUIT_ViewWindow*, QMouseEvent* theEvent );
   void     onLastViewClosed( SUIT_ViewManager* theManager );
 
+  void     onMousePress( QMouseEvent* theEvent );
+  void     onMouseRelease( QMouseEvent* theEvent );
+  void     onMouseMove( QMouseEvent* theEvent );
+
   void     onCellChanged( int theRow, int theColumn );
 
 protected:
@@ -132,10 +147,9 @@ protected:
     DetectionMode
   };
 
-  typedef std::pair< int, int > SectionToPoint;
-  typedef std::deque< SectionToPoint > SectionToPointList;
-
 private:
+  OCCViewer_Viewer* getOCCViewer();
+
   QAction* createAction( ActionId theId, const QString& theName, const QPixmap& theImage,
                          const QString& theToolTip, const QKeySequence& theShortcut );
   QAction* getAction(ActionId theId);
@@ -154,33 +168,30 @@ private:
 
   void setDragStarted( const bool theState, const QPoint& thePoint = QPoint() );
 
-  void getSelectedPonts( SectionToPointList& thePoints );
-  void setSelectedPonts( const SectionToPointList& = SectionToPointList() );
+  void getSelectedPonts( CurveCreator_ICurve::SectionToPointList& thePoints );
+  bool isIntersectVertexToPoint( const TopoDS_Vertex& theVertex,
+                               const CurveCreator_ICurve::SectionToPoint& theSToPoint );
+  void setSelectedPonts( const CurveCreator_ICurve::SectionToPointList& =
+                               CurveCreator_ICurve::SectionToPointList() );
 
-  void startCurveModification( SectionToPointList& thePoints,
+  void startCurveModification( CurveCreator_ICurve::SectionToPointList& thePoints,
                                const bool theFillPoints = true );
-  void finishCurveModification( const SectionToPointList& thePoints = SectionToPointList() );
+  void finishCurveModification( const CurveCreator_ICurve::SectionToPointList& thePoints = 
+                                      CurveCreator_ICurve::SectionToPointList() );
 
   // curve algorithm
   int  findLocalPointIndex( int theSectionId, float theX, float theY );
   void findSectionsToPoints( const double theX, const double theY,
-                             SectionToPointList& thePoints );
-  void convert( const SectionToPointList& thePoints,
+                             CurveCreator_ICurve::SectionToPointList& thePoints );
+  void convert( const CurveCreator_ICurve::SectionToPointList& thePoints,
                 QMap<int, QList<int> >& theConvPoints );
 
-  // OCC algorithm
-  bool pointOnObject( Handle(AIS_InteractiveObject) theObject,
-                      const int theX, const int theY,
-                      gp_Pnt& thePoint, gp_Pnt& thePoint1, gp_Pnt& thePoint2 );
-  bool hasProjectPointOnCurve( const int theX, const int theY,
-                               const Handle(Geom_Curve)& theCurve,
-                               Standard_Real& theParameter );
-
   // local point view table methods
   int getSectionId( const int theRowId ) const;
   int getPointId( const int theRowId ) const;
 
-  bool contains( const SectionToPointList& theList, const SectionToPoint& theValue ) const;
+  bool contains( const CurveCreator_ICurve::SectionToPointList& theList,
+                 const CurveCreator_ICurve::SectionToPoint& theValue ) const;
 
 private:
   QMap<ActionId, QAction*>    myActionMap;
@@ -194,7 +205,7 @@ private:
   bool                        myDragStarted;
   QPoint                      myDragStartPosition;
   int                         myDragInteractionStyle;
-  SectionToPointList          myDragPoints;
+  CurveCreator_ICurve::SectionToPointList myDragPoints;
   bool                        myDragged;
   QByteArray                  myGuiState;
 };