X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelAPI%2FModelAPI_CompositeFeature.h;h=945e88dafe7eb2077fcd9c9f3d44aa82bbf3bc10;hb=ced98007eba772ef7ef3a3e7d98fee8477e8de07;hp=878ca849fb5d0fe0cfe9900eeb17840ccd9b522e;hpb=4b5410d157f6aab17772617fcaa09c5d660d13e9;p=modules%2Fshaper.git

diff --git a/src/ModelAPI/ModelAPI_CompositeFeature.h b/src/ModelAPI/ModelAPI_CompositeFeature.h
index 878ca849f..945e88daf 100644
--- a/src/ModelAPI/ModelAPI_CompositeFeature.h
+++ b/src/ModelAPI/ModelAPI_CompositeFeature.h
@@ -1,38 +1,55 @@
-// File:        ModelAPI_CompositeFeature.hxx
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
+// File:        ModelAPI_CompositeFeature.h
 // Created:     20 Oct 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_CompositeFeature_H_
-#define ModelAPI_CompositeFeature_H_
+#ifndef MODELAPI_COMPOSITEFEATURE_H_
+#define MODELAPI_COMPOSITEFEATURE_H_
 
+#include "ModelAPI.h"
 #include "ModelAPI_Feature.h"
 
 /**\class ModelAPI_CompositeFeature
  * \ingroup DataModel
  * \brief Feature that consists of other features: like sketcher
- * with edges inside. It just allows t oadd a feature to this feature only
+ * with edges inside. It just allows to add a feature to this feature only
  * instead of adding in both document and this feature.
  */
 class ModelAPI_CompositeFeature : public ModelAPI_Feature
 {
 public:
+  MODELAPI_EXPORT virtual ~ModelAPI_CompositeFeature();
+
   /// Adds feature to the sketch and to its document
-  virtual boost::shared_ptr<ModelAPI_Feature> addFeature(std::string theID) = 0;
+  virtual std::shared_ptr<ModelAPI_Feature> addFeature(std::string theID) = 0;
 
   /// Returns the number of sub-elements
-  virtual int numberOfSubs() const = 0;
+  virtual int numberOfSubs(bool forTree = false) const = 0;
 
   /// Returns the sub-feature by zero-base index
-  virtual boost::shared_ptr<ModelAPI_Feature> subFeature(const int theIndex) const = 0;
+  virtual std::shared_ptr<ModelAPI_Feature> subFeature(const int theIndex,
+                                                       bool forTree = false) = 0;
 
   /// Returns the sub-feature unique identifier in this composite feature by zero-base index
   virtual int subFeatureId(const int theIndex) const = 0;
 
-  /// Returns true if feature or reuslt belong to this composite feature as subs
+  /// Returns true if feature or result belong to this composite feature as subs
   virtual bool isSub(ObjectPtr theObject) const = 0;
+
+  /// This method to inform that sub-feature is removed and must be removed from the internal data
+  /// structures of the owner (the remove from the document will be done outside just after)
+  virtual void removeFeature(std::shared_ptr<ModelAPI_Feature> theFeature) = 0;
+
+  /// Exchanges IDs of two given features: needed for more correct naming in some cases (issue 769)
+  MODELAPI_EXPORT virtual void exchangeIDs(std::shared_ptr<ModelAPI_Feature> theFeature1,
+    std::shared_ptr<ModelAPI_Feature> theFeature2);
+
+  /// in addition removes all subs
+  MODELAPI_EXPORT virtual void erase();
 };
 
 //! Pointer on the composite feature object
-typedef boost::shared_ptr<ModelAPI_CompositeFeature> CompositeFeaturePtr;
+typedef std::shared_ptr<ModelAPI_CompositeFeature> CompositeFeaturePtr;
 
 #endif