X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Document.h;h=0e1c89a475478947d6ec1e10621fc355704aed18;hb=084eb7ded785430805bdc8dd83491829c6e89aa1;hp=d4c178103ded8fd2da022de13657fda43ede292a;hpb=c5c451ec3d7b112e169d0e82dd5b7e8f8f05e16a;p=modules%2Fshaper.git

diff --git a/src/Model/Model_Document.h b/src/Model/Model_Document.h
index d4c178103..0e1c89a47 100644
--- a/src/Model/Model_Document.h
+++ b/src/Model/Model_Document.h
@@ -149,6 +149,11 @@ class Model_Document : public ModelAPI_Document
   //! \param theAllowFolder take into account grouping feature by folders
   MODEL_EXPORT virtual int size(const std::string& theGroupID, const bool theAllowFolder = false);
 
+  //! Returns the parent object of this child. This may be result or feature, parent of a
+  //! top result. Fast method, that uses internal data structure specifics.
+  MODEL_EXPORT virtual std::shared_ptr<ModelAPI_Object> parent(
+    const std::shared_ptr<ModelAPI_Object> theChild);
+
   //! Returns the feature that is currently edited in this document, normally
   //! this is the latest created feature
   //! \param theVisible use visible features only: flag is true for Object Browser functionality
@@ -223,6 +228,14 @@ class Model_Document : public ModelAPI_Document
   //! \return Empty pointer if there is no applicable folder
   MODEL_EXPORT virtual std::shared_ptr<ModelAPI_Folder> findFolderBelow(
       const std::list<std::shared_ptr<ModelAPI_Feature> >& theFeatures);
+  //! Search a folder containing the given feature.
+  //! Addtionally calculates a zero-based index of the feature in this folder.
+  //! \param theFeature feature to search
+  //! \param theIndexInFolder zero-based index in the folder or -1 if the feature is top-level.
+  //! \return the folder containing the feature or empty pointer if the feature is top-level.
+  MODEL_EXPORT virtual std::shared_ptr<ModelAPI_Folder> findContainingFolder(
+      const std::shared_ptr<ModelAPI_Feature>& theFeature,
+      int& theIndexInFolder);
   //! Add a list of features to the folder. The correctness of the adding is not performed
   //! (such checks have been done in corresponding find.. method).
   //! \return \c true if the movement is successfull
@@ -241,7 +254,10 @@ class Model_Document : public ModelAPI_Document
 
   ///! Returns true if parametric updater need to execute feature on recomputartion
   ///! On abort, undo or redo it is not necessary: results in document are updated automatically
-  bool& executeFeatures() {return myExecuteFeatures;}
+  bool executeFeatures() {return myExecuteFeatures;}
+
+  ///! On abort, undo or redo it is not necessary: results in document are updated automatically
+  void setExecuteFeatures(const bool theFlag);
 
   //! Registers the name of the shape for the topological naming needs
   void addNamingName(const TDF_Label theLabel, std::string theName);
@@ -359,10 +375,20 @@ class Model_Document : public ModelAPI_Document
 
   /// searches in this document feature that contains this label
   FeaturePtr featureByLab(const TDF_Label& theLab);
+  /// searches in this document result that contains this label
+  ResultPtr resultByLab(const TDF_Label& theLab);
 
   /// returns true if theThis is later in the features trre and dependencies than theOther
   bool isLaterByDep(FeaturePtr theThis, FeaturePtr theOther);
 
+  /// appends the latest transaction to the previous one (used for AutoUpdate enabling transaction)
+  void appendTransactionToPrevious();
+
+  /// Sets the automatic recomutation flag: true means enabled
+  void setAutoRecomutationState(const bool theState);
+  /// Returns the current automatic recomutation flag: true means enabled
+  bool autoRecomutationState() const;
+
   friend class Model_Application;
   friend class Model_Session;
   friend class Model_Update;
@@ -372,7 +398,7 @@ class Model_Document : public ModelAPI_Document
   friend class Model_AttributeRefAttrList;
   friend class Model_AttributeSelection;
   friend class Model_ResultPart;
-  friend class Model_ResultCompSolid;
+  friend class Model_ResultBody;
   friend class Model_ResultConstruction;
   friend class Model_SelectionNaming;
   friend class DFBrowser;
@@ -414,6 +440,8 @@ class Model_Document : public ModelAPI_Document
 
   //! The selection feature, if needed
   FeaturePtr mySelectionFeature;
+
+  bool myIsSetCurrentFeature; ///< flag that my current feature is changed right now (recursion)
 };
 
 #endif