Avoid of Fit all for 2d mode change

[modules/hydro.git] / src / HYDROCurveCreator / CurveCreator_Widget.h

diff --git a/src/HYDROCurveCreator/CurveCreator_Widget.h b/src/HYDROCurveCreator/CurveCreator_Widget.h
index 43fdb492fbc398e53fbd5ac11f2e3f506006e0ea..7da055ae967a3229301a7ac6fdd0a3425afa9289 100644 (file)
--- a/src/HYDROCurveCreator/CurveCreator_Widget.h
+++ b/src/HYDROCurveCreator/CurveCreator_Widget.h
@@ -34,6 +34,7 @@
 #include <Geom_Curve.hxx>
 #include <V3d_View.hxx>
 #include <gp_Pnt.hxx>
+#include <TopoDS_Vertex.hxx> // TODO - remove
 
 class OCCViewer_Viewer;
 class OCCViewer_ViewPort3d;
@@ -42,7 +43,7 @@ class AIS_ListOfInteractive;
 
 class QAction;
 class QPixmap;
-class QTableWidget;
+class CurveCreator_TableView;
 class CurveCreator_TreeView;
 class CurveCreator_NewPointDlg;
 class CurveCreator_NewSectionDlg;
@@ -50,10 +51,20 @@ class CurveCreator_NewSectionDlg;
 class CURVECREATOR_EXPORT CurveCreator_Widget : public QWidget
 {
   Q_OBJECT
+
+public:
+  enum ActionFlags {
+    NoFlags              = 0x00000000,
+    DisableDetectionMode = 0x00000001,
+    DisableNewSection    = 0x00000002
+  };
+
 public:
   explicit CurveCreator_Widget( QWidget* parent,
                                 CurveCreator_ICurve *theCurve,
-                                Qt::WindowFlags fl=0 );
+                                const int theActionFlags = NoFlags,
+                                Qt::WindowFlags fl=0,
+                                int theLocalPointRowLimit = 20);
 
   // OCC viewer manipulation
   void setOCCViewer( OCCViewer_Viewer* theViewer );
@@ -61,13 +72,8 @@ public:
   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;
-
   void setCurve( CurveCreator_ICurve* theCurve );
 
   QList<int> getSelectedSections();
@@ -90,7 +96,6 @@ protected slots:
   void     onModeChanged(bool checked);
   void     onNewSection();
   void     onSelectionChanged();
-  void     onAddNewPoint(const CurveCreator::Coordinates& theCoords);
   void     onAddNewSection();
   void     onEditSection( int theSection );
   void     onModifySection();
@@ -107,7 +112,6 @@ protected slots:
   void     onRedo();
   void     onUndoSettings();
   void     onContextMenu(QPoint thePoint);
-  void     onGetCoordsByClick( QMouseEvent* );
 
   void     onMousePress( SUIT_ViewWindow*, QMouseEvent* theEvent );
   void     onMouseRelease( SUIT_ViewWindow*, QMouseEvent* theEvent );
@@ -120,6 +124,9 @@ protected slots:
 
   void     onCellChanged( int theRow, int theColumn );
 
+protected:
+  void     addCoordsByClick( QMouseEvent* );
+
 protected:
   enum ActionId{ UNDO_ID, 
                  REDO_ID, 
@@ -154,23 +161,26 @@ private:
   QAction* getAction(ActionId theId);
   ActionMode getActionMode() const;
 
-  void     updateUndoRedo();
+  void updateActionsStates();
+  void updateUndoRedo();
 
   void removeSection();
   void removePoint();
+  void addNewPoint(const CurveCreator::Coordinates& theCoords);
   void insertPointToSelectedSegment( const int theXPosition,
                                      const int theYPosition );
   void moveSelectedPoints( const int theXPosition, const int theYPosition );
   void updateLocalPointView();
   void setLocalPointContext( const bool theOpen, const bool isUpdateTable = false );
-  void addLocalPointToTable( const double theX, const double theY );
 
   void setDragStarted( const bool theState, const QPoint& thePoint = QPoint() );
 
-  void getSelectedPonts( CurveCreator_ICurve::SectionToPointList& thePoints );
-  void setSelectedPonts( const CurveCreator_ICurve::SectionToPointList& =
+  void getSelectedPoints( CurveCreator_ICurve::SectionToPointList& thePoints );
+  void setSelectedPoints( const CurveCreator_ICurve::SectionToPointList& =
                                CurveCreator_ICurve::SectionToPointList() );
 
+  void stopModificationMode();
+
   void startCurveModification( CurveCreator_ICurve::SectionToPointList& thePoints,
                                const bool theFillPoints = true );
   void finishCurveModification( const CurveCreator_ICurve::SectionToPointList& thePoints = 
@@ -183,20 +193,18 @@ private:
   void convert( const CurveCreator_ICurve::SectionToPointList& thePoints,
                 QMap<int, QList<int> >& theConvPoints );
 
-  // local point view table methods
-  int getSectionId( const int theRowId ) const;
-  int getPointId( const int theRowId ) const;
-
   bool contains( const CurveCreator_ICurve::SectionToPointList& theList,
                  const CurveCreator_ICurve::SectionToPoint& theValue ) const;
 
 private:
   QMap<ActionId, QAction*>    myActionMap;
-  CurveCreator_ICurve*         myCurve;
+  CurveCreator_ICurve*        myCurve;
   CurveCreator_TreeView*      mySectionView;
-  QTableWidget*               myLocalPointView;
+  CurveCreator_TableView*     myLocalPointView;
+  CurveCreator_ICurve::SectionToPointList myLocalPoints;
   CurveCreator_NewSectionDlg* myNewSectionEditor;
   OCCViewer_Viewer*           myOCCViewer;
+  int                         myLocalPointRowLimit;
   int                         mySection;
   int                         myPointNum;
   bool                        myDragStarted;