Fix for random order of faces in selection name (groups on extrusion after aborting).

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

diff --git a/src/Model/Model_AttributeSelection.h b/src/Model/Model_AttributeSelection.h
index 801a69e513903287d703c09465b5a884078da591..8708c136dc932defde1ecfba2c0761475841ee7f 100644 (file)
--- a/src/Model/Model_AttributeSelection.h
+++ b/src/Model/Model_AttributeSelection.h
@@ -10,6 +10,7 @@
 #include "Model.h"
 #include "Model_AttributeReference.h"
 #include <ModelAPI_AttributeSelection.h>
+#include <TDF_LabelMap.hxx>
 
 /**\class Model_AttributeSelection
  * \ingroup DataModel
@@ -19,6 +20,7 @@
 class Model_AttributeSelection : public ModelAPI_AttributeSelection
 {
   Model_AttributeReference myRef;  ///< The reference functionality reusage
+  TDF_LabelMap myScope; ///< the map of valid labels for naming selection solving
 public:
   /// Defines the result and its selected sub-shape
   MODEL_EXPORT virtual void setValue(
@@ -37,6 +39,18 @@ public:
   /// \returns false if update is failed
   MODEL_EXPORT virtual bool update();
 
+  /// Returns a textual string of the selection
+  MODEL_EXPORT virtual std::string namingName();
+  
+  /// Returns an Id of the selection
+  /// NOTE: This method has been added for temporary export of groups towards old GEOM
+  /// It should then be removed when a direct use of objects from NewGeom
+  /// will be possible from SMESH module of SALOME.
+  MODEL_EXPORT virtual int Id();
+
+  /// Selects (i.e. creates Naming data structure) of sub-shape specifed by textual name
+  MODEL_EXPORT virtual void selectSubShape(const std::string& theType, const std::string& theSubShapeName);
+
 protected:
   /// Objects are created for features automatically
   MODEL_EXPORT Model_AttributeSelection(TDF_Label& theLabel);
@@ -45,6 +59,7 @@ protected:
   /// Performs the selection for the body result (TNaming selection)
   virtual void selectBody(
     const ResultPtr& theContext, const std::shared_ptr<GeomAPI_Shape>& theSubShape);
+
   /// Performs the selection for the construction result (selection by index)
   virtual void selectConstruction(
     const ResultPtr& theContext, const std::shared_ptr<GeomAPI_Shape>& theSubShape);
@@ -53,6 +68,9 @@ protected:
   /// Note: there must be no attributes stored at the same label because Selector clears this lab
   TDF_Label selectionLabel();
 
+  /// Returns the prepared map of valid labels for naming selection solving (creates if not exists)
+  TDF_LabelMap& scope();
+
   friend class Model_Data;
   friend class Model_AttributeSelectionList;
 };