Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

[modules/shaper.git] / src / ModelAPI / ModelAPI_Data.h

diff --git a/src/ModelAPI/ModelAPI_Data.h b/src/ModelAPI/ModelAPI_Data.h
index 2d6baddb0d7c5b4f7bf59ed71a5647e22e6f5a40..a03a06c9bf9ff40a2c7c80cf4875558780ef2653 100644 (file)
--- a/src/ModelAPI/ModelAPI_Data.h
+++ b/src/ModelAPI/ModelAPI_Data.h
@@ -13,6 +13,7 @@
 #include <set>
 #include <memory>
 
+class ModelAPI_Attribute;
 class ModelAPI_AttributeDocRef;
 class ModelAPI_AttributeInteger;
 class ModelAPI_AttributeDouble;
@@ -101,7 +102,9 @@ class MODELAPI_EXPORT ModelAPI_Data
   /// for each attribute of the object
   /// \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)
-  virtual void addAttribute(const std::string& theID, const std::string theAttrType) = 0;
+  /// \returns the just created attribute
+  virtual std::shared_ptr<ModelAPI_Attribute>
+    addAttribute(const std::string& theID, const std::string theAttrType) = 0;
 
   /// Useful method for "set" methods of the attributes: sends an UPDATE event and
   /// makes attribute initialized
@@ -122,7 +125,10 @@ class MODELAPI_EXPORT ModelAPI_Data
   virtual ModelAPI_ExecState execState() = 0;
 
   /// Registers error during the execution, causes the ExecutionFailed state
-  virtual void setError(const std::string& theError) = 0;
+  virtual void setError(const std::string& theError, bool theSend = true) = 0;
+
+  /// Returns error, arose during the execution
+  virtual std::string error() const = 0;
 
   /// Returns the identifier of feature-owner, unique in this document
   virtual int featureId() const = 0;
@@ -133,7 +139,11 @@ class MODELAPI_EXPORT ModelAPI_Data
   /// returns all references by attributes of this data
   /// \param theRefs returned list of pairs: id of referenced attribute and list of referenced objects
   virtual void referencesToObjects(
-    std::list<std::pair<std::string, std::list<std::shared_ptr<ModelAPI_Object> > > >& theRefs) = 0;
+    std::list<std::pair<std::string, std::list<std::shared_ptr<ModelAPI_Object> > > >& theRefs) =0;
+
+  /// Copies all atributes content into theTarget data
+  virtual void copyTo(std::shared_ptr<ModelAPI_Data> theTarget) = 0;
+
  protected:
   /// Objects are created for features automatically
   ModelAPI_Data();