X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_SketcherMgr.h;h=7e0ce1f273d2c5d05af786b3dee64f45a049aded;hb=1afb1f4e9ab99eb85c18599e9ba6070b62e49e21;hp=aa99353aa9e911718f42fb5c5d5eb16a98969393;hpb=0edd45c3399c408340a033c8521ed2e3440e8375;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_SketcherMgr.h b/src/PartSet/PartSet_SketcherMgr.h index aa99353aa..7e0ce1f27 100644 --- a/src/PartSet/PartSet_SketcherMgr.h +++ b/src/PartSet/PartSet_SketcherMgr.h @@ -35,6 +35,8 @@ class ModuleBase_Operation; class XGUI_OperationMgr; class XGUI_Workshop; +class AIS_InteractiveObject; + class QMouseEvent; /** @@ -89,20 +91,24 @@ public: /// \return the boolean result static bool isSketchOperation(ModuleBase_Operation* theOperation); - /// Returns true if the operation id is in the sketch operation id list + /// Returns true if the operation feature belongs to list of granted features of Sketch + /// operation. An operation of a sketch should be started before. /// \param theOperation an operation /// \return the boolean result - static bool isNestedSketchOperation(ModuleBase_Operation* theOperation); + bool isNestedSketchOperation(ModuleBase_Operation* theOperation) const; - /// Returns true if the operation is a create nested feature one + /// Returns true if the operation is a create and nested sketch operationn /// \param theOperation a checked operation + /// \param theSketch a sketch feature //// \return boolean value - static bool isNestedCreateOperation(ModuleBase_Operation* theOperation); + bool isNestedCreateOperation(ModuleBase_Operation* theOperation, + const CompositeFeaturePtr& /*theSketch*/) const; /// Returns true if the operation is an edit nested feature one /// \param theOperation a checked operation //// \return boolean value - static bool isNestedEditOperation(ModuleBase_Operation* theOperation); + bool isNestedEditOperation(ModuleBase_Operation* theOperation, + const CompositeFeaturePtr& /*theSketch*/) const; /// Returns whether the current operation is a sketch entity - line, point, arc or circle /// \param theId is an id of object @@ -188,7 +194,7 @@ public: /// Check the given objects either there are some results of the current sketch. If so, /// it suggests to delete them as there are no functionality to show back hidden sketch objects /// \param theObjects a list of hidden objects - virtual void processHiddenObject(const std::list& theObjects); + //virtual void processHiddenObject(const std::list& theObjects); /// Returns true if the mouse is over viewer or property panel value is changed /// \return boolean result @@ -198,7 +204,7 @@ public: /// \param theOperation an operation bool canChangeCursor(ModuleBase_Operation* theOperation) const; - /// Returns state of constraints showing flag + /// Returns state of constraints showing flag const QMap& showConstraintStates(); /// Returns true if the object is a current sketch sub feature of a result of the feature @@ -207,7 +213,8 @@ public: bool isObjectOfSketch(const ObjectPtr& theObject) const; /// Saves the current selection in the viewer into an internal container - /// It obtains the selected attributes. The highlighted objects can be processes as the selected ones + /// It obtains the selected attributes. + /// The highlighted objects can be processes as the selected ones /// \param theHighlightedOnly a boolean flag void storeSelection(const bool theHighlightedOnly = false); @@ -228,8 +235,8 @@ public: /// It nullify internal flags concerned to clicked mouse event void clearClickedFlags(); - /// Returns list of strings which contains id's of sketch operations - static const QStringList& sketchOperationIdList(); + /// Returns list of strings which contains id's of sketch replication operations + static const QStringList& replicationsIdList(); /// Returns list of strings which contains id's of constraints operations static const QStringList& constraintsIdList(); @@ -238,6 +245,11 @@ public: /// \param theModes a list of modes static void sketchSelectionModes(QIntList& theModes); + /// Create specific for the module presentation + /// \param theResult an object for presentation + /// \return created presentation or NULL(default value) + virtual Handle(AIS_InteractiveObject) createPresentation(const ResultPtr& theResult); + /// Connects or disconnects to the value changed signal of the property panel widgets /// \param theWidget a property contol widget /// \param isToConnect a boolean value whether connect or disconnect @@ -272,9 +284,10 @@ private slots: /// a nested sketch feature, it hides the feature in the viewer void onLeaveViewPort(); /// Listens to the value changed signal and display the current operation feature - void onBeforeValuesChangedInPropertyPanel(); - /// Listens to the signal about the modification of the values have been done in the property panel - void onAfterValuesChangedInPropertyPanel(); + //void onBeforeValuesChangedInPropertyPanel(); + /// Listens to the signal about the modification of the values + /// have been done in the property panel + //void onAfterValuesChangedInPropertyPanel(); void onMousePressed(ModuleBase_IViewWindow*, QMouseEvent*); void onMouseReleased(ModuleBase_IViewWindow*, QMouseEvent*); @@ -290,35 +303,22 @@ private: /// Launches the operation from current highlighting void launchEditing(); - /// Converts mouse position to 2d coordinates. + /// Converts mouse position to 2d coordinates. /// Member myCurrentSketch has to be correctly defined - void get2dPoint(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent, + void get2dPoint(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent, Point& thePoint); /// Show distance value editor if it is a distance operation and all attribute references /// are filled by preseletion /// \return true if the value is accepted static bool setDistanceValueByPreselection(ModuleBase_Operation* theOperation, - ModuleBase_IWorkshop* theWorkshop); + ModuleBase_IWorkshop* theWorkshop, + bool& theCanCommitOperation); typedef QMap, std::set > > FeatureToSelectionMap; - /// Obtains the current selection of the object in the workshop viewer - /// It includes the selection in all modes of activation, even local context - vertices, edges - /// It gets all results of the feature, find an AIS object in the viewer and takes all BRep - /// selection owners. If the owner is vertex, the corresponded attribute is seached in - /// the feature, if the owner is edge, the current result is added to the container of results. - /// \param theFeature a feature or result object - /// \param theSketch a current sketch feature - /// \param theWorkshop a workshop to have an access to AIS context and displayer - /// \param theSelection a container for the selection, to save results and attributres for a feature - static void getCurrentSelection(const FeaturePtr& theFeature, - const FeaturePtr& theSketch, - ModuleBase_IWorkshop* theWorkshop, - FeatureToSelectionMap& theSelection); - - /// Applyes the current selection to the object in the workshop viewer + /// Applyes the current selection to the object in the workshop viewer /// It includes the selection in all modes of activation, even local context - vertexes, edges /// It gets all results of the feature, find an AIS object in the viewer and takes all BRep /// selection owners. If the owner is vertex, the corresponded attribute is seached in @@ -337,7 +337,7 @@ private: SelectMgr_IndexedMapOfOwner& anOwnersToSelect); /// Returns true if the created feature is visible - /// \param + /// \param bool isVisibleCreatedFeature() const; /// Returns a current operation @@ -349,12 +349,17 @@ private: /// Erase or display the feature of the current operation. If the mouse over the active view or /// a current value is changed by property panel, the feature is displayed otherwise it is hidden - /// \param theOperation an operation which feature is to be displayed, it is nested create operation + /// \param theOperation an operation which feature is to be displayed, + /// it is nested create operation /// \param isToDisplay a flag about the display or erase the feature void visualizeFeature(const FeaturePtr& theFeature, const bool isEditOperation, const bool isToDisplay, const bool isFlushRedisplay = true); private: + /// Updates selection priority of the presentation + /// \param theObject object to find a presentation which will be corrected + /// \param theFeature a feature of the presentation + void updateSelectionPriority(ObjectPtr theObject, FeaturePtr theFeature); /// Returns current workshop XGUI_Workshop* workshop() const; /// Returns operation manager @@ -364,10 +369,12 @@ private: PartSet_Module* myModule; bool myPreviousDrawModeEnabled; // the previous selection enabled state in the viewer + bool myIsEditLaunching; bool myIsDragging; bool myDragDone; bool myIsMouseOverWindow; /// the state that the mouse over the view - bool myIsMouseOverViewProcessed; /// the state whether the over view state is processed by mouseMove method + /// the state whether the over view state is processed by mouseMove method + bool myIsMouseOverViewProcessed; bool myIsPopupMenuActive; /// the state of the popup menu is shown Point myCurrentPoint; //Point myClickedPoint;