X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchSolver%2FSolveSpaceSolver%2FSolveSpaceSolver_Storage.h;h=c80763fb02e9c6b70150e0ee0f7d8971b0c3deb2;hb=334029ee7a94867a1ed39d7ba51b6e49770b6e34;hp=24cb9f323113eaae7a39de3e27f2443ff0452dfb;hpb=a8cfbfb436c27ff96edd5c808e9a452c35cef207;p=modules%2Fshaper.git diff --git a/src/SketchSolver/SolveSpaceSolver/SolveSpaceSolver_Storage.h b/src/SketchSolver/SolveSpaceSolver/SolveSpaceSolver_Storage.h index 24cb9f323..c80763fb0 100644 --- a/src/SketchSolver/SolveSpaceSolver/SolveSpaceSolver_Storage.h +++ b/src/SketchSolver/SolveSpaceSolver/SolveSpaceSolver_Storage.h @@ -1,8 +1,22 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: SolveSpaceSolver_Storage.h -// Created: 18 Mar 2015 -// Author: Artem ZHIDKOV +// Copyright (C) 2014-2017 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 +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// 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 +// +// See http://www.salome-platform.org/ or +// email : webmaster.salome@opencascade.com +// #ifndef SolveSpaceSolver_Storage_H_ #define SolveSpaceSolver_Storage_H_ @@ -19,7 +33,8 @@ typedef std::list< std::set > SameConstraintMa /** \class SolveSpaceSolver_Storage * \ingroup Plugins - * \brief Contains all necessary data in SolveSpace format to solve a single group of constraints + * \brief Contains all necessary data in SolveSpace format to solve a single + * group of constraints */ class SolveSpaceSolver_Storage : public SketchSolver_Storage { @@ -158,7 +173,8 @@ private: /// /// These constraints may be different and become the same after the substitution /// of point coincidence. - void addSameConstraints(ConstraintWrapperPtr theConstraint1, ConstraintWrapperPtr theConstraint2); + void addSameConstraints(ConstraintWrapperPtr theConstraint1, + ConstraintWrapperPtr theConstraint2); /// \brief Search constraint equal to the given in terms of SolveSpace notation bool findSameConstraint(ConstraintWrapperPtr theConstraint); @@ -166,12 +182,21 @@ private: private: Slvs_hEntity myWorkplaneID; ///< identifier of workplane - Slvs_hParam myParamMaxID; ///< current parameter index (may differs with the number of parameters) - std::vector myParameters; ///< list of parameters used in the current group of constraints (sorted by the identifier) + /// current parameter index (may differs with the number of parameters) + Slvs_hParam myParamMaxID; + + /// list of parameters used in the current group of constraints (sorted by the identifier) + std::vector myParameters; Slvs_hEntity myEntityMaxID; ///< current entity index (may differs with the number of entities) - std::vector myEntities; ///< list of entities used in the current group of constraints (sorted by the identifier) - Slvs_hConstraint myConstrMaxID; ///< current constraint index (may differs with the number of constraints) - std::vector myConstraints; ///< list of constraints used in the current group (sorted by the identifier) + + /// list of entities used in the current group of constraints (sorted by the identifier) + std::vector myEntities; + + /// current constraint index (may differs with the number of constraints) + Slvs_hConstraint myConstrMaxID; + + /// list of constraints used in the current group (sorted by the identifier) + std::vector myConstraints; bool myDuplicatedConstraint; ///< shows the storage has same constraint twice