X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Data.h;h=f31891b8bab0e378ddcd34157cd330e2be911e18;hb=bdbfb368d71ed11cc0391354a7d86c880cd94949;hp=c8a5a03d8d043b7a5ab392199010761bdeda676a;hpb=02fc4b8cac85322c7bb8c5a00f7fafa3665a0fc6;p=modules%2Fshaper.git

diff --git a/src/Model/Model_Data.h b/src/Model/Model_Data.h
index c8a5a03d8..f31891b8b 100644
--- a/src/Model/Model_Data.h
+++ b/src/Model/Model_Data.h
@@ -18,6 +18,7 @@
 #include <ModelAPI_AttributeRefList.h>
 #include <ModelAPI_AttributeRefAttrList.h>
 #include <ModelAPI_AttributeString.h>
+#include <ModelAPI_AttributeStringArray.h>
 #include <ModelAPI_AttributeIntArray.h>
 #include <ModelAPI_Data.h>
 #include <ModelAPI_Feature.h>
@@ -74,6 +75,9 @@ class Model_Data : public ModelAPI_Data
   friend class Model_AttributeRefAttrList;
   friend class Model_AttributeSelection;
   friend class Model_AttributeSelectionList;
+  friend class Model_ValidatorsFactory;
+  friend class Model_SelectionNaming;
+  friend class Model_ResultConstruction;
 
  public:
   /// The simplest constructor. "setLabel" must be called just after to initialize correctly.
@@ -87,7 +91,8 @@ class Model_Data : public ModelAPI_Data
   /// Returns the attribute that contains real value with double precision
   MODEL_EXPORT virtual std::shared_ptr<ModelAPI_AttributeDouble> real(const std::string& theID);
   /// Returns the attribute that contains double values array
-  MODEL_EXPORT virtual std::shared_ptr<ModelAPI_AttributeDoubleArray> realArray(const std::string& theID);
+  MODEL_EXPORT virtual
+    std::shared_ptr<ModelAPI_AttributeDoubleArray> realArray(const std::string& theID);
   /// Returns the attribute that contains integer value
   MODEL_EXPORT virtual std::shared_ptr<ModelAPI_AttributeInteger>
     integer(const std::string& theID);
@@ -98,7 +103,7 @@ class Model_Data : public ModelAPI_Data
   MODEL_EXPORT virtual std::shared_ptr<ModelAPI_AttributeSelection>
     selection(const std::string& theID);
   /// Returns the attribute that contains selection to a shape
-  MODEL_EXPORT virtual std::shared_ptr<ModelAPI_AttributeSelectionList> 
+  MODEL_EXPORT virtual std::shared_ptr<ModelAPI_AttributeSelectionList>
     selectionList(const std::string& theID);
   /// Returns the attribute that contains reference to an attribute of a feature
   MODEL_EXPORT virtual std::shared_ptr<ModelAPI_AttributeRefAttr>
@@ -119,6 +124,12 @@ class Model_Data : public ModelAPI_Data
   /// Returns the attribute that contains integer values array
   MODEL_EXPORT virtual std::shared_ptr<ModelAPI_AttributeIntArray>
     intArray(const std::string& theID);
+  /// Returns the attribute that contains string values array
+  MODEL_EXPORT virtual std::shared_ptr<ModelAPI_AttributeStringArray>
+    stringArray(const std::string& theID);
+  /// Returns the attribute that contains string values array
+  MODEL_EXPORT virtual std::shared_ptr<ModelAPI_AttributeTables>
+    tables(const std::string& theID);
 
   /// Returns the generic attribute by identifier
   /// \param theID identifier of the attribute
@@ -150,7 +161,7 @@ class Model_Data : public ModelAPI_Data
   /// \param theID identifier of the attribute that can be referenced by this ID later
   /// \param theAttrType type of the created attribute (received from the type method)
   /// \returns the just created attribute
-  MODEL_EXPORT virtual AttributePtr 
+  MODEL_EXPORT virtual AttributePtr
     addAttribute(const std::string& theID, const std::string theAttrType);
 
   /// Useful method for "set" methods of the attributes: sends an UPDATE event and
@@ -158,9 +169,11 @@ class Model_Data : public ModelAPI_Data
   MODEL_EXPORT virtual void sendAttributeUpdated(ModelAPI_Attribute* theAttr);
   /// Blocks sending "attribute updated" if theBlock is true
   /// \param theBlock allows switching on/off the blocking state
-  /// \param theSendMessage if false, it does not send the update message even if something is changed
+  /// \param theSendMessage if false, it does not send the update message
+  ///            even if something is changed
   ///            (normally is it used in attributeChanged because this message will be sent anyway)
-  MODEL_EXPORT virtual void blockSendAttributeUpdated(
+  /// \returns the previous state of block
+  MODEL_EXPORT virtual bool blockSendAttributeUpdated(
     const bool theBlock, const bool theSendMessage = true);
 
   /// Puts feature to the document data sub-structure
@@ -197,7 +210,8 @@ class Model_Data : public ModelAPI_Data
   MODEL_EXPORT virtual const std::set<AttributePtr>& refsToMe() {return myRefsToMe;}
 
   /// returns all references by attributes of this data
-  /// \param theRefs returned list of pairs: id of referenced attribute and list of referenced objects
+  /// \param theRefs returned list of pairs:
+  ///                id of referenced attribute and list of referenced objects
   MODEL_EXPORT virtual void referencesToObjects(
     std::list<std::pair<std::string, std::list<ObjectPtr> > >& theRefs);
 
@@ -248,7 +262,7 @@ private:
   /// \param theFeature feature referenced to this
   /// \param theAttrID identifier of the attribute that is references from theFeature to this
   /// \param theApplyConcealment applies consealment flag changes
-  void addBackReference(FeaturePtr theFeature, std::string theAttrID, 
+  void addBackReference(FeaturePtr theFeature, std::string theAttrID,
     const bool theApplyConcealment = true);
 
   /// Makes the concealment flag up to date for this object-owner.