X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FPartSet%2FPartSet_OperationFeatureEditMulti.h;h=5b50a7bd6aa61956b6ad43a641b18219ba3c26b1;hb=5b841e9801c659d762d708378df8c4d85565fda0;hp=a431a1d85f7b3176a0b5d66ad6c446c09419850b;hpb=9f363a5839e964d3a0c31a955561a2e8b774c268;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_OperationFeatureEditMulti.h b/src/PartSet/PartSet_OperationFeatureEditMulti.h index a431a1d85..5b50a7bd6 100644 --- a/src/PartSet/PartSet_OperationFeatureEditMulti.h +++ b/src/PartSet/PartSet_OperationFeatureEditMulti.h @@ -9,31 +9,42 @@ #include #include +#include + +#include +#include class QMouseEvent; /*! \class PartSet_OperationFeatureEditMulti * \brief The operation for the sketch feature creation -*/ -class PARTSET_EXPORT PartSet_OperationFeatureEditMulti : public PartSet_OperationSketchBase + */ +class PARTSET_EXPORT PartSet_OperationFeatureEditMulti : public PartSet_OperationSketchBase { - Q_OBJECT +Q_OBJECT /// Struct to define gp point, with the state is the point is initialized struct Point { /// Constructor - Point() {} + Point() + { + } /// Constructor /// \param thePoint the point Point(gp_Pnt thePoint) { setPoint(thePoint); } - ~Point() {} + ~Point() + { + } /// clear the initialized flag. - void clear() { myIsInitialized = false; } + void clear() + { + myIsInitialized = false; + } /// set the point and switch on the initialized flag /// \param thePoint the point void setPoint(const gp_Pnt& thePoint) @@ -42,63 +53,59 @@ class PARTSET_EXPORT PartSet_OperationFeatureEditMulti : public PartSet_Operatio myPoint = thePoint; } - bool myIsInitialized; /// the state whether the point is set - gp_Pnt myPoint; /// the point + bool myIsInitialized; /// the state whether the point is set + gp_Pnt myPoint; /// the point }; -public: + public: /// Returns the operation type key - static std::string Type() { return "EditMulti"; } + static std::string Type() + { + return "EditMulti"; + } -public: + public: /// Constructor /// \param theId the feature identifier /// \param theParent the operation parent /// \param theFeature the parent feature PartSet_OperationFeatureEditMulti(const QString& theId, QObject* theParent, - FeaturePtr theFeature); + CompositeFeaturePtr theFeature); /// Destructor virtual ~PartSet_OperationFeatureEditMulti(); - /// Returns that this operator can be started above already running one. - /// The runned operation should be the sketch feature modified operation - /// \param theOperation the previous running operation - virtual bool isGranted(ModuleBase_IOperation* theOperation) const; - - /// Initializes the operation with previously created feature. It is used in sequental operations - virtual void initFeature(FeaturePtr theFeature); - /// Initialisation of operation with preliminary selection /// \param theSelected the list of selected presentations /// \param theHighlighted the list of highlighted presentations - virtual void initSelection(const std::list& theSelected, - const std::list& theHighlighted); + /// \param theViewer a viewer to have the viewer the eye position + virtual void initSelection(ModuleBase_ISelection* theSelection, + ModuleBase_IViewer* theViewer); /// Returns the operation sketch feature /// \returns the sketch instance - virtual FeaturePtr sketch() const; + virtual CompositeFeaturePtr sketch() const; /// Processes the mouse pressed in the point /// \param theEvent the mouse event /// \param theView a viewer to have the viewer the eye position /// \param theSelected the list of selected presentations /// \param theHighlighted the list of highlighted presentations - virtual void mousePressed(QMouseEvent* theEvent, Handle_V3d_View theView, - const std::list& theSelected, - const std::list& theHighlighted); + //virtual void mousePressed(QMouseEvent* theEvent, ModuleBase_IViewer* theViewer, ModuleBase_ISelection* theSelection); + /// Gives the current mouse point in the viewer /// \param theEvent the mouse event /// \param theView a viewer to have the viewer the eye position - virtual void mouseMoved(QMouseEvent* theEvent, Handle_V3d_View theView); + virtual void mouseMoved(QMouseEvent* theEvent, ModuleBase_IViewer* theViewer); + /// Gives the current selected objects to be processed by the operation /// \param thePoint a point clicked in the viewer /// \param theEvent the mouse event /// \param theSelected the list of selected presentations /// \param theHighlighted the list of highlighted presentations - virtual void mouseReleased(QMouseEvent* theEvent, Handle_V3d_View theView, - const std::list& theSelected, - const std::list& theHighlighted); -protected: + virtual void mouseReleased(QMouseEvent* theEvent, ModuleBase_IViewer* theViewer, + ModuleBase_ISelection* theSelection); + + protected: /// \brief Virtual method called when operation is started /// Virtual method called when operation started (see start() method for more description) /// Switch off the multi selection state @@ -108,22 +115,24 @@ protected: /// Restore the multi selection state virtual void stopOperation(); -protected: + protected: /// Emits a signal about the selection blocking. Emits a signal to change the selection. /// If the block is true, the signal clear selection, otherwise if restore selection flag allows, /// the internal operation features are to be selected /// \param isBlocked the state whether the operation is blocked or unblocked /// \param isRestoreSelection the state whether the selected objects should be reselected - void blockSelection(bool isBlocked, const bool isRestoreSelection = true); + //void blockSelection(bool isBlocked, const bool isRestoreSelection = true); /// Sends the features void sendFeatures(); private: - FeaturePtr mySketch; ///< the sketch feature - std::list myFeatures; ///< the features to apply the edit operation - Point myCurPoint; ///< the current 3D point clicked or moved - bool myIsBlockedSelection; ///< the state of the last state of selection blocked signal + // the next map should be removed when selection is processed in the move function + std::map > myFeature2Attribute; /// a map of a feature to attributes + + CompositeFeaturePtr mySketch; ///< the sketch feature + Point myCurPoint; ///< the current 3D point clicked or moved + bool myIsBlockedSelection; ///< the state of the last state of selection blocked signal }; #endif