X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchSolver%2FSketchSolver_Manager.h;h=fc1b4222956f80db2f05942fc36b34cc9afa9530;hb=5136b236aed3f5e7422eb60ecf10cf52c32e5b4d;hp=42ec9df676b4c8a07b80ae83f1566571a739430b;hpb=37e97ce820e95060b6a448b1fcc29df3ebccea87;p=modules%2Fshaper.git diff --git a/src/SketchSolver/SketchSolver_Manager.h b/src/SketchSolver/SketchSolver_Manager.h index 42ec9df67..fc1b42229 100644 --- a/src/SketchSolver/SketchSolver_Manager.h +++ b/src/SketchSolver/SketchSolver_Manager.h @@ -7,9 +7,7 @@ #ifndef SketchSolver_Manager_H_ #define SketchSolver_Manager_H_ -#include "SketchSolver.h" #include -#include #include #include @@ -20,11 +18,7 @@ /** \class SketchSolver_Manager * \ingroup Plugins * \brief Listens the changes of SketchPlugin features and transforms the Constraint - * feature into the format understandable by SolveSpace library. - * - * Constraints created for SolveSpace library are divided into the groups. - * The division order based on connectedness of the features by the constraints. - * The groups may be fused or separated according to the new constraints. + * feature into the format understandable by sketch solver. * * \remark This is a singleton. */ @@ -34,18 +28,18 @@ public: /** \brief Main method to create constraint manager * \return pointer to the singleton */ - SKETCHSOLVER_EXPORT static SketchSolver_Manager* instance(); + static SketchSolver_Manager* instance(); /** \brief Implementation of Event Listener method * \param[in] theMessage the data of the event */ virtual void processEvent(const std::shared_ptr& theMessage); - /// \brief Initialize builder for solver's data structure entities - /// \param theBuilder [in] solver's specific builder - SKETCHSOLVER_EXPORT void setBuilder(BuilderPtr theBuilder); - /// \brief Returns the builder specific for the solver - BuilderPtr builder(); + /** + * The solver needs all the updated objects are transfered in one group, not one by one. + * This iscreases performance and avoids problems in resolve of only part of the made updates. + */ + virtual bool groupMessages(); protected: SketchSolver_Manager(); @@ -53,9 +47,10 @@ protected: /** \brief Adds or updates a constraint or an entity in the suitable group * \param[in] theFeature sketch feature to be changed + * \param[in] theMoved \c true if the feature has been moved in the viewer * \return \c true if the feature changed successfully */ - bool changeFeature(std::shared_ptr theFeature); + bool updateFeature(std::shared_ptr theFeature, bool theMoved = false); /** \brief Removes a constraint from the manager * \param[in] theConstraint constraint to be removed @@ -63,45 +58,18 @@ protected: */ bool removeConstraint(std::shared_ptr theConstraint); - /** \brief Adds or updates a workplane in the manager - * \param[in] theSketch the feature to create or update workplane - * \return \c true if the workplane changed successfully - * \remark Type of theSketch is not verified inside - */ - bool changeWorkplane(CompositeFeaturePtr theSketch); - - /** \brief Removes a workplane from the manager. - * All groups based on such workplane will be removed too. - * \param[in] theSketch the feature to be removed - * \return \c true if the workplane removed successfully - */ - bool removeWorkplane(std::shared_ptr theSketch); - - /** \brief Updates entity which is moved in GUI - * \param[in] theFeature entity to be updated - */ - void moveEntity(std::shared_ptr theFeature); - /** \brief Goes through the list of groups and solve the constraints - * \param[in] theGroups list of groups to be resolved (if empty list, all groups are resolved) - * \return \c true, if groups are resolved, and features should be updated (send the Update event) + * \return \c true, if groups are resolved, and features should be updated + * (send the Update event) */ - bool resolveConstraints(const std::list& theGroups = std::list()); + bool resolveConstraints(); private: - /** \brief Searches list of groups which interact with specified feature + /** \brief Searches group which interact with specified feature * \param[in] theFeature object to be found - * \param[out] theGroups list of group indexes interacted with the feature - */ - void findGroups(std::shared_ptr theFeature, - std::set& theGroupIDs) const; - - /** \brief Searches in the list of groups the workplane which contains specified feature - * \param[in] theFeature object to be found - * \return workplane containing the feature + * \return Pointer to corresponding group or NULL if the group cannot be created. */ - std::shared_ptr findWorkplane( - std::shared_ptr theFeature) const; + SketchGroupPtr findGroup(std::shared_ptr theFeature); /// \brief Stop sending the Update event until all features updated /// \return \c true, if the last flushed event is Update @@ -109,14 +77,11 @@ private: /// \brief Allow to send the Update event void allowSendUpdate() const; - /// \brief If the message shows that any group is repaired after conflicting, - /// find other groups on the same sketch, which have conflicts. - void checkConflictingConstraints(const std::shared_ptr& theMessage); + /// \brief Allow send events about changing features in groups + void releaseFeaturesIfEventsBlocked() const; private: - static SketchSolver_Manager* mySelf; ///< Self pointer to implement singleton functionality - std::list myGroups; ///< Groups of constraints - BuilderPtr myBuilder; ///< Builder for solver's entities + std::list myGroups; ///< Groups of constraints /// true if computation is performed and all "updates" are generated by this algo /// and needs no recomputation bool myIsComputed;