X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_SketcherMgr.h;h=cd8e3380f64e76eec5fc23539b16a46824dafc61;hb=ccebb4b23e0354829c9636110b903c59923d8e30;hp=07e44783a2985a8ef50189a2aa29f5cab54ecb18;hpb=b394e9c094d25b01f1d7b9b59b218807c5be087b;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_SketcherMgr.h b/src/PartSet/PartSet_SketcherMgr.h index 07e44783a..cd8e3380f 100644 --- a/src/PartSet/PartSet_SketcherMgr.h +++ b/src/PartSet/PartSet_SketcherMgr.h @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// Copyright (C) 2014-2019 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -12,10 +12,9 @@ // // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or -// email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef PartSet_SketcherMgr_H @@ -23,30 +22,42 @@ #include "PartSet.h" -#include "PartSet_Filters.h" -#include "PartSet_Tools.h" #include "PartSet_PreviewSketchPlane.h" +#include "PartSet_Tools.h" #include #include #include #include +#include +#include -#include #include #include #include +#include + +#ifdef HAVE_SALOME + #include +#else + #include +#endif + #include #include #include #include +#include #include #include #include +#include + +#include class PartSet_Module; class ModuleBase_IViewWindow; @@ -54,11 +65,33 @@ class ModuleBase_ModelWidget; class ModuleBase_Operation; class XGUI_OperationMgr; class XGUI_Workshop; +class XGUI_Displayer; class PartSet_ExternalPointsMgr; class AIS_InteractiveObject; class QMouseEvent; +class PartSet_SketcherMgr; + +#ifdef HAVE_SALOME +class PartSet_Fitter : public OCCViewer_Fitter +#else +class PartSet_Fitter : public AppElements_Fitter +#endif +{ +public: + PartSet_Fitter(PartSet_SketcherMgr* theSketchMgr): + mySketchMgr(theSketchMgr) {} + + /// A method which has top be reimplemented to provide alterantive implementation FitAll command + /// \param theView - a view which has to be fit + virtual void fitAll(Handle(V3d_View) theView); + +private: + PartSet_SketcherMgr* mySketchMgr; +}; + + /** * \ingroup Modules @@ -67,7 +100,7 @@ class QMouseEvent; displayed in the viewer. After the sketch create/edit operation is finished, the sub-feature are hidden, the sketch feature result is displayed */ -class PARTSET_EXPORT PartSet_SketcherMgr : public QObject +class PARTSET_EXPORT PartSet_SketcherMgr : public QObject, public Events_Listener { Q_OBJECT /// Struct to define gp point, with the state is the point is initialized @@ -105,7 +138,8 @@ public: /// Struct to define selection model information to store/restore selection struct SelectionInfo { - std::set myAttributes; /// the selected attributes + /// the selected attributes and indices of points if array + std::map myAttributes; std::set myResults; /// the selected results TopoDS_Shape myFirstResultShape; /// the first shape of feature result TopTools_MapOfShape myLocalSelectedShapes; /// shapes of local selection @@ -197,9 +231,16 @@ public: /// \param theOperation a committed operation void commitNestedSketch(ModuleBase_Operation* theOperation); - /// Appends into container of workshop selection filters - /// \param [out] selection filters - virtual void selectionFilters(SelectMgr_ListOfFilter& theSelectionFilters) const; + /// Returns true if the filter is created by the sketch manager + /// \param theFilterType a checked type + /// \return boolean value + bool sketchSelectionFilter(const ModuleBase_SelectionFilterType theFilterType); + + /// Append selection filter into the module and type of the filter in internal container + /// \param theFilterType selection filter type + /// \param theFilter added filter + void registerSelectionFilter(const ModuleBase_SelectionFilterType theFilterType, + const Handle(SelectMgr_Filter)& theFilter); /// Commit the operation if it is possible. If the operation is dimention constraint, /// it gives widget editor to input dimention value @@ -306,7 +347,7 @@ public: /// 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); + Handle(AIS_InteractiveObject) createPresentation(const ObjectPtr& theResult); /// Connects or disconnects to the value changed signal of the property panel widgets /// \param theWidget a property contol widget @@ -320,7 +361,9 @@ public: /// If the current operation is a dimention one, the style of dimension visualization is send for /// the current object /// \param theObject an object to be customized - void customizePresentation(const ObjectPtr& theObject); + //void customisePresentation(const ObjectPtr& theObject); + + void customizeSketchPresentation(const ObjectPtr& theObject, const AISObjectPtr& thePrs) const; /// Update sketch presentations according to the the state /// \param theType a type of sketch visualization style @@ -328,10 +371,29 @@ public: void updateBySketchParameters(const PartSet_Tools::ConstraintVisibleState& theType, bool theState); + bool isShowFreePointsShown() const { + return myPointsHighlight.size() > 0; + } + + PartSet_Module* module() const { return myModule; } + + /** \brief Implementation of Event Listener method + * \param[in] theMessage the data of the event + */ + virtual void processEvent(const std::shared_ptr& theMessage); + + /// Returns true if current mode of objects creation is by drag mouse + bool isDragModeCreation() const; + + public slots: /// Process sketch plane selected event void onPlaneSelected(const std::shared_ptr& thePln); + /// The slot is called when user checks "Show free points" button + /// \param toShow a state of the check box + void onShowPoints(bool toShow); + private slots: /// Toggle show constraints void onShowConstraintsToggle(int theType, bool theState); @@ -420,6 +482,9 @@ private: /// Returns operation manager XGUI_OperationMgr* operationMgr() const; + std::vector colorOfObject(const ObjectPtr& theObject, + const FeaturePtr& aFeature, bool isConstruction) const; + private: PartSet_Module* myModule; PartSet_PreviewSketchPlane* mySketchPlane; // display/erase sketch plane on start/stop sketch @@ -437,14 +502,20 @@ private: CompositeFeaturePtr myCurrentSketch; - Handle(PartSet_CirclePointFilter) myCirclePointFilter; - Handle(ModuleBase_ShapeInPlaneFilter) myPlaneFilter; + std::set mySelectionFilterTypes; + FeatureToSelectionMap myCurrentSelection; bool myPreviousUpdateViewerEnabled; QMap myIsConstraintsShown; PartSet_ExternalPointsMgr* myExternalPointsMgr; + + QMap myPointsHighlight; + + bool myNoDragMoving; + + QPoint myMousePoint; };