X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FModel%2FModel_ResultBody.h;h=02f55cbdc99b08bee68a3e3f65139c64af2a377e;hb=5c59bf6725e7e4855b5ca956475d705e2d5b014c;hp=f8c83a3f87ca8333e8c252c59a37cb735326ccf1;hpb=b6be33d3af5a10e204e3bd69708d49b8b9f1a127;p=modules%2Fshaper.git diff --git a/src/Model/Model_ResultBody.h b/src/Model/Model_ResultBody.h index f8c83a3f8..02f55cbdc 100644 --- a/src/Model/Model_ResultBody.h +++ b/src/Model/Model_ResultBody.h @@ -1,8 +1,22 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: Model_ResultBody.h -// Created: 08 Jul 2014 -// Author: Mikhail PONIKAROV +// 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 Model_ResultBody_H_ #define Model_ResultBody_H_ @@ -25,13 +39,15 @@ */ class Model_ResultBody : public ModelAPI_ResultBody { - /// builders that tores the naming history: one per label to allow store several shapes to one + /// builders that tores the naming history: one per label to allow store several shapes to one /// label; index in vector corresponds to the label tag //std::vector myBuilders; -public: - /// Request for initialization of data model of the result: adding all attributes - virtual void initAttributes(); + /// Flag that stores the previous state of "concealed": if it is changed, + /// The event is used to redisplay the body. + bool myWasConcealed; + +public: /// Returns the parameters of color definition in the resources config manager MODEL_EXPORT virtual void colorConfigInfo(std::string& theSection, std::string& theName, std::string& theDefault); @@ -40,99 +56,22 @@ public: /// naming data structure if theFlag if false. Or restores everything on theFlag is true. MODEL_EXPORT virtual bool setDisabled(std::shared_ptr theThis, const bool theFlag); - /* - /// Stores the shape (called by the execution method). - MODEL_EXPORT virtual void store(const std::shared_ptr& theShape); - - /// Stores the generated shape (called by the execution method). - MODEL_EXPORT virtual void storeGenerated(const std::shared_ptr& theFromShape, - const std::shared_ptr& theToShape); - - /// Stores the modified shape (called by the execution method). - /// \param theOldShape shape that produces result - /// \param theNewShape resulting shape - /// \param theDecomposeSolidsTag tag for starting of solids sub-elements placement in case - /// theNewShape is compound of solids, if zero it is not used - MODEL_EXPORT virtual void storeModified(const std::shared_ptr& theOldShape, - const std::shared_ptr& theNewShape, - const int theDecomposeSolidsTag = 0); - */ - /// Returns the shape-result produced by this feature - MODEL_EXPORT virtual std::shared_ptr shape(); - /* - /// Records the subshape newShape which was generated during a topological construction. - /// As an example, consider the case of a face generated in construction of a box. - MODEL_EXPORT virtual void generated(const std::shared_ptr& theNewShape, - const std::string& theName, const int theTag = 1); - /// Records the shape newShape which was generated from the shape oldShape during a topological - /// construction. As an example, consider the case of a face generated from an edge in - /// construction of a prism. - MODEL_EXPORT virtual void generated(const std::shared_ptr& theOldShape, - const std::shared_ptr& theNewShape, const std::string& theName, const int theTag = 1); + /// The compsolid is concealed if at least one of the sub is concealed, + /// so, sub is Concealed if at least one sub is concealed + MODEL_EXPORT virtual bool isConcealed(); + /// Returns true if the latest modification of this body in the naming history + // is equal to the given shape + MODEL_EXPORT virtual bool isLatestEqual(const std::shared_ptr& theShape); - /// Records the shape newShape which is a modification of the shape oldShape. - /// As an example, consider the case of a face split or merged in a Boolean operation. - MODEL_EXPORT virtual void modified(const std::shared_ptr& theOldShape, - const std::shared_ptr& theNewShape, const std::string& theName, const int theTag = 1); - - /// Records the shape oldShape which was deleted from the current label. - /// As an example, consider the case of a face removed by a Boolean operation. - MODEL_EXPORT virtual void deleted(const std::shared_ptr& theOldShape, - const int theTag = 1); - - /// load deleted shapes - MODEL_EXPORT virtual void loadDeletedShapes (GeomAlgoAPI_MakeShape* theMS, - std::shared_ptr theShapeIn, - const int theKindOfShape, - const int theTag); - /// load and orient modified shapes - MODEL_EXPORT virtual void loadAndOrientModifiedShapes ( - GeomAlgoAPI_MakeShape* theMS, - std::shared_ptr theShapeIn, - const int theKindOfShape, - const int theTag, - const std::string& theName, - GeomAPI_DataMapOfShapeShape& theSubShapes); - /// load and orient generated shapes - MODEL_EXPORT virtual void loadAndOrientGeneratedShapes ( - GeomAlgoAPI_MakeShape* theMS, - std::shared_ptr theShapeIn, - const int theKindOfShape, - const int theTag, - const std::string& theName, - GeomAPI_DataMapOfShapeShape& theSubShapes); - - /// Loads shapes of the first level (to be used during shape import) - MODEL_EXPORT virtual void loadFirstLevel(std::shared_ptr theShape, const std::string& theName, int& theTag); - - /// Loads disconnected edges - MODEL_EXPORT virtual void loadDisconnectedEdges(std::shared_ptr theShape, const std::string& theName, int& theTag); - - /// Loads disconnected vetexes - MODEL_EXPORT virtual void loadDisconnectedVertexes(std::shared_ptr theShape, const std::string& theName, int& theTag); -*/ /// Removes the stored builders MODEL_EXPORT virtual ~Model_ResultBody() {}; protected: /// Makes a body on the given feature Model_ResultBody(); -/* - /// Removes the stored builders - void clean(); - - /// Returns (creates if necessary) the builder created on the needed tag of sub-label - TNaming_Builder* builder(const int theTag); - -private: - /// Loads shapes of the next level (to be used during shape import) - void loadNextLevels(std::shared_ptr theShape, const std::string& theName, int& theTag); - /// builds name for the shape kept at the specified tag - void buildName(const int theTag, const std::string& theName); - */ friend class Model_Objects; };