X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROCurveCreator%2FCurveCreator_Widget.h;h=31b4db039e842234c039fda0e007ce125c1378f1;hb=8e79913fc37eacbd1edf9dc08632b6f8bc7250d8;hp=cba56e0e018ae26fcc051f755283032ed345f5be;hpb=d9bced84874275b38f81e0878e197d40782834d2;p=modules%2Fhydro.git diff --git a/src/HYDROCurveCreator/CurveCreator_Widget.h b/src/HYDROCurveCreator/CurveCreator_Widget.h index cba56e0e..31b4db03 100644 --- a/src/HYDROCurveCreator/CurveCreator_Widget.h +++ b/src/HYDROCurveCreator/CurveCreator_Widget.h @@ -56,13 +56,22 @@ public: enum ActionFlags { NoFlags = 0x00000000, DisableDetectionMode = 0x00000001, - DisableNewSection = 0x00000002 + DisableNewSection = 0x00000002, + DisableClosedSection = 0x00000004 + }; + + enum ActionMode { + NoneMode, + AdditionMode, + ModificationMode, + DetectionMode }; public: explicit CurveCreator_Widget( QWidget* parent, CurveCreator_ICurve *theCurve, const int theActionFlags = NoFlags, + const QStringList& theCoordTitles = QStringList(), Qt::WindowFlags fl=0, int theLocalPointRowLimit = 20); @@ -77,14 +86,17 @@ public: void setCurve( CurveCreator_ICurve* theCurve ); QList getSelectedSections(); - QList< QPair< int, int > > getSelectedPoints(); + void setSelectedSections( const QList& theSections ); void removeSelected(); bool removeEnabled(); + void setActionMode( const ActionMode& theMode ); + ActionMode getActionMode() const; + signals: void selectionChanged(); - void subOperationStarted( QWidget* ); + void subOperationStarted( QWidget*, bool ); void subOperationFinished( QWidget* ); public slots: @@ -128,7 +140,8 @@ protected: void addCoordsByClick( QMouseEvent* ); protected: - enum ActionId{ UNDO_ID, + enum ActionId{ NONE_ID, + UNDO_ID, REDO_ID, NEW_SECTION_ID, ADDITION_MODE_ID, @@ -146,20 +159,13 @@ protected: DETECTION_MODE_ID }; - enum ActionMode { - NoneMode, - AdditionMode, - ModificationMode, - DetectionMode - }; - private: OCCViewer_Viewer* getOCCViewer(); QAction* createAction( ActionId theId, const QString& theName, const QPixmap& theImage, const QString& theToolTip, const QKeySequence& theShortcut ); QAction* getAction(ActionId theId); - ActionMode getActionMode() const; + QAction* getAction(ActionMode theMode); void updateActionsStates(); void updateUndoRedo(); @@ -179,6 +185,8 @@ private: void setSelectedPoints( const CurveCreator_ICurve::SectionToPointList& = CurveCreator_ICurve::SectionToPointList() ); + void stopActionMode(); + void startCurveModification( CurveCreator_ICurve::SectionToPointList& thePoints, const bool theFillPoints = true ); void finishCurveModification( const CurveCreator_ICurve::SectionToPointList& thePoints = @@ -209,8 +217,11 @@ private: QPoint myDragStartPosition; int myDragInteractionStyle; CurveCreator_ICurve::SectionToPointList myDragPoints; + QMap myInitialDragPointsCoords; bool myDragged; QByteArray myGuiState; + int myPressedX; + int myPressedY; }; #endif // CURVECREATOR_WIDGET_H