X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Data.h;h=8d12bc4d32a53f8ec81dec7a9b5d98aaec7262f2;hb=cb2bfff600626039e210f08de27b5229541d367a;hp=f31891b8bab0e378ddcd34157cd330e2be911e18;hpb=9d0074305685b0a8b14a446ab7405308fc82006b;p=modules%2Fshaper.git diff --git a/src/Model/Model_Data.h b/src/Model/Model_Data.h index f31891b8b..8d12bc4d3 100644 --- a/src/Model/Model_Data.h +++ b/src/Model/Model_Data.h @@ -1,8 +1,22 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: Model_Data.hxx -// Created: 21 Mar 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_Data_H_ #define Model_Data_H_ @@ -22,6 +36,7 @@ #include #include #include +#include #include #include @@ -44,9 +59,12 @@ class ModelAPI_Attribute; class Model_Data : public ModelAPI_Data { + typedef std::map, int> > AttributeMap; + TDF_Label myLab; ///< label of the feature in the document /// All attributes of the object identified by the attribute ID - std::map > myAttrs; + /// (the attribute is stored together with its index in the feature) + AttributeMap myAttrs; /// Array of flags of this data Handle(TDataStd_BooleanArray) myFlags; @@ -86,6 +104,8 @@ class Model_Data : public ModelAPI_Data MODEL_EXPORT virtual std::string name(); /// Defines the name of the feature visible by the user in the object browser MODEL_EXPORT virtual void setName(const std::string& theName); + /// Return \c true if the object has been renamed by the user + MODEL_EXPORT virtual bool hasUserDefinedName() const; /// Returns the attribute that references to another document MODEL_EXPORT virtual std::shared_ptr document(const std::string& theID); /// Returns the attribute that contains real value with double precision @@ -254,7 +274,7 @@ private: /// Removes a back reference (with identifier which attribute references to this object) /// \param theFeature feature referenced to this /// \param theAttrID identifier of the attribute that is references from theFeature to this - void removeBackReference(FeaturePtr theFeature, std::string theAttrID); + void removeBackReference(ObjectPtr theObject, std::string theAttrID); /// Removes a back reference (by the attribute) /// \param theAttr the referenced attribute void removeBackReference(AttributePtr theAttr); @@ -264,6 +284,10 @@ private: /// \param theApplyConcealment applies consealment flag changes void addBackReference(FeaturePtr theFeature, std::string theAttrID, const bool theApplyConcealment = true); + /// Adds a back reference to an object + /// \param theObject object referenced to this + /// \param theAttrID identifier of the attribute that is references from theFolder to this + void addBackReference(ObjectPtr theObject, std::string theAttrID); /// Makes the concealment flag up to date for this object-owner. MODEL_EXPORT virtual void updateConcealmentFlag(); @@ -276,17 +300,25 @@ private: /// Sets the displayed/hidden state of the object. If it is changed, sends the "redisplay" /// signal. MODEL_EXPORT virtual void setDisplayed(const bool theDisplay); + + /// Returns \c true if theAttribute1 is going earlier than theAttribute2 in the data + MODEL_EXPORT virtual bool isPrecedingAttribute(const std::string& theAttribute1, + const std::string& theAttribute2) const; }; /// Generic method to register back reference, used in referencing attributes. /// Without concealment change, it will be done later, on synchronization. #define ADD_BACK_REF(TARGET) \ if (TARGET.get() != NULL) { \ + std::shared_ptr aTargetData = \ + std::dynamic_pointer_cast((TARGET)->data()); \ FeaturePtr anAttributeOwnerFeature = std::dynamic_pointer_cast(owner()); \ - if (anAttributeOwnerFeature.get()) { \ - std::shared_ptr aTargetData = std::dynamic_pointer_cast( \ - (TARGET)->data()); \ + if (anAttributeOwnerFeature.get()) \ aTargetData->addBackReference(anAttributeOwnerFeature, id(), false); \ + else { \ + FolderPtr anAttributeOwnerFolder = std::dynamic_pointer_cast(owner()); \ + if (anAttributeOwnerFolder.get()) \ + aTargetData->addBackReference(ObjectPtr(anAttributeOwnerFolder), id()); \ } \ } @@ -294,11 +326,15 @@ private: /// Without concealment change, it will be done later, on synchronization. #define REMOVE_BACK_REF(TARGET) \ if (TARGET.get() != NULL) { \ + std::shared_ptr aTargetData = \ + std::dynamic_pointer_cast((TARGET)->data()); \ FeaturePtr anAttOwnerFeature = std::dynamic_pointer_cast(owner()); \ - if (anAttOwnerFeature.get()) { \ - std::shared_ptr aTargetData = std::dynamic_pointer_cast( \ - (TARGET)->data()); \ + if (anAttOwnerFeature.get()) \ aTargetData->removeBackReference(anAttOwnerFeature, id()); \ + else { \ + FolderPtr anAttributeOwnerFolder = std::dynamic_pointer_cast(owner()); \ + if (anAttributeOwnerFolder.get()) \ + aTargetData->removeBackReference(ObjectPtr(anAttributeOwnerFolder), id()); \ } \ }