Merge branch 'master' of newgeom:newgeom.git

[modules/shaper.git] / src / Model / Model_Document.h

diff --git a/src/Model/Model_Document.h b/src/Model/Model_Document.h
index eaedf13db8a4c6b230f8413e3d69d08d60752319..340ecd4ccf9d662be95224b9c883686c01a1ac99 100644 (file)
--- a/src/Model/Model_Document.h
+++ b/src/Model/Model_Document.h
@@ -8,13 +8,20 @@
 #include <Model.h>
 #include <ModelAPI_Document.h>
 #include <ModelAPI_Feature.h>
+#include <ModelAPI_Result.h>
 
 #include <TDocStd_Document.hxx>
+#include <NCollection_DataMap.hxx>
+#include <TDF_Label.hxx>
 #include <map>
 #include <set>
 
 class Handle_Model_Document;
 
+// for TDF_Label map usage
+static  Standard_Integer HashCode(const TDF_Label& theLab,const Standard_Integer theUpper);
+static  Standard_Boolean IsEqual(const TDF_Label& theLab1,const TDF_Label& theLab2);
+
 /**\class Model_Document
  * \ingroup DataModel
  * \brief Document for internal data structure of any object storage.
@@ -64,13 +71,17 @@ public:
   //! \param creates feature and puts it in the document
   MODEL_EXPORT virtual FeaturePtr addFeature(std::string theID);
 
-  //! Removes the feature from the document
+  //! Removes the feature from the document (with result)
   MODEL_EXPORT virtual void removeFeature(FeaturePtr theFeature);
 
   //! Returns the existing feature by the label
   //! \param theLabel base label of the feature
   MODEL_EXPORT virtual FeaturePtr feature(TDF_Label& theLabel);
 
+  //! Returns the existing object: result or feature
+  //! \param theLabel base label of the object
+  MODEL_EXPORT virtual ObjectPtr object(TDF_Label theLabel);
+
   //! Adds a new sub-document by the identifier, or returns existing one if it is already exist
   MODEL_EXPORT virtual boost::shared_ptr<ModelAPI_Document> subDocument(std::string theDocID);
 
@@ -81,28 +92,35 @@ public:
   //! \param theGroupID group that contains a feature
   //! \param theIndex zero-based index of feature in the group
   //! \param isOperation if it is true, returns feature (not Object)
-  MODEL_EXPORT virtual FeaturePtr 
-    feature(const std::string& theGroupID, const int theIndex, const bool isOperation = false);
+  MODEL_EXPORT virtual ObjectPtr object(const std::string& theGroupID, const int theIndex);
 
   //! Returns the number of features in the group
   MODEL_EXPORT virtual int size(const std::string& theGroupID);
 
+  /// Creates a construction cresults
+  MODEL_EXPORT virtual boost::shared_ptr<ModelAPI_ResultConstruction> createConstruction(
+    const boost::shared_ptr<ModelAPI_Data>& theFeatureData, const int theIndex = 0);
+  /// Creates a body results
+  MODEL_EXPORT virtual boost::shared_ptr<ModelAPI_ResultBody> createBody(
+    const boost::shared_ptr<ModelAPI_Data>& theFeatureData, const int theIndex = 0);
+  /// Creates a part results
+  MODEL_EXPORT virtual boost::shared_ptr<ModelAPI_ResultPart> createPart(
+    const boost::shared_ptr<ModelAPI_Data>& theFeatureData, const int theIndex = 0);
+
+  //! Returns a feature by result (owner of result)
+  MODEL_EXPORT virtual boost::shared_ptr<ModelAPI_Feature> 
+    feature(const boost::shared_ptr<ModelAPI_Result>& theResult);
+
+
 protected:
 
-  //! Returns (creates if needed) the group label
-  TDF_Label groupLabel(const std::string theGroup);
+  //! Returns (creates if needed) the features label
+  TDF_Label featuresLabel();
 
   //! Initializes feature with a unique name in this group (unique name is generated as 
   //! feature type + "_" + index
   void setUniqueName(FeaturePtr theFeature);
 
-  //! Adds to the document the new feature
-  void addFeature(const FeaturePtr theFeature);
-
-  //! Returns the object by the feature
-  FeaturePtr objectByFeature(
-    const FeaturePtr theFeature);
-
   //! Synchronizes myFeatures list with the updated document
   void synchronizeFeatures(const bool theMarkUpdated = false);
 
@@ -114,6 +132,14 @@ protected:
   //! performas compactification of all nested operations into one
   void compactNested();
 
+  //! Initializes the data fields of the feature
+  void initData(ObjectPtr theObj, TDF_Label theLab, const int theTag);
+
+  //! Allows to store the result in the data tree of the document (attaches 'data' of result to tree)
+  MODEL_EXPORT virtual void storeResult(boost::shared_ptr<ModelAPI_Data> theFeatureData,
+    boost::shared_ptr<ModelAPI_Result> theResult, const int theResultIndex = 0);
+
+
   friend class Model_Application;
   friend class Model_PluginManager;
   friend class DFBrowser;
@@ -126,7 +152,8 @@ private:
   /// number of nested transactions performed (or -1 if not nested)
   int myNestedNum;
   /// All features managed by this document (not only in history of OB)
-  std::vector<FeaturePtr > myFeatures;
+  /// For optimization mapped by labels
+  NCollection_DataMap<TDF_Label, FeaturePtr> myObjs;
 
   ///< set of identifiers of sub-documents of this document
   std::set<std::string> mySubs;