X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSketchSolver%2FSketchSolver_ConstraintGroup.h;h=36583e3381362b75fa054cc3983a0e39c33d3678;hb=51889d235a27d0ee4b3c3237d21d1ea621063580;hp=26b577201d40140aa6e68280cff0e162e49c4997;hpb=8dc74f82810d5f597b78633b457efb0ef4f89f9f;p=modules%2Fshaper.git diff --git a/src/SketchSolver/SketchSolver_ConstraintGroup.h b/src/SketchSolver/SketchSolver_ConstraintGroup.h index 26b577201..36583e338 100644 --- a/src/SketchSolver/SketchSolver_ConstraintGroup.h +++ b/src/SketchSolver/SketchSolver_ConstraintGroup.h @@ -1,3 +1,5 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D + // File: SketchSolver_ConstraintGroup.h // Created: 27 May 2014 // Author: Artem ZHIDKOV @@ -10,14 +12,20 @@ #include #include +#include + +#include #include #include #include #include +typedef std::map< std::shared_ptr, std::vector > + ConstraintMap; + /** \class SketchSolver_ConstraintGroup - * \ingroup DataModel + * \ingroup Plugins * \brief Keeps the group of constraints which based on the same entities */ class SketchSolver_ConstraintGroup @@ -27,7 +35,7 @@ class SketchSolver_ConstraintGroup * Throws an exception if theWorkplane is not an object of SketchPlugin_Sketch type * \remark Type of theSketch is not verified inside */ - SketchSolver_ConstraintGroup(boost::shared_ptr theWorkplane); + SketchSolver_ConstraintGroup(std::shared_ptr theWorkplane); ~SketchSolver_ConstraintGroup(); @@ -46,28 +54,34 @@ class SketchSolver_ConstraintGroup /// \brief Check for valid sketch data inline bool isWorkplaneValid() const { - return mySketch->data()->isValid(); + return mySketch->data() && mySketch->data()->isValid(); } /** \brief Adds or updates a constraint in the group * \param[in] theConstraint constraint to be changed * \return \c true if the constraint added or updated successfully */ - bool changeConstraint(boost::shared_ptr theConstraint); + bool changeConstraint(std::shared_ptr theConstraint); + /** \brief Adds or updates a rigid constraint in the group + * \param[in] theConstraint constraint to be changed + * \return \c true if the constraint added or updated successfully + */ + bool changeRigidConstraint(std::shared_ptr theConstraint); - /** \brief Verifies the constraint uses the objects from this group - * \param[in] theConstraint constraint for verification of interaction - * \return \c true if the constrained objects are used in current group + /** \brief Verifies the feature attributes are used in this group + * \param[in] theFeature constraint or any other object for verification of interaction + * \return \c true if some of attributes are used in current group */ - bool isInteract(boost::shared_ptr theConstraint) const; + bool isInteract(std::shared_ptr theFeature) const; /** \brief Verifies the specified feature is equal to the base workplane for this group * \param[in] theWorkplane the feature to be compared with base workplane * \return \c true if workplanes are the same */ - bool isBaseWorkplane(boost::shared_ptr theWorkplane) const; + bool isBaseWorkplane(std::shared_ptr theWorkplane) const; - boost::shared_ptr getWorkplane() const + /// Returns the current workplane + std::shared_ptr getWorkplane() const { return mySketch; } @@ -80,7 +94,7 @@ class SketchSolver_ConstraintGroup /** \brief If the entity is in this group it will updated * \param[in] theEntity attribute, which values should update SolveSpace entity */ - void updateEntityIfPossible(boost::shared_ptr theEntity); + void updateEntityIfPossible(std::shared_ptr theEntity); /** \brief Searches invalid features and constraints in the group and avoids them * \return \c true if the group several constraints were removed @@ -98,16 +112,19 @@ class SketchSolver_ConstraintGroup void splitGroup(std::vector& theCuts); /** \brief Start solution procedure if necessary and update attributes of features + * \return \c false when no need to solve constraints */ - void resolveConstraints(); + bool resolveConstraints(); /** \brief Searches the constraints built on the entity and emit the signal to update them * \param[in] theEntity attribute of the constraint */ - void updateRelatedConstraints(boost::shared_ptr theEntity) const; - void updateRelatedConstraints(boost::shared_ptr theFeature) const; + void updateRelatedConstraints(std::shared_ptr theEntity) const; + /** \brief Searches the constraints built on the entity and emit the signal to update them + * \param[in] theFeature feature of the constraint + */ + void updateRelatedConstraintsFeature(std::shared_ptr theFeature) const; - protected: /** \brief Adds or updates an entity in the group * * The parameters of entity will be parsed and added to the list of SolveSpace parameters. @@ -116,9 +133,10 @@ class SketchSolver_ConstraintGroup * \param[in] theEntity the object of constraint * \return identifier of changed entity or 0 if entity could not be changed */ - Slvs_hEntity changeEntity(boost::shared_ptr theEntity); - Slvs_hEntity changeEntity(FeaturePtr theEntity); + Slvs_hEntity changeEntity(std::shared_ptr theEntity); + Slvs_hEntity changeEntityFeature(std::shared_ptr theEntity); +protected: /** \brief Adds or updates a normal in the group * * Normal is a special entity in SolveSpace, which defines a direction in 3D and @@ -132,9 +150,9 @@ class SketchSolver_ConstraintGroup * \param[in] theNorm attribute for the normal (used to identify newly created entity) * \return identifier of created or updated normal */ - Slvs_hEntity changeNormal(boost::shared_ptr theDirX, - boost::shared_ptr theDirY, - boost::shared_ptr theNorm); + Slvs_hEntity changeNormal(std::shared_ptr theDirX, + std::shared_ptr theDirY, + std::shared_ptr theNorm); /** \brief Adds or updates a parameter in the group * \param[in] theParam the value of parameter @@ -145,34 +163,45 @@ class SketchSolver_ConstraintGroup Slvs_hParam changeParameter(const double& theParam, std::vector::const_iterator& thePrmIter); + /** \brief Removes specified entities and their parameters + * \param[in] theEntities list of IDs of the entities to be removed + */ + void removeEntitiesById(const std::set& theEntities); + /** \brief Removes constraints from the group * \param[in] theConstraint constraint to be removed */ - void removeConstraint(boost::shared_ptr theConstraint); + void removeConstraint(std::shared_ptr theConstraint); /** \brief Change values of attribute by parameters received from SolveSpace solver * \param[in,out] theAttribute pointer to the attribute to be changed * \param[in] theEntityID identifier of SolveSpace entity, which contains updated data * \return \c true if the attribute's value has changed */ - bool updateAttribute(boost::shared_ptr theAttribute, + bool updateAttribute(std::shared_ptr theAttribute, const Slvs_hEntity& theEntityID); /** \brief Adds a constraint for a point which should not be changed during computations - * \param[in] theEntity the base for the constraint + * \param[in] theEntity the base for the constraint + * \param[in] theAllowToFit this flag shows that the entity may be placed into + * the 'dragged' field of SolveSpace solver, so this entity + * may be changed a little during solution */ - void addTemporaryConstraintWhereDragged(boost::shared_ptr theEntity); + void addTemporaryConstraintWhereDragged(std::shared_ptr theEntity, + bool theAllowToFit = true); /** \brief Remove all temporary constraint after computation finished + * \param[in] theRemoved indexes of constraints to be removed. If empty, all temporary constraints should be deleted */ - void removeTemporaryConstraints(); + void removeTemporaryConstraints(const std::set& theRemoved = + std::set()); private: /** \brief Creates a workplane from the sketch parameters * \param[in] theSketch parameters of workplane are the attributes of this sketch * \return \c true if success, \c false if workplane parameters are not consistent */ - bool addWorkplane(boost::shared_ptr theSketch); + bool addWorkplane(std::shared_ptr theSketch); /** \brief Add the entities of constraint for points coincidence into the appropriate list * \param[in] thePoint1 identifier of the first point @@ -195,6 +224,7 @@ class SketchSolver_ConstraintGroup std::vector myParams; ///< List of parameters of the constraints Slvs_hParam myParamMaxID; ///< Actual maximal ID of parameters (not equal to myParams size) std::vector myEntities; ///< List of entities of the constaints + std::vector myEntOfConstr; ///< Flags show that certain entity used in constraints Slvs_hEntity myEntityMaxID; ///< Actual maximal ID of entities (not equal to myEntities size) std::vector myConstraints; ///< List of constraints in SolveSpace format Slvs_hConstraint myConstrMaxID; ///< Actual maximal ID of constraints (not equal to myConstraints size) @@ -207,14 +237,14 @@ class SketchSolver_ConstraintGroup std::list myTempConstraints; ///< The list of identifiers of temporary constraints (SLVS_C_WHERE_DRAGGED) applied for all other points moved by user // SketchPlugin entities - boost::shared_ptr mySketch; ///< Equivalent to workplane - std::map, Slvs_hConstraint> myConstraintMap; ///< The map between SketchPlugin and SolveSpace constraints - std::map, Slvs_hEntity> myEntityAttrMap; ///< The map between "attribute" parameters of constraints and their equivalent SolveSpace entities + std::shared_ptr mySketch; ///< Equivalent to workplane + ConstraintMap myConstraintMap; ///< The map between SketchPlugin and SolveSpace constraints + std::map, Slvs_hEntity> myEntityAttrMap; ///< The map between "attribute" parameters of constraints and their equivalent SolveSpace entities std::map myEntityFeatMap; ///< The map between "feature" parameters of constraints and their equivalent SolveSpace entities // Conincident items std::vector > myCoincidentPoints; ///< Stores the lists of identifiers of coincident points (to avoid unnecessary coincidence constraints) - std::set > myExtraCoincidence; ///< Additional coincidence constraints which are not necessary (coincidence between points already done + std::set > myExtraCoincidence; ///< Additional coincidence constraints which are not necessary (coincidence between points already done ///< by other constraints) but created by GUI tools. Useful when some coincidence constraints were removed };