X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Objects.h;h=0b11f4436c05ddf72e05ab68487086bc7e5177e6;hb=853e0eec6016120b641efa6adf427a239cf203cf;hp=bf9b2baceb0d04f37fdb8aaf5f04411f40bf3130;hpb=96912644cf6607688466ac69f1f098fd2fff37b7;p=modules%2Fshaper.git

diff --git a/src/Model/Model_Objects.h b/src/Model/Model_Objects.h
index bf9b2bace..0b11f4436 100644
--- a/src/Model/Model_Objects.h
+++ b/src/Model/Model_Objects.h
@@ -16,6 +16,7 @@
 #include <TDocStd_Document.hxx>
 #include <NCollection_DataMap.hxx>
 #include <TDF_Label.hxx>
+#include <TDF_LabelList.hxx>
 #include <map>
 #include <set>
 #include <vector>
@@ -51,9 +52,12 @@ class Model_Objects
   //! \param theFeature a removed feature
   void removeFeature(FeaturePtr theFeature);
 
+  //! Moves the feature to make it after the given one in the history.
+  void moveFeature(FeaturePtr theMoved, FeaturePtr theAfterThis);
+
   //! Returns the existing feature by the label
   //! \param theLabel base label of the feature
-  FeaturePtr feature(TDF_Label& theLabel) const;
+  FeaturePtr feature(TDF_Label theLabel) const;
 
   //! Returns the existing object: result or feature
   //! \param theLabel base label of the object
@@ -67,7 +71,7 @@ class Model_Objects
     const std::string& theGroupID, const std::string& theName);
 
   //! Returns the result by the result name
-  ResultPtr Model_Objects::findByName(const std::string theName);
+  ResultPtr findByName(const std::string theName);
 
 
   //! Returns the object index in the group. Object must be visible. Otherwise returns -1.
@@ -83,7 +87,15 @@ class Model_Objects
   //! Returns the number of features in the group
   int size(const std::string& theGroupID);
 
-  /// Creates a construction cresults
+  ///! Returns all (and disabled) results of the given type. Not fast method (iterates all features).
+  void allResults(const std::string& theGroupID, std::list<ResultPtr>& theResults);
+
+  //! Returns the number of all features: in the history or not
+  int numInternalFeatures();
+  //! Returns the feature by zero-based index: features in the history or not
+  std::shared_ptr<ModelAPI_Feature> internalFeature(const int theIndex);
+
+  /// Creates a construction results
   std::shared_ptr<ModelAPI_ResultConstruction> createConstruction(
       const std::shared_ptr<ModelAPI_Data>& theFeatureData, const int theIndex = 0);
   /// Creates a body results
@@ -92,6 +104,10 @@ class Model_Objects
   /// Creates a part results
   std::shared_ptr<ModelAPI_ResultPart> createPart(
       const std::shared_ptr<ModelAPI_Data>& theFeatureData, const int theIndex = 0);
+  /// Copies a part results, keeping the reference to origin
+  std::shared_ptr<ModelAPI_ResultPart> copyPart(
+      const std::shared_ptr<ModelAPI_ResultPart>& theOrigin,
+      const std::shared_ptr<ModelAPI_Data>& theFeatureData, const int theIndex = 0);
   /// Creates a group results
   std::shared_ptr<ModelAPI_ResultGroup> createGroup(
       const std::shared_ptr<ModelAPI_Data>& theFeatureData, const int theIndex = 0);
@@ -104,7 +120,7 @@ class Model_Objects
     feature(const std::shared_ptr<ModelAPI_Result>& theResult);
 
   //! Sets the owner of this manager
-  void setOwner(DocumentPtr theDoc) {myDoc = theDoc;}
+  void setOwner(DocumentPtr theDoc);
 
   //! Returns the owner of this manager
   DocumentPtr owner() {return myDoc;}
@@ -122,10 +138,10 @@ class Model_Objects
   void setUniqueName(FeaturePtr theFeature);
 
   //! Synchronizes myFeatures list with the updated document
-  //! \param theMarkUpdated causes the "update" event for all features
+  //! \param theUpdated list of labels that are marked as modified, so featrues must be also
   //! \param theUpdateReferences causes the update of back-references
   //! \param theFlush makes flush all events in the end of all modifications of this method
-  void synchronizeFeatures(const bool theMarkUpdated, const bool theUpdateReferences,
+  void synchronizeFeatures(const TDF_LabelList& theUpdated, const bool theUpdateReferences,
     const bool theFlush);
   //! Synchronizes the BackReferences list in Data of Features and Results
   void synchronizeBackRefs();
@@ -166,6 +182,17 @@ class Model_Objects
   FeaturePtr firstFeature();
   /// Returns to the last (from the history point of view) feature, any: invisible or disabled
   FeaturePtr lastFeature();
+  /// Returns true if theLater is in history of features creation later than theCurrent
+  bool isLater(FeaturePtr theLater, FeaturePtr theCurrent) const;
+
+  /// Returns the result group identifier of the given feature (for this at least one result must 
+  /// be created before)
+  std::string featureResultGroup(FeaturePtr theFeature);
+
+  ///! Returns all features of the document including the hidden features which are not in
+  ///! history. Not very fast method, for calling once, not in big cycles.
+  std::list<std::shared_ptr<ModelAPI_Feature> > allFeatures();
+
 
  private:
   TDF_Label myMain; ///< main label of the data storage