Salome HOME
Issue #2192 : change the naming principles of compsolid in case of Partition to make...
[modules/shaper.git] / src / Model / Model_AttributeSelection.cpp
index 6462c7b8489c8009ca151f2f5cbc5f598fe26bdd..1e8aca1927a429aca3eb9b1037ccccc75d11becf 100644 (file)
@@ -1,8 +1,22 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        Model_AttributeSelection.cpp
-// Created:     2 Oct 2014
-// Author:      Mikhail PONIKAROV
+// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or
+// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+//
 
 #include "Model_AttributeSelection.h"
 #include "Model_Application.h"
 #include "Model_Data.h"
 #include "Model_Document.h"
 #include "Model_SelectionNaming.h"
+#include <Model_Objects.h>
+#include <Model_AttributeSelectionList.h>
+#include <Model_ResultConstruction.h>
 #include <ModelAPI_Feature.h>
 #include <ModelAPI_ResultBody.h>
+#include <ModelAPI_ResultCompSolid.h>
 #include <ModelAPI_ResultConstruction.h>
 #include <ModelAPI_ResultPart.h>
 #include <ModelAPI_CompositeFeature.h>
 #include <ModelAPI_Tools.h>
-#include <GeomAPI_Shape.h>
-#include <GeomAPI_PlanarEdges.h>
-#include <Events_Error.h>
+#include <ModelAPI_Session.h>
+#include <Events_InfoMessage.h>
 
 #include <TNaming_Selector.hxx>
 #include <TNaming_NamedShape.hxx>
 #include <TNaming_Tool.hxx>
 #include <TNaming_Builder.hxx>
-#include <TNaming_Localizer.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopoDS_Compound.hxx>
-#include <TDataStd_IntPackedMap.hxx>
+#include <TNaming_SameShapeIterator.hxx>
+#include <TNaming_Iterator.hxx>
 #include <TDataStd_Integer.hxx>
 #include <TDataStd_UAttribute.hxx>
 #include <TDataStd_Name.hxx>
-#include <TopTools_MapOfShape.hxx>
-#include <TopTools_IndexedMapOfShape.hxx>
-#include <TopTools_MapIteratorOfMapOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>
-#include <NCollection_DataMap.hxx>
+#include <TopTools_DataMapOfShapeShape.hxx>
+#include <TopTools_MapOfShape.hxx>
 #include <TopExp_Explorer.hxx>
-#include <TDF_LabelMap.hxx>
 #include <BRep_Tool.hxx>
-#include <BRep_Builder.hxx>
-#include <TopoDS_Edge.hxx>
 #include <TopoDS.hxx>
 #include <TopExp.hxx>
-#include <TColStd_MapOfTransient.hxx>
-#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <TopTools_ListIteratorOfListOfShape.hxx>
-#include <TColStd_MapIteratorOfPackedMapOfInteger.hxx>
-#include <gp_Pnt.hxx>
-#include <Precision.hxx>
 #include <TDF_ChildIterator.hxx>
 #include <TDF_ChildIDIterator.hxx>
-#include <TDataStd_Name.hxx>
-#include <TopAbs_ShapeEnum.hxx>
 #include <TopoDS_Iterator.hxx>
-#include <TNaming_Iterator.hxx>
-#include <BRep_Builder.hxx>
-using namespace std;
+#include <TDF_ChildIDIterator.hxx>
+
 //#define DEB_NAMING 1
 #ifdef DEB_NAMING
 #include <BRepTools.hxx>
@@ -66,8 +67,6 @@ using namespace std;
 static const int kSTART_VERTEX_DELTA = 1000000;
 // identifier that there is simple reference: selection equals to context
 Standard_GUID kSIMPLE_REF_ID("635eacb2-a1d6-4dec-8348-471fae17cb29");
-// simple reference in the construction
-Standard_GUID kCONSTUCTION_SIMPLE_REF_ID("635eacb2-a1d6-4dec-8348-471fae17cb28");
 // reference to Part sub-object
 Standard_GUID kPART_REF_ID("635eacb2-a1d6-4dec-8348-471fae17cb27");
 // selection is invalid after recomputation
@@ -105,7 +104,6 @@ void Model_AttributeSelection::setValue(const ResultPtr& theContext,
   // do noth use naming if selected shape is result shape itself, but not sub-shape
   TDF_Label aSelLab = selectionLabel();
   aSelLab.ForgetAttribute(kSIMPLE_REF_ID);
-  aSelLab.ForgetAttribute(kCONSTUCTION_SIMPLE_REF_ID);
   aSelLab.ForgetAttribute(kINVALID_SELECTION);
 
   bool isDegeneratedEdge = false;
@@ -125,7 +123,7 @@ void Model_AttributeSelection::setValue(const ResultPtr& theContext,
   if (theContext->groupName() == ModelAPI_ResultBody::group()) {
     // do not select the whole shape for body:it is already must be in the data framework
     // equal and null selected objects mean the same: object is equal to context,
-    if (theContext->shape().get() && 
+    if (theContext->shape().get() &&
         (theContext->shape()->isEqual(theSubShape) || !theSubShape.get())) {
       aSelLab.ForgetAllAttributes(true);
       TDataStd_UAttribute::Set(aSelLab, kSIMPLE_REF_ID);
@@ -133,59 +131,44 @@ void Model_AttributeSelection::setValue(const ResultPtr& theContext,
       selectBody(theContext, theSubShape);
     }
   } else if (theContext->groupName() == ModelAPI_ResultConstruction::group()) {
-    if (!theSubShape.get()) {
-      // to sub, so the whole result is selected
-      aSelLab.ForgetAllAttributes(true);
-      TDataStd_UAttribute::Set(aSelLab, kCONSTUCTION_SIMPLE_REF_ID);
-      ResultConstructionPtr aConstruction = 
-        std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(theContext);
-      if (aConstruction->isInfinite()) {
-        // For correct naming selection, put the shape into the naming structure.
-        // It seems sub-shapes are not needed: only this shape is (and can be ) selected.
-        TNaming_Builder aBuilder(aSelLab);
-        aBuilder.Generated(theContext->shape()->impl<TopoDS_Shape>());
-        std::shared_ptr<Model_Document> aMyDoc = 
-          std::dynamic_pointer_cast<Model_Document>(owner()->document());
-        std::string aName = theContext->data()->name();
-        aMyDoc->addNamingName(aSelLab, aName);
-        TDataStd_Name::Set(aSelLab, aName.c_str());
-      } else {  // for sketch the naming is needed in DS
-        BRep_Builder aCompoundBuilder;
-        TopoDS_Compound aComp;
-        aCompoundBuilder.MakeCompound(aComp);
-        for(int a = 0; a < aConstruction->facesNum(); a++) {
-          TopoDS_Shape aFace = aConstruction->face(a)->impl<TopoDS_Shape>();
-          aCompoundBuilder.Add(aComp, aFace);
-        }
-        std::shared_ptr<GeomAPI_Shape> aShape(new GeomAPI_Shape);
-        aShape->setImpl<TopoDS_Shape>(new TopoDS_Shape(aComp));
-        selectConstruction(theContext, aShape);
-      }
-    } else {
-      selectConstruction(theContext, theSubShape);
-    }
+    aSelLab.ForgetAllAttributes(true); // to remove old selection data
+    std::shared_ptr<Model_ResultConstruction> aConstruction =
+      std::dynamic_pointer_cast<Model_ResultConstruction>(theContext);
+    std::shared_ptr<GeomAPI_Shape> aSubShape;
+    if (theSubShape.get() && !theContext->shape()->isEqual(theSubShape))
+      aSubShape = theSubShape; // the whole context
+    int anIndex = aConstruction->select(theSubShape, owner()->document());
+    TDataStd_Integer::Set(aSelLab, anIndex);
   } else if (theContext->groupName() == ModelAPI_ResultPart::group()) {
     aSelLab.ForgetAllAttributes(true);
     TDataStd_UAttribute::Set(aSelLab, kPART_REF_ID);
     selectPart(theContext, theSubShape);
   }
-  //the attribute initialized state should be changed by sendAttributeUpdated only
-  //myIsInitialized = true;
 
   owner()->data()->sendAttributeUpdated(this);
+}
 
-  std::string aSelName = namingName();
-  if(!aSelName.empty())
-    TDataStd_Name::Set(selectionLabel(), aSelName.c_str()); //set name
+void Model_AttributeSelection::removeTemporaryValues()
+{
+  if (myTmpContext.get() || myTmpSubShape.get()) {
+    myTmpContext.reset();
+    myTmpSubShape.reset();
+  }
 }
 
 std::shared_ptr<GeomAPI_Shape> Model_AttributeSelection::value()
 {
+  GeomShapePtr aResult;
   if (myTmpContext.get() || myTmpSubShape.get()) {
+    ResultConstructionPtr aResulConstruction =
+      std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(myTmpContext);
+    if(aResulConstruction.get()) {
+      // it is just reference to construction.
+      return myTmpSubShape;
+    }
     return myTmpSubShape.get() ? myTmpSubShape : myTmpContext->shape();
   }
 
-  std::shared_ptr<GeomAPI_Shape> aResult;
   TDF_Label aSelLab = selectionLabel();
   if (aSelLab.IsAttribute(kINVALID_SELECTION))
     return aResult;
@@ -193,28 +176,25 @@ std::shared_ptr<GeomAPI_Shape> Model_AttributeSelection::value()
   if (myRef.isInitialized()) {
     if (aSelLab.IsAttribute(kSIMPLE_REF_ID)) { // it is just reference to shape, not sub-shape
       ResultPtr aContext = context();
-      if (!aContext.get()) 
+      if (!aContext.get())
         return aResult; // empty result
       return aContext->shape();
     }
-    if (aSelLab.IsAttribute(kCONSTUCTION_SIMPLE_REF_ID)) { // it is just reference to construction, nothing is in value
-        return aResult; // empty result
-    }
     if (aSelLab.IsAttribute(kPART_REF_ID)) {
       ResultPartPtr aPart = std::dynamic_pointer_cast<ModelAPI_ResultPart>(context());
       if (!aPart.get() || !aPart->isActivated())
         return std::shared_ptr<GeomAPI_Shape>(); // postponed naming needed
       Handle(TDataStd_Integer) anIndex;
-      if (selectionLabel().FindAttribute(TDataStd_Integer::GetID(), anIndex)) {
+      if (aSelLab.FindAttribute(TDataStd_Integer::GetID(), anIndex)) {
         if (anIndex->Get()) { // special selection attribute was created, use it
           return aPart->selectionValue(anIndex->Get());
         } else { // face with name is already in the data model, so try to take it by name
           Handle(TDataStd_Name) aName;
-          if (selectionLabel().FindAttribute(TDataStd_Name::GetID(), aName)) {
+          if (aSelLab.FindAttribute(TDataStd_Name::GetID(), aName)) {
             std::string aSubShapeName(TCollection_AsciiString(aName->Get()).ToCString());
             std::size_t aPartEnd = aSubShapeName.find('/');
-            if (aPartEnd != string::npos && aPartEnd != aSubShapeName.rfind('/')) {
-              string aNameInPart = aSubShapeName.substr(aPartEnd + 1);
+            if (aPartEnd != std::string::npos && aPartEnd != aSubShapeName.rfind('/')) {
+              std::string aNameInPart = aSubShapeName.substr(aPartEnd + 1);
               int anIndex;
               std::string aType; // to reuse already existing selection the type is not needed
               return aPart->shapeInPart(aNameInPart, aType, anIndex);
@@ -225,15 +205,20 @@ std::shared_ptr<GeomAPI_Shape> Model_AttributeSelection::value()
     }
 
     Handle(TNaming_NamedShape) aSelection;
-    if (selectionLabel().FindAttribute(TNaming_NamedShape::GetID(), aSelection)) {
+    if (aSelLab.FindAttribute(TNaming_NamedShape::GetID(), aSelection)) {
       TopoDS_Shape aSelShape = aSelection->Get();
       aResult = std::shared_ptr<GeomAPI_Shape>(new GeomAPI_Shape);
       aResult->setImpl(new TopoDS_Shape(aSelShape));
     } else { // for simple construction element: just shape of this construction element
-      ResultConstructionPtr aConstr = 
-        std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(context());
+      std::shared_ptr<Model_ResultConstruction> aConstr =
+        std::dynamic_pointer_cast<Model_ResultConstruction>(context());
       if (aConstr) {
-        return aConstr->shape();
+        Handle(TDataStd_Integer) anIndex;
+        if (aSelLab.FindAttribute(TDataStd_Integer::GetID(), anIndex)) {
+          if (anIndex->Get() == 0) // it is just reference to construction, nothing is in value
+            return aResult;
+          return aConstr->shape(anIndex->Get(), owner()->document());
+        }
       }
     }
   }
@@ -255,18 +240,18 @@ bool Model_AttributeSelection::isInitialized()
         ResultPtr aContext = context();
         return aContext.get() != NULL;
       }
-      if (aSelLab.IsAttribute(kCONSTUCTION_SIMPLE_REF_ID)) { // it is just reference to construction, nothing is in value
-          return true;
-      }
-
       Handle(TNaming_NamedShape) aSelection;
       if (selectionLabel().FindAttribute(TNaming_NamedShape::GetID(), aSelection)) {
         return !aSelection->Get().IsNull();
       } else { // for simple construction element: just shape of this construction element
-        ResultConstructionPtr aConstr = 
-          std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(context());
+        std::shared_ptr<Model_ResultConstruction> aConstr =
+          std::dynamic_pointer_cast<Model_ResultConstruction>(context());
         if (aConstr.get()) {
-          return aConstr->shape().get() != NULL;
+          Handle(TDataStd_Integer) anIndex;
+          if (aSelLab.FindAttribute(TDataStd_Integer::GetID(), anIndex)) {
+            // for the whole shape it may return null, so, if index exists, returns true
+            return true;
+          }
         }
       }
     }
@@ -278,6 +263,7 @@ Model_AttributeSelection::Model_AttributeSelection(TDF_Label& theLabel)
   : myRef(theLabel)
 {
   myIsInitialized = myRef.isInitialized();
+  myParent = NULL;
 }
 
 void Model_AttributeSelection::setID(const std::string theID)
@@ -325,7 +311,7 @@ TDF_LabelMap& Model_AttributeSelection::scope()
     std::list<std::shared_ptr<ModelAPI_Feature> > allFeatures = aMyDoc->allFeatures();
     std::list<std::shared_ptr<ModelAPI_Feature> >::iterator aFIter = allFeatures.begin();
     bool aMePassed = false;
-    CompositeFeaturePtr aComposite = 
+    CompositeFeaturePtr aComposite =
       std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(owner());
     FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(owner());
     CompositeFeaturePtr aCompositeOwner, aCompositeOwnerOwner;
@@ -344,7 +330,8 @@ TDF_LabelMap& Model_AttributeSelection::scope()
       }
       if (isGroup) aMePassed = false;
       bool isInScope = !aMePassed;
-      if (!isInScope && aComposite.get()) { // try to add sub-elements of composite if this is composite
+      if (!isInScope && aComposite.get()) {
+        // try to add sub-elements of composite if this is composite
         if (aComposite->isSub(*aFIter))
           isInScope = true;
       }
@@ -355,7 +342,7 @@ TDF_LabelMap& Model_AttributeSelection::scope()
       if (isInScope && aFIter->get() && (*aFIter)->data()->isValid()) {
         TDF_Label aFeatureLab = std::dynamic_pointer_cast<Model_Data>(
           (*aFIter)->data())->label().Father();
-        TDF_ChildIDIterator aNSIter(aFeatureLab, TNaming_NamedShape::GetID(), 1);
+        TDF_ChildIDIterator aNSIter(aFeatureLab, TNaming_NamedShape::GetID(), true);
         for(; aNSIter.More(); aNSIter.Next()) {
           Handle(TNaming_NamedShape) aNS = Handle(TNaming_NamedShape)::DownCast(aNSIter.Value());
           if (!aNS.IsNull() && aNS->Evolution() != TNaming_SELECTED) {
@@ -364,23 +351,20 @@ TDF_LabelMap& Model_AttributeSelection::scope()
         }
       }
     }
+    // also add all naming labels created for external constructions
+    std::shared_ptr<Model_Document> aDoc = std::dynamic_pointer_cast<Model_Document>(aMyDoc);
+    TDF_Label anExtDocLab = aDoc->extConstructionsLabel();
+    TDF_ChildIDIterator aNSIter(anExtDocLab, TNaming_NamedShape::GetID(), true);
+    for(; aNSIter.More(); aNSIter.Next()) {
+      Handle(TNaming_NamedShape) aNS = Handle(TNaming_NamedShape)::DownCast(aNSIter.Value());
+      if (!aNS.IsNull() && aNS->Evolution() != TNaming_SELECTED) {
+        myScope.Add(aNS->Label());
+      }
+    }
   }
   return myScope;
 }
 
-/// produces theEdge orientation relatively to theContext face
-int edgeOrientation(const TopoDS_Shape& theContext, TopoDS_Edge& theEdge)
-{
-  if (theContext.ShapeType() != TopAbs_FACE)
-    return 0;
-  TopoDS_Face aContext = TopoDS::Face(theContext);
-  if (theEdge.Orientation() == TopAbs_FORWARD) 
-    return 1;
-  if (theEdge.Orientation() == TopAbs_REVERSED) 
-    return -1;
-  return 0; // unknown
-}
-
 /// Sets the invalid flag if flag is false, or removes it if "true"
 /// Returns theFlag
 static bool setInvalidIfFalse(TDF_Label& theLab, const bool theFlag) {
@@ -392,255 +376,96 @@ static bool setInvalidIfFalse(TDF_Label& theLab, const bool theFlag) {
   return theFlag;
 }
 
+void Model_AttributeSelection::split(
+  ResultPtr theContext, TopoDS_Shape theNewShape, TopAbs_ShapeEnum theType)
+{
+  TopTools_ListOfShape aSubs;
+  for(TopoDS_Iterator anExplorer(theNewShape); anExplorer.More(); anExplorer.Next()) {
+    if (!anExplorer.Value().IsNull() &&
+      anExplorer.Value().ShapeType() == theType) {
+        aSubs.Append(anExplorer.Value());
+    } else { // invalid case; bad result shape, so, impossible to split easily
+      aSubs.Clear();
+      break;
+    }
+  }
+  if (aSubs.Extent() > 1) { // ok to split
+    TopTools_ListIteratorOfListOfShape aSub(aSubs);
+    GeomShapePtr aSubSh(new GeomAPI_Shape);
+    aSubSh->setImpl(new TopoDS_Shape(aSub.Value()));
+    setValue(theContext, aSubSh);
+    for(aSub.Next(); aSub.More(); aSub.Next()) {
+      GeomShapePtr aSubSh(new GeomAPI_Shape);
+      aSubSh->setImpl(new TopoDS_Shape(aSub.Value()));
+      myParent->append(theContext, aSubSh);
+    }
+  }
+}
+
 bool Model_AttributeSelection::update()
 {
   TDF_Label aSelLab = selectionLabel();
   ResultPtr aContext = context();
-  if (!aContext.get()) 
+  if (!aContext.get())
     return setInvalidIfFalse(aSelLab, false);
   if (aSelLab.IsAttribute(kSIMPLE_REF_ID)) { // it is just reference to shape, not sub-shape
     return setInvalidIfFalse(aSelLab, aContext->shape() && !aContext->shape()->isNull());
   }
-  if (aSelLab.IsAttribute(kCONSTUCTION_SIMPLE_REF_ID)) { // it is just reference to construction, not sub-shape
-    // if there is a sketch, the sketch-naming must be updated
-    ResultConstructionPtr aConstruction = 
-      std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aContext);
-    if (!aConstruction->isInfinite()) {
-      BRep_Builder aCompoundBuilder;
-      TopoDS_Compound aComp;
-      aCompoundBuilder.MakeCompound(aComp);
-      for(int a = 0; a < aConstruction->facesNum(); a++) {
-        TopoDS_Shape aFace = aConstruction->face(a)->impl<TopoDS_Shape>();
-        aCompoundBuilder.Add(aComp, aFace);
-      }
-      std::shared_ptr<GeomAPI_Shape> aShape(new GeomAPI_Shape);
-      aShape->setImpl<TopoDS_Shape>(new TopoDS_Shape(aComp));
-      selectConstruction(aContext, aShape);
-    } else {
-      // For correct naming selection, put the shape into the naming structure.
-      // It seems sub-shapes are not needed: only this shape is (and can be ) selected.
-      TNaming_Builder aBuilder(aSelLab);
-      aBuilder.Generated(aContext->shape()->impl<TopoDS_Shape>());
-      std::shared_ptr<Model_Document> aMyDoc = 
-        std::dynamic_pointer_cast<Model_Document>(owner()->document());
-      std::string aName = aContext->data()->name();
-      aMyDoc->addNamingName(aSelLab, aName);
-      TDataStd_Name::Set(aSelLab, aName.c_str());
-    }
-    return setInvalidIfFalse(aSelLab, aContext->shape() && !aContext->shape()->isNull());
-  }
 
   if (aSelLab.IsAttribute(kPART_REF_ID)) { // it is reference to the part object
     std::shared_ptr<GeomAPI_Shape> aNoSelection;
     bool aResult = selectPart(aContext, aNoSelection, true);
+    aResult = setInvalidIfFalse(aSelLab, aResult);
     if (aResult) {
       owner()->data()->sendAttributeUpdated(this);
     }
-    return setInvalidIfFalse(aSelLab, aResult);
+    return aResult;
   }
 
   if (aContext->groupName() == ModelAPI_ResultBody::group()) {
     // body: just a named shape, use selection mechanism from OCCT
     TNaming_Selector aSelector(aSelLab);
+    TopoDS_Shape anOldShape;
+    if (!aSelector.NamedShape().IsNull()) {
+      anOldShape = aSelector.NamedShape()->Get();
+    }
     bool aResult = aSelector.Solve(scope()) == Standard_True;
-    owner()->data()->sendAttributeUpdated(this);
-    return setInvalidIfFalse(aSelLab, aResult);
-  } else if (aContext->groupName() == ModelAPI_ResultConstruction::group()) {
-    // construction: identification by the results indexes, recompute faces and
-    // take the face that more close by the indexes
-    ResultConstructionPtr aConstructionContext = 
-      std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aContext);
-    FeaturePtr aContextFeature = aContext->document()->feature(aContext);
-    // sketch sub-element
-    if (aConstructionContext && 
-        std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(aContextFeature).get())
-    {
-      TDF_Label aLab = myRef.myRef->Label();
-      // getting a type of selected shape
-      Handle(TDataStd_Integer) aTypeAttr;
-      if (!aLab.FindAttribute(TDataStd_Integer::GetID(), aTypeAttr)) {
-        return setInvalidIfFalse(aSelLab, false);
-      }
-      TopAbs_ShapeEnum aShapeType = (TopAbs_ShapeEnum)(aTypeAttr->Get());
-      // selected indexes will be needed in each "if"
-      Handle(TDataStd_IntPackedMap) aSubIds;
-      std::shared_ptr<GeomAPI_Shape> aNewSelected;
-      bool aNoIndexes = 
-        !aLab.FindAttribute(TDataStd_IntPackedMap::GetID(), aSubIds) || aSubIds->Extent() == 0;
-      // for now working only with composite features
-      CompositeFeaturePtr aComposite = 
-        std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(aContextFeature);
-      if (!aComposite.get() || aComposite->numberOfSubs() == 0) {
-        return setInvalidIfFalse(aSelLab, false);
+    // must be before sending of updated attribute (1556)
+    aResult = setInvalidIfFalse(aSelLab, aResult);
+    TopoDS_Shape aNewShape;
+    if (!aSelector.NamedShape().IsNull()) {
+      aNewShape = aSelector.NamedShape()->Get();
+    }
+    if (anOldShape.IsNull() || aNewShape.IsNull() ||
+        !anOldShape.IsEqual(aSelector.NamedShape()->Get())) {
+      // shape type shoud not not changed: if shape becomes compound of such shapes, then split
+      if (myParent && !anOldShape.IsNull() && !aNewShape.IsNull() &&
+          anOldShape.ShapeType() != aNewShape.ShapeType() &&
+          (aNewShape.ShapeType() == TopAbs_COMPOUND || aNewShape.ShapeType() == TopAbs_COMPSOLID))
+      {
+        split(aContext, aNewShape, anOldShape.ShapeType());
       }
+      owner()->data()->sendAttributeUpdated(this);  // send updated if shape is changed
+    }
+    return aResult;
+  }
 
-      if (aShapeType == TopAbs_FACE || aShapeType == TopAbs_WIRE) { // compound is for the whole sketch selection
-        // If this is a wire with plane defined thin it is a sketch-like object
-        if (!aConstructionContext->facesNum()) // no faces, update can not work correctly
-          return setInvalidIfFalse(aSelLab, false);
-        // if there is no edges indexes, any face can be used: take the first
-        std::shared_ptr<GeomAPI_Shape> aNewSelected;
-        if (aNoIndexes) {
-          aNewSelected = aConstructionContext->face(0);
-        } else { // searching for most looks-like initial face by the indexes
-          // prepare edges of the current result for the fast searching
-          NCollection_DataMap<Handle(Geom_Curve), int> allCurves; // curves and orientations of edges
-          const int aSubNum = aComposite->numberOfSubs();
-          for(int a = 0; a < aSubNum; a++) {
-            int aSubID = aComposite->subFeatureId(a);
-            if (aSubIds->Contains(aSubID)) {
-              FeaturePtr aSub = aComposite->subFeature(a);
-              const std::list<std::shared_ptr<ModelAPI_Result> >& aResults = aSub->results();
-              std::list<std::shared_ptr<ModelAPI_Result> >::const_iterator aRes;
-              for(aRes = aResults.cbegin(); aRes != aResults.cend(); aRes++) {
-                ResultConstructionPtr aConstr = 
-                  std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(*aRes);
-                if (aConstr->shape() && aConstr->shape()->isEdge()) {
-                  const TopoDS_Shape& aResShape = aConstr->shape()->impl<TopoDS_Shape>();
-                  TopoDS_Edge anEdge = TopoDS::Edge(aResShape);
-                  if (!anEdge.IsNull()) {
-                    Standard_Real aFirst, aLast;
-                    Handle(Geom_Curve) aCurve = BRep_Tool::Curve(anEdge, aFirst, aLast);
-                    // searching for orientation information
-                    int anOrient = 0;
-                    Handle(TDataStd_Integer) anInt;
-                    if (aSelLab.FindChild(aSubID).FindAttribute(TDataStd_Integer::GetID(), anInt)){
-                      anOrient = anInt->Get();
-                    }
-                    allCurves.Bind(aCurve, anOrient);
-                  }
-                }
-              }
-            }
-          }
-          int aBestFound = 0; // best number of found edges (not percentage: issue 1019)
-          int aBestOrient = 0; // for the equal "BestFound" additional parameter is orientation
-          for(int aFaceIndex = 0; aFaceIndex < aConstructionContext->facesNum(); aFaceIndex++) {
-            int aFound = 0, aNotFound = 0, aSameOrientation = 0;
-            TopoDS_Face aFace = 
-              TopoDS::Face(aConstructionContext->face(aFaceIndex)->impl<TopoDS_Shape>());
-            TopExp_Explorer anEdgesExp(aFace, TopAbs_EDGE);
-            TColStd_MapOfTransient alreadyProcessed; // to avoid counting edges with same curved (841)
-            for(; anEdgesExp.More(); anEdgesExp.Next()) {
-              TopoDS_Edge anEdge = TopoDS::Edge(anEdgesExp.Current());
-              if (!anEdge.IsNull()) {
-                Standard_Real aFirst, aLast;
-                Handle(Geom_Curve) aCurve = BRep_Tool::Curve(anEdge, aFirst, aLast);
-                if (alreadyProcessed.Contains(aCurve))
-                  continue;
-                alreadyProcessed.Add(aCurve);
-                if (allCurves.IsBound(aCurve)) {
-                  aFound++;
-                  int anOrient = allCurves.Find(aCurve);
-                  if (anOrient != 0) {  // extra comparision score is orientation
-                    if (edgeOrientation(aFace, anEdge) == anOrient)
-                      aSameOrientation++;
-                  }
-                } else {
-                  aNotFound++;
-                }
-              }
-            }
-            if (aFound + aNotFound != 0) {
-              if (aFound > aBestFound || 
-                  (aFound == aBestFound && aSameOrientation > aBestOrient)) {
-                aBestFound = aFound;
-                aBestOrient = aSameOrientation;
-                aNewSelected = aConstructionContext->face(aFaceIndex);
-              }
-            }
-          }
-        }
-        if (aNewSelected) { // store this new selection
-          if (aShapeType == TopAbs_WIRE) { // just get a wire from face to have wire
-            TopExp_Explorer aWireExp(aNewSelected->impl<TopoDS_Shape>(), TopAbs_WIRE);
-            if (aWireExp.More()) {
-              aNewSelected.reset(new GeomAPI_Shape);
-              aNewSelected->setImpl<TopoDS_Shape>(new TopoDS_Shape(aWireExp.Current()));
-            }
-          }
-          selectConstruction(aContext, aNewSelected);
-          owner()->data()->sendAttributeUpdated(this);
-          return setInvalidIfFalse(aSelLab, true);
-        } else { // if the selection is not found, put the empty shape: it's better to have disappeared shape, than the old, the lost one
-          TNaming_Builder anEmptyBuilder(selectionLabel());
-          return setInvalidIfFalse(aSelLab, false);
-        }
-      } else if (aShapeType == TopAbs_EDGE) {
-        // just reselect the edge by the id
-        const int aSubNum = aComposite->numberOfSubs();
-        for(int a = 0; a < aSubNum; a++) {
-          // if aSubIds take any, the first appropriate
-          if (aSubIds->IsEmpty() || aSubIds->Contains(aComposite->subFeatureId(a))) {
-            // found the appropriate feature
-            FeaturePtr aFeature = aComposite->subFeature(a);
-            std::list<std::shared_ptr<ModelAPI_Result> >::const_iterator aResIter =
-              aFeature->results().cbegin();
-            for(;aResIter != aFeature->results().cend(); aResIter++) {
-              ResultConstructionPtr aRes = 
-                std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(*aResIter);
-              if (aRes && aRes->shape() && aRes->shape()->isEdge()) { // found!
-                selectConstruction(aContext, aRes->shape());
-                owner()->data()->sendAttributeUpdated(this);
-                return setInvalidIfFalse(aSelLab, true);
-              }
-            }
-          }
-        }
-      } else if (aShapeType == TopAbs_VERTEX) {
-        // just reselect the vertex by the id of edge
-        const int aSubNum = aComposite->numberOfSubs();
-        for(int a = 0; a < aSubNum; a++) {
-          // if aSubIds take any, the first appropriate
-          int aFeatureID = aComposite->subFeatureId(a);
-          if (aSubIds->IsEmpty() || aSubIds->Contains(aFeatureID) ||
-            aSubIds->Contains(aFeatureID + kSTART_VERTEX_DELTA) ||
-            aSubIds->Contains(aFeatureID + kSTART_VERTEX_DELTA * 2)) {
-              // searching for deltas
-              int aVertexNum = 0;
-              if (aSubIds->Contains(aFeatureID + kSTART_VERTEX_DELTA)) aVertexNum = 1;
-              else if (aSubIds->Contains(aFeatureID + kSTART_VERTEX_DELTA * 2)) aVertexNum = 2;
-              // found the feature with appropriate edge
-              FeaturePtr aFeature = aComposite->subFeature(a);
-              std::list<std::shared_ptr<ModelAPI_Result> >::const_iterator aResIter =
-                aFeature->results().cbegin();
-              for(;aResIter != aFeature->results().cend(); aResIter++) {
-                ResultConstructionPtr aRes = 
-                  std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(*aResIter);
-                if (aRes && aRes->shape()) {
-                  if (aRes->shape()->isVertex() && aVertexNum == 0) { // found!
-                    selectConstruction(aContext, aRes->shape());
-                    owner()->data()->sendAttributeUpdated(this);
-                    return setInvalidIfFalse(aSelLab, true);
-                  } else if (aRes->shape()->isEdge() && aVertexNum > 0) {
-                    const TopoDS_Shape& anEdge = aRes->shape()->impl<TopoDS_Shape>();
-                    int aVIndex = 1;
-                    for(TopExp_Explorer aVExp(anEdge, TopAbs_VERTEX); aVExp.More(); aVExp.Next()) {
-                      if (aVIndex == aVertexNum) { // found!
-                        std::shared_ptr<GeomAPI_Shape> aVertex(new GeomAPI_Shape);
-                        aVertex->setImpl(new TopoDS_Shape(aVExp.Current()));
-                        selectConstruction(aContext, aVertex);
-                        owner()->data()->sendAttributeUpdated(this);
-                        return setInvalidIfFalse(aSelLab, true);
-                      }
-                      aVIndex++;
-                    }
-                  }
-                }
-              }
-          }
-        }
-      }
-    } else { // simple construction element: the selected is that needed
-      selectConstruction(aContext, aContext->shape());
-      owner()->data()->sendAttributeUpdated(this);
-      return setInvalidIfFalse(aSelLab, true);
+  if (aContext->groupName() == ModelAPI_ResultConstruction::group()) {
+    Handle(TDataStd_Integer) anIndex;
+    if (aSelLab.FindAttribute(TDataStd_Integer::GetID(), anIndex)) {
+      std::shared_ptr<Model_ResultConstruction> aConstructionContext =
+        std::dynamic_pointer_cast<Model_ResultConstruction>(aContext);
+      bool aModified = true;
+      bool aValid = aConstructionContext->update(anIndex->Get(), owner()->document(), aModified);
+      setInvalidIfFalse(aSelLab, aValid);
+      if (aModified)
+        owner()->data()->sendAttributeUpdated(this);
+      return aValid;
     }
   }
   return setInvalidIfFalse(aSelLab, false); // unknown case
 }
 
-
 void Model_AttributeSelection::selectBody(
   const ResultPtr& theContext, const std::shared_ptr<GeomAPI_Shape>& theSubShape)
 {
@@ -648,196 +473,98 @@ void Model_AttributeSelection::selectBody(
   TNaming_Selector aSel(selectionLabel());
   TopoDS_Shape aContext;
 
-  ResultBodyPtr aBody = std::dynamic_pointer_cast<ModelAPI_ResultBody>(myRef.value());
+  ResultBodyPtr aBody = std::dynamic_pointer_cast<ModelAPI_ResultBody>(theContext);//myRef.value()
   if (aBody) {
     aContext = aBody->shape()->impl<TopoDS_Shape>();
   } else {
-    ResultPtr aResult = 
+    ResultPtr aResult =
       std::dynamic_pointer_cast<ModelAPI_Result>(myRef.value());
     if (aResult) {
       aContext = aResult->shape()->impl<TopoDS_Shape>();
     } else {
-      Events_Error::send("A result with shape is expected");
+      Events_InfoMessage("Model_AttributeSelection", "A result with shape is expected").send();
       return;
     }
   }
-  TopoDS_Shape aNewShape = theSubShape ? theSubShape->impl<TopoDS_Shape>() : aContext;
-  /// fix for issue 411: result modified shapes must not participate in this selection mechanism
-  FeaturePtr aFeatureOwner = std::dynamic_pointer_cast<ModelAPI_Feature>(owner());
-  if (aFeatureOwner.get())
-    aFeatureOwner->eraseResults();
-  if (!aContext.IsNull()) {
-    aSel.Select(aNewShape, aContext); 
-  }
-}
 
-/// registers the name of the shape in the label (theID == 0) of sub label (theID is a tag)
-/// if theID is zero, 
-/// theOrientation is additional information about the positioning of edge relatively to face
-///    it is stored in the integer attribute of the edge sub-label: 
-///    -1 is out, 1 is in, 0 is not needed
-static void registerSubShape(TDF_Label theMainLabel, TopoDS_Shape theShape,
-  const int theID, const FeaturePtr& theContextFeature, std::shared_ptr<Model_Document> theDoc,
-  std::string theAdditionalName, std::map<int, int>& theOrientations,
-  Handle(TDataStd_IntPackedMap) theRefs = Handle(TDataStd_IntPackedMap)(),
-  const int theOrientation = 0)
-{
-  TDF_Label aLab = theID == 0 ? theMainLabel : theMainLabel.FindChild(theID);
-  if (theOrientation != 0) { // store the orientation of edge relatively to face if needed
-    TDataStd_Integer::Set(aLab, theOrientation);
-  }
-  TNaming_Builder aBuilder(aLab);
-  aBuilder.Generated(theShape);
-  std::stringstream aName;
-  aName<<theContextFeature->name()<<"/";
-  if (!theAdditionalName.empty())
-    aName<<theAdditionalName<<"/";
-  if (theShape.ShapeType() == TopAbs_FACE) aName<<"Face";
-  else if (theShape.ShapeType() == TopAbs_WIRE) aName<<"Wire";
-  else if (theShape.ShapeType() == TopAbs_EDGE) aName<<"Edge";
-  else if (theShape.ShapeType() == TopAbs_VERTEX) aName<<"Vertex";
-
-  if (theRefs.IsNull()) {
-    aName<<theID;
-    if (theOrientation == 1)
-      aName<<"f";
-    else if (theOrientation == -1)
-      aName<<"r";
-  } else { // make a composite name from all sub-elements indexes: "1_2_3_4"
-    TColStd_MapIteratorOfPackedMapOfInteger aRef(theRefs->GetMap());
-    for(; aRef.More(); aRef.Next()) {
-      aName<<"-"<<aRef.Key();
-      if (theOrientations.find(aRef.Key()) != theOrientations.end()) {
-        if (theOrientations[aRef.Key()] == 1)
-          aName<<"f";
-        else if (theOrientations[aRef.Key()] == -1)
-          aName<<"r";
+  // with "recover" feature the selected context may be not up to date (issue 1710)
+  Handle(TNaming_NamedShape) aResult;
+  TDF_Label aSelLab = selectionLabel();
+  TopoDS_Shape aNewContext = aContext;
+  bool isUpdated = true;
+  while(!aNewContext.IsNull() && isUpdated) {
+    // searching for the very last shape that was produced from this one
+    isUpdated = false;
+    if (!TNaming_Tool::HasLabel(aSelLab, aNewContext))
+      // to avoid crash of TNaming_SameShapeIterator if pure shape does not exists
+      break;
+    for(TNaming_SameShapeIterator anIter(aNewContext, aSelLab); anIter.More(); anIter.Next()) {
+      TDF_Label aNSLab = anIter.Label();
+      if (!scope().Contains(aNSLab))
+        continue;
+      Handle(TNaming_NamedShape) aNS;
+      if (aNSLab.FindAttribute(TNaming_NamedShape::GetID(), aNS)) {
+        for(TNaming_Iterator aShapesIter(aNS); aShapesIter.More(); aShapesIter.Next()) {
+          if (aShapesIter.Evolution() == TNaming_SELECTED)
+            continue; // don't use the selection evolution
+          if (!aShapesIter.OldShape().IsNull() && aShapesIter.OldShape().IsSame(aNewContext)) {
+             // found the original shape
+            aNewContext = aShapesIter.NewShape(); // go to the newer shape
+            isUpdated = true;
+            break;
+          }
+        }
       }
     }
   }
-
-  theDoc->addNamingName(aLab, aName.str());
-  TDataStd_Name::Set(aLab, aName.str().c_str());
-}
-
-void Model_AttributeSelection::selectConstruction(
-  const ResultPtr& theContext, const std::shared_ptr<GeomAPI_Shape>& theSubShape)
-{
-  std::shared_ptr<Model_Document> aMyDoc = 
-    std::dynamic_pointer_cast<Model_Document>(owner()->document());
-  FeaturePtr aContextFeature = theContext->document()->feature(theContext);
-  CompositeFeaturePtr aComposite = 
-    std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(aContextFeature);
-  const TopoDS_Shape& aSubShape = theSubShape->impl<TopoDS_Shape>();
-  if (!aComposite || aComposite->numberOfSubs() == 0) {
-    // saving of context is enough: result construction contains exactly the needed shape
-    TNaming_Builder aBuilder(selectionLabel());
-    aBuilder.Generated(aSubShape);
-    aMyDoc->addNamingName(selectionLabel(), theContext->data()->name());
-    TDataStd_Name::Set(selectionLabel(), theContext->data()->name().c_str());
+  if (aNewContext.IsNull()) { // a context is already deleted
+    setInvalidIfFalse(aSelLab, false);
+    Events_InfoMessage("Model_AttributeSelection", "Failed to select shape already deleted").send();
     return;
   }
-  std::shared_ptr<Model_Data> aData = std::dynamic_pointer_cast<Model_Data>(owner()->data());
-  TDF_Label aLab = myRef.myRef->Label();
-  // identify the results of sub-object of the composite by edges
-  // save type of the selected shape in integer attribute
-  TopAbs_ShapeEnum aShapeType = aSubShape.ShapeType();
-  TDataStd_Integer::Set(aLab, (int)aShapeType);
-  gp_Pnt aVertexPos;
-  TColStd_MapOfTransient allCurves;
-  if (aShapeType == TopAbs_VERTEX) { // compare positions
-    aVertexPos = BRep_Tool::Pnt(TopoDS::Vertex(aSubShape));
-  } else { 
-    for(TopExp_Explorer anEdgeExp(aSubShape, TopAbs_EDGE); anEdgeExp.More(); anEdgeExp.Next()) {
-      TopoDS_Edge anEdge = TopoDS::Edge(anEdgeExp.Current());
-      Standard_Real aFirst, aLast;
-      Handle(Geom_Curve) aCurve = BRep_Tool::Curve(anEdge, aFirst, aLast);
-      allCurves.Add(aCurve);
-    }
-  }
-  // iterate and store the result ids of sub-elements and sub-elements to sub-labels
-  Handle(TDataStd_IntPackedMap) aRefs = TDataStd_IntPackedMap::Set(aLab);
-  std::map<int, int> anOrientations; //map from edges IDs to orientations of these edges in face
-  aRefs->Clear();
-  const int aSubNum = aComposite->numberOfSubs();
-  for(int a = 0; a < aSubNum; a++) {
-    FeaturePtr aSub = aComposite->subFeature(a);
-    const std::list<std::shared_ptr<ModelAPI_Result> >& aResults = aSub->results();
-    std::list<std::shared_ptr<ModelAPI_Result> >::const_iterator aRes = aResults.cbegin();
-    // there may be many shapes (circle and center): register if at least one is in selection
-    for(; aRes != aResults.cend(); aRes++) {
-      ResultConstructionPtr aConstr = 
-        std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(*aRes);
-      if (!aConstr->shape()) {
-        continue;
+
+  TopoDS_Shape aNewSub = theSubShape ? theSubShape->impl<TopoDS_Shape>() : aContext;
+  if (!aNewSub.IsEqual(aContext)) { // searching for subshape in the new context
+    bool isFound = false;
+    TopExp_Explorer anExp(aNewContext, aNewSub.ShapeType());
+    for(; anExp.More(); anExp.Next()) {
+      if (anExp.Current().IsEqual(aNewSub)) {
+        isFound = true;
+        break;
       }
-      if (aShapeType == TopAbs_VERTEX) {
-        if (aConstr->shape()->isVertex()) { // compare vertices positions
-          const TopoDS_Shape& aVertex = aConstr->shape()->impl<TopoDS_Shape>();
-          gp_Pnt aPnt = BRep_Tool::Pnt(TopoDS::Vertex(aVertex));
-          if (aPnt.IsEqual(aVertexPos, Precision::Confusion())) {
-            aRefs->Add(aComposite->subFeatureId(a));
-          }
-        } else { // get first or last vertex of the edge: last is stored with negative sign
-          const TopoDS_Shape& anEdge = aConstr->shape()->impl<TopoDS_Shape>();
-          int aDelta = kSTART_VERTEX_DELTA;
-          for(TopExp_Explorer aVExp(anEdge, TopAbs_VERTEX); aVExp.More(); aVExp.Next()) {
-            gp_Pnt aPnt = BRep_Tool::Pnt(TopoDS::Vertex(aVExp.Current()));
-            if (aPnt.IsEqual(aVertexPos, Precision::Confusion())) {
-              aRefs->Add(aDelta + aComposite->subFeatureId(a));
-              break;
-            }
-            aDelta += kSTART_VERTEX_DELTA;
-          }
-        }
-      } else {
-        if (aConstr->shape()->isEdge()) {
-          const TopoDS_Shape& aResShape = aConstr->shape()->impl<TopoDS_Shape>();
-          TopoDS_Edge anEdge = TopoDS::Edge(aResShape);
-          if (!anEdge.IsNull()) {
-            Standard_Real aFirst, aLast;
-            Handle(Geom_Curve) aCurve = BRep_Tool::Curve(anEdge, aFirst, aLast);
-            if (allCurves.Contains(aCurve)) {
-              int anID = aComposite->subFeatureId(a);
-              aRefs->Add(anID);
-              if (aShapeType != TopAbs_EDGE) { // face needs the sub-edges on sub-labels
-                // add edges to sub-label to support naming for edges selection
-                TopExp_Explorer anEdgeExp(aSubShape, TopAbs_EDGE);
-                for(; anEdgeExp.More(); anEdgeExp.Next()) {
-                  TopoDS_Edge anEdge = TopoDS::Edge(anEdgeExp.Current());
-                  Standard_Real aFirst, aLast;
-                  Handle(Geom_Curve) aFaceCurve = BRep_Tool::Curve(anEdge, aFirst, aLast);
-                  if (aFaceCurve == aCurve) {
-                    int anOrient = edgeOrientation(aSubShape, anEdge);
-                    anOrientations[anID] = anOrient;
-                    registerSubShape(
-                      selectionLabel(), anEdge, anID, aContextFeature, aMyDoc, "", anOrientations,
-                      Handle(TDataStd_IntPackedMap)(), anOrient);
-                  }
-                }
-              } else { // put vertices of the selected edge to sub-labels
-                // add edges to sub-label to support naming for edges selection
-                TopExp_Explorer anEdgeExp(aSubShape, TopAbs_VERTEX);
-                int aTagIndex = anID + kSTART_VERTEX_DELTA;
-                for(; anEdgeExp.More(); anEdgeExp.Next(), aTagIndex += kSTART_VERTEX_DELTA) {
-                  TopoDS_Vertex aV = TopoDS::Vertex(anEdgeExp.Current());
-
-                  std::stringstream anAdditionalName; 
-                  registerSubShape(
-                    selectionLabel(), aV, aTagIndex, aContextFeature, aMyDoc, "", anOrientations);
-                }
-              }
-            }
-          }
-        }
+    }
+    if (!isFound) { // sub-shape is not found in the up-to-date instance of the context shape
+      // if context is sub-result of compound/compsolid, selection of sub-shape better propagate to
+      // the main result (which is may be modified), case is in 1799
+      ResultCompSolidPtr aMain = ModelAPI_Tools::compSolidOwner(theContext);
+      if (aMain.get()) {
+        selectBody(aMain, theSubShape);
+        return;
       }
+      setInvalidIfFalse(aSelLab, false);
+      Events_InfoMessage("Model_AttributeSelection",
+        "Failed to select sub-shape already modified").send();
+      return;
+    }
+  }
+
+  /// fix for issue 411: result modified shapes must not participate in this selection mechanism
+  if (!aContext.IsNull()) {
+    FeaturePtr aFeatureOwner = std::dynamic_pointer_cast<ModelAPI_Feature>(owner());
+    bool aEraseResults = false;
+    if (aFeatureOwner.get()) {
+      aEraseResults = !aFeatureOwner->results().empty();
+      if (aEraseResults) // erase results without flash deleted and redisplay: do it after Select
+        aFeatureOwner->removeResults(0, false, false);
+    }
+    aSel.Select(aNewSub, aNewContext);
+
+    if (aEraseResults) { // flash after Select : in Groups it makes selection with shift working
+      static Events_Loop* aLoop = Events_Loop::loop();
+      static const Events_ID kDeletedEvent = aLoop->eventByName(EVENT_OBJECT_DELETED);
+      aLoop->flush(kDeletedEvent);
     }
   }
-  // store the selected as primitive
-  TNaming_Builder aBuilder(selectionLabel());
-  aBuilder.Generated(aSubShape);
-    registerSubShape(
-      selectionLabel(), aSubShape, 0, aContextFeature, aMyDoc, "", anOrientations, aRefs); 
 }
 
 bool Model_AttributeSelection::selectPart(
@@ -849,7 +576,8 @@ bool Model_AttributeSelection::selectPart(
     return true; // postponed naming
   if (theUpdate) {
     Handle(TDataStd_Integer) anIndex;
-    if (selectionLabel().FindAttribute(TDataStd_Integer::GetID(), anIndex)) { // by internal selection
+    if (selectionLabel().FindAttribute(TDataStd_Integer::GetID(), anIndex)) {
+      // by internal selection
       if (anIndex->Get() > 0) {
         // update the selection by index
         return aPart->updateInPart(anIndex->Get());
@@ -887,17 +615,16 @@ std::string Model_AttributeSelection::namingName(const std::string& theDefaultNa
   std::string aName("");
   if(!this->isInitialized())
     return !theDefaultName.empty() ? theDefaultName : aName;
-  Handle(TDataStd_Name) anAtt;
-  if(selectionLabel().FindAttribute(TDataStd_Name::GetID(), anAtt)) {
-    aName = TCollection_AsciiString(anAtt->Get()).ToCString();
-    return aName;
-  }
 
   std::shared_ptr<GeomAPI_Shape> aSubSh = value();
   ResultPtr aCont = context();
 
+  if (!aCont.get()) // in case of selection of removed result
+    return "";
+
   Model_SelectionNaming aSelNaming(selectionLabel());
-  return aSelNaming.namingName(aCont, aSubSh, theDefaultName);
+  return aSelNaming.namingName(
+    aCont, aSubSh, theDefaultName, owner()->document() != aCont->document());
 }
 
 // type ::= COMP | COMS | SOLD | SHEL | FACE | WIRE | EDGE | VERT
@@ -908,12 +635,12 @@ void Model_AttributeSelection::selectSubShape(
 
   // check this is Part-name: 2 delimiters in the name
   std::size_t aPartEnd = theSubShapeName.find('/');
-  if (aPartEnd != string::npos && aPartEnd != theSubShapeName.rfind('/')) {
+  if (aPartEnd != std::string::npos && aPartEnd != theSubShapeName.rfind('/')) {
     std::string aPartName = theSubShapeName.substr(0, aPartEnd);
     ObjectPtr aFound = owner()->document()->objectByName(ModelAPI_ResultPart::group(), aPartName);
     if (aFound.get()) { // found such part, so asking it for the name
       ResultPartPtr aPart = std::dynamic_pointer_cast<ModelAPI_ResultPart>(aFound);
-      string aNameInPart = theSubShapeName.substr(aPartEnd + 1);
+      std::string aNameInPart = theSubShapeName.substr(aPartEnd + 1);
       int anIndex;
       std::shared_ptr<GeomAPI_Shape> aSelected = aPart->shapeInPart(aNameInPart, theType, anIndex);
       if (aSelected.get()) {
@@ -925,13 +652,40 @@ void Model_AttributeSelection::selectSubShape(
   }
 
   Model_SelectionNaming aSelNaming(selectionLabel());
-  std::shared_ptr<Model_Document> aDoc = 
+  std::shared_ptr<Model_Document> aDoc =
     std::dynamic_pointer_cast<Model_Document>(owner()->document());
   std::shared_ptr<GeomAPI_Shape> aShapeToBeSelected;
   ResultPtr aCont;
   if (aSelNaming.selectSubShape(theType, theSubShapeName, aDoc, aShapeToBeSelected, aCont)) {
+    // try to find the last context to find the up to date shape
+    if (aCont->shape().get() && !aCont->shape()->isNull() &&
+      aCont->groupName() == ModelAPI_ResultBody::group() && aDoc == owner()->document()) {
+      const TopoDS_Shape aConShape = aCont->shape()->impl<TopoDS_Shape>();
+      if (!aConShape.IsNull()) {
+        Handle(TNaming_NamedShape) aNS = TNaming_Tool::NamedShape(aConShape, selectionLabel());
+        if (!aNS.IsNull()) {
+          aNS = TNaming_Tool::CurrentNamedShape(aNS);
+          if (!aNS.IsNull()) {
+            TDF_Label aLab = aNS->Label();
+            while(aLab.Depth() != 7 && aLab.Depth() > 5)
+              aLab = aLab.Father();
+            ObjectPtr anObj = aDoc->objects()->object(aLab);
+            if (anObj.get()) {
+              ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(anObj);
+              if (aRes)
+                aCont = aRes;
+            }
+          }
+        }
+      }
+    }
     setValue(aCont, aShapeToBeSelected);
+    return;
   }
+
+  TDF_Label aSelLab = selectionLabel();
+  setInvalidIfFalse(aSelLab, false);
+  reset();
 }
 
 int Model_AttributeSelection::Id()
@@ -965,3 +719,305 @@ int Model_AttributeSelection::Id()
   }
   return anID;
 }
+
+void Model_AttributeSelection::setId(int theID)
+{
+  const ResultPtr& aContext = context();
+  std::shared_ptr<GeomAPI_Shape> aSelection;
+
+  std::shared_ptr<GeomAPI_Shape> aContextShape = aContext->shape();
+  // support for compsolids:
+  if (aContext.get() && ModelAPI_Tools::compSolidOwner(aContext).get())
+    aContextShape = ModelAPI_Tools::compSolidOwner(aContext)->shape();
+
+  TopoDS_Shape aMainShape = aContextShape->impl<TopoDS_Shape>();
+  // searching for the latest main shape
+  if (theID > 0 &&
+      aContextShape && !aContextShape->isNull())
+  {
+    std::shared_ptr<Model_Document> aDoc =
+      std::dynamic_pointer_cast<Model_Document>(aContext->document());
+    if (aDoc.get()) {
+      Handle(TNaming_NamedShape) aNS = TNaming_Tool::NamedShape(aMainShape, aDoc->generalLabel());
+      if (!aNS.IsNull()) {
+        aMainShape = TNaming_Tool::CurrentShape(aNS);
+      }
+    }
+
+    TopTools_IndexedMapOfShape aSubShapesMap;
+    TopExp::MapShapes(aMainShape, aSubShapesMap);
+    const TopoDS_Shape& aSelShape = aSubShapesMap.FindKey(theID);
+
+    std::shared_ptr<GeomAPI_Shape> aResult(new GeomAPI_Shape);
+    aResult->setImpl(new TopoDS_Shape(aSelShape));
+
+    aSelection = aResult;
+  }
+
+  setValue(aContext, aSelection);
+}
+
+std::string Model_AttributeSelection::contextName(const ResultPtr& theContext) const
+{
+  std::string aResult;
+  if (owner()->document() != theContext->document()) {
+    if (theContext->document() == ModelAPI_Session::get()->moduleDocument()) {
+      aResult = theContext->document()->kind() + "/";
+    } else {
+      ResultPtr aDocRes = ModelAPI_Tools::findPartResult(
+        ModelAPI_Session::get()->moduleDocument(), theContext->document());
+      if (aDocRes.get()) {
+        aResult = aDocRes->data()->name() + "/";
+      }
+    }
+  }
+  aResult += theContext->data()->name();
+  return aResult;
+}
+
+void Model_AttributeSelection::computeValues(
+  ResultPtr theOldContext, ResultPtr theNewContext, TopoDS_Shape theValShape,
+  TopTools_ListOfShape& theShapes)
+{
+  TopoDS_Shape anOldContShape = theOldContext->shape()->impl<TopoDS_Shape>();
+  TopoDS_Shape aNewContShape = theNewContext->shape()->impl<TopoDS_Shape>();
+  if (anOldContShape.IsSame(theValShape)) { // full context shape substituted by new full context
+    theShapes.Append(aNewContShape);
+    return;
+  }
+  if (theValShape.IsNull()) {
+    theShapes.Append(theValShape);
+    return;
+  }
+  // if a new value is unchanged in the new context, do nothing: value is correct
+  TopExp_Explorer aSubExp(aNewContShape, theValShape.ShapeType());
+  for(; aSubExp.More(); aSubExp.Next()) {
+    if (aSubExp.Current().IsSame(theValShape)) {
+      theShapes.Append(theValShape);
+      return;
+    }
+  }
+  // if new context becomes compsolid, the resulting sub may be in sub-solids
+  std::list<ResultPtr> aNewToIterate;
+  aNewToIterate.push_back(theNewContext);
+  ResultCompSolidPtr aComp = std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(theNewContext);
+  if (aComp.get()) {
+    for(int a = 0; a < aComp->numberOfSubs(); a++)
+      aNewToIterate.push_back(aComp->subResult(a, false));
+  }
+
+  // first iteration: searching for the whole shape appearance (like face of the box)
+  // second iteration: searching for sub-shapes that contain the sub (like vertex on faces)
+  int aToFindPart = 0;
+  TopTools_DataMapOfShapeShape aNewToOld; // map from new containers to old containers (with val)
+  TopTools_MapOfShape anOlds; // to know how many olds produced new containers
+  for(; aToFindPart != 2 && theShapes.IsEmpty(); aToFindPart++) {
+    std::list<ResultPtr>::iterator aNewContIter = aNewToIterate.begin();
+    for(; aNewContIter != aNewToIterate.end(); aNewContIter++) {
+      std::shared_ptr<Model_Data> aNewData =
+        std::dynamic_pointer_cast<Model_Data>((*aNewContIter)->data());
+      TDF_Label aNewLab = aNewData->label();
+      // searching for produced sub-shape fully on some label
+      TDF_ChildIDIterator aNSIter(aNewLab, TNaming_NamedShape::GetID(), Standard_True);
+      for(; aNSIter.More(); aNSIter.Next()) {
+        Handle(TNaming_NamedShape) aNS = Handle(TNaming_NamedShape)::DownCast(aNSIter.Value());
+        for(TNaming_Iterator aPairIter(aNS); aPairIter.More(); aPairIter.Next()) {
+          if (aToFindPart == 0) { // search shape is fully inside
+            if (aPairIter.OldShape().IsSame(theValShape)) {
+              if (aPairIter.NewShape().IsNull()) {// value was removed
+                theShapes.Clear();
+                return;
+              }
+              theShapes.Append(aPairIter.NewShape());
+            }
+          } else if (!aPairIter.OldShape().IsNull()) { // search shape that contains this sub
+            TopExp_Explorer anExp(aPairIter.OldShape(), theValShape.ShapeType());
+            for(; anExp.More(); anExp.Next()) {
+              if (anExp.Current().IsSame(theValShape)) { // found a new container
+                if (aPairIter.NewShape().IsNull()) {// value was removed
+                  theShapes.Clear();
+                  return;
+                }
+                aNewToOld.Bind(aPairIter.NewShape(), aPairIter.OldShape());
+                anOlds.Add(aPairIter.OldShape());
+                break;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  if (aToFindPart == 2 && !aNewToOld.IsEmpty()) {
+    // map of sub-shapes -> number of occurences of these shapes in containers
+    NCollection_DataMap<TopoDS_Shape, TopTools_MapOfShape, TopTools_ShapeMapHasher> aSubs;
+    TopTools_DataMapOfShapeShape::Iterator aContIter(aNewToOld);
+    for(; aContIter.More(); aContIter.Next()) {
+      TopExp_Explorer aSubExp(aContIter.Key(), theValShape.ShapeType());
+      for(; aSubExp.More(); aSubExp.Next()) {
+        if (!aSubs.IsBound(aSubExp.Current())) {
+          aSubs.Bind(aSubExp.Current(), TopTools_MapOfShape());
+        }
+        // store old to know how many olds produced this shape
+        aSubs.ChangeFind(aSubExp.Current()).Add(aContIter.Value());
+      }
+    }
+    // if sub is appeared same times in containers as the number of old shapes that contain it
+    int aCountInOld = anOlds.Size();
+    NCollection_DataMap<TopoDS_Shape, TopTools_MapOfShape, TopTools_ShapeMapHasher>::Iterator
+      aSubsIter(aSubs);
+    for(; aSubsIter.More(); aSubsIter.Next()) {
+      if (aSubsIter.Value().Size() == aCountInOld) {
+        theShapes.Append(aSubsIter.Key());
+      }
+    }
+  }
+  if (theShapes.IsEmpty()) // nothing was changed
+    theShapes.Append(theValShape);
+}
+
+bool Model_AttributeSelection::searchNewContext(std::shared_ptr<Model_Document> theDoc,
+  const TopoDS_Shape theContShape, ResultPtr theContext, TopoDS_Shape theValShape,
+  TDF_Label theAccessLabel,
+  std::list<ResultPtr>& theResults, TopTools_ListOfShape& theValShapes)
+{
+  std::set<ResultPtr> aResults; // to avoid duplicates
+  TopTools_ListOfShape aResContShapes;
+  TNaming_SameShapeIterator aModifIter(theContShape, theAccessLabel);
+  for(; aModifIter.More(); aModifIter.Next()) {
+    ResultPtr aModifierObj = std::dynamic_pointer_cast<ModelAPI_Result>
+      (theDoc->objects()->object(aModifIter.Label().Father()));
+    if (!aModifierObj.get())
+      break;
+    FeaturePtr aModifierFeat = theDoc->feature(aModifierObj);
+    if (!aModifierFeat.get())
+      break;
+    FeaturePtr aThisFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(owner());
+    if (aModifierFeat == aThisFeature || theDoc->objects()->isLater(aModifierFeat, aThisFeature))
+      continue; // the modifier feature is later than this, so, should not be used
+    FeaturePtr aCurrentModifierFeat = theDoc->feature(theContext);
+    if (aCurrentModifierFeat == aModifierFeat ||
+      theDoc->objects()->isLater(aCurrentModifierFeat, aModifierFeat))
+      continue; // the current modifier is later than the found, so, useless
+    Handle(TNaming_NamedShape) aNewNS;
+    aModifIter.Label().FindAttribute(TNaming_NamedShape::GetID(), aNewNS);
+    if (aNewNS->Evolution() == TNaming_MODIFY || aNewNS->Evolution() == TNaming_GENERATED) {
+      aResults.insert(aModifierObj);
+      TNaming_Iterator aPairIter(aNewNS);
+      aResContShapes.Append(aPairIter.NewShape());
+    } else if (aNewNS->Evolution() == TNaming_DELETE) { // a shape was deleted => result is empty
+      aResults.insert(ResultPtr());
+      aResContShapes.Append(TopoDS_Shape());
+    } else { // not-precessed modification => don't support it
+      continue;
+    }
+  }
+  if (aResults.empty())
+    return false; // no modifications found, must stay the same
+  // iterate all results to find futher modifications
+  std::set<ResultPtr>::iterator aResIter = aResults.begin();
+  TopTools_ListOfShape::Iterator aResShapes(aResContShapes);
+  for(; aResIter != aResults.end(); aResIter++, aResShapes.Next()) {
+    if (aResIter->get() != NULL) {
+      // compute new values by two contextes: the old and the new
+      TopTools_ListOfShape aValShapes;
+      computeValues(theContext, *aResIter, theValShape, aValShapes);
+
+      TopTools_ListIteratorOfListOfShape aNewVal(aValShapes);
+      for(; aNewVal.More(); aNewVal.Next()) {
+        std::list<ResultPtr> aNewRes;
+        TopTools_ListOfShape aNewUpdatedVal;
+        if (searchNewContext(theDoc, aResShapes.Value(), *aResIter, aNewVal.Value(),
+                             theAccessLabel, aNewRes, aNewUpdatedVal))
+        {
+          // appeand new results instead of the current ones
+          std::list<ResultPtr>::iterator aNewIter = aNewRes.begin();
+          TopTools_ListIteratorOfListOfShape aNewUpdVal(aNewUpdatedVal);
+          for(; aNewIter != aNewRes.end(); aNewIter++, aNewUpdVal.Next()) {
+            theResults.push_back(*aNewIter);
+            theValShapes.Append(aNewUpdVal.Value());
+          }
+        } else { // the current result is good
+          theResults.push_back(*aResIter);
+          theValShapes.Append(aNewVal.Value());
+        }
+      }
+    }
+  }
+  return true; // theResults must be empty: everything is deleted
+}
+
+void Model_AttributeSelection::updateInHistory()
+{
+  ResultPtr aContext = std::dynamic_pointer_cast<ModelAPI_Result>(myRef.value());
+  // only bodies may be modified later in the history, don't do anything otherwise
+  if (!aContext.get() || aContext->groupName() != ModelAPI_ResultBody::group())
+    return;
+  std::shared_ptr<Model_Data> aContData = std::dynamic_pointer_cast<Model_Data>(aContext->data());
+  if (!aContData.get() || !aContData->isValid())
+    return;
+  TDF_Label aContLab = aContData->label(); // named shape where the selected context is located
+  Handle(TNaming_NamedShape) aContNS;
+  if (!aContLab.FindAttribute(TNaming_NamedShape::GetID(), aContNS))
+    return;
+  std::shared_ptr<Model_Document> aDoc =
+    std::dynamic_pointer_cast<Model_Document>(aContext->document());
+  FeaturePtr aThisFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(owner());
+  FeaturePtr aCurrentModifierFeat = aDoc->feature(aContext);
+  // iterate the context shape modifications in order to find a feature that is upper in history
+  // that this one and is really modifies the referenced result to refer to it
+  ResultPtr aModifierResFound;
+  TNaming_Iterator aPairIter(aContNS);
+  if (!aPairIter.More())
+    return;
+  TopoDS_Shape aNewCShape = aPairIter.NewShape();
+  bool anIterate = true;
+  // trying to update also the sub-shape selected
+  GeomShapePtr aSubShape = value();
+  if (aSubShape.get() && aSubShape->isEqual(aContext->shape()))
+    aSubShape.reset();
+  TopoDS_Shape aValShape;
+  if (aSubShape.get()) {
+    aValShape = aSubShape->impl<TopoDS_Shape>();
+  }
+
+  std::list<ResultPtr> aNewContexts;
+  TopTools_ListOfShape aValShapes;
+  if (searchNewContext(aDoc, aNewCShape, aContext, aValShape, aContLab, aNewContexts, aValShapes))
+  {
+    // update scope to reset to a new one
+    myScope.Clear();
+
+    std::list<ResultPtr>::iterator aNewCont = aNewContexts.begin();
+    TopTools_ListIteratorOfListOfShape aNewValues(aValShapes);
+    if (aNewCont == aNewContexts.end()) { // all results were deleted
+      ResultPtr anEmptyContext;
+      std::shared_ptr<GeomAPI_Shape> anEmptyShape;
+      setValue(anEmptyContext, anEmptyShape); // nullify the selection
+      return;
+    }
+
+    GeomShapePtr aValueShape;
+    if (!aNewValues.Value().IsNull()) {
+      aValueShape = std::make_shared<GeomAPI_Shape>();
+      aValueShape->setImpl<TopoDS_Shape>(new TopoDS_Shape(aNewValues.Value()));
+    }
+    setValue(*aNewCont, aValueShape);
+    // if there are more than one result, put them by "append" into "parent" list
+    if (myParent) {
+      for(aNewCont++, aNewValues.Next(); aNewCont != aNewContexts.end(); aNewCont++, aNewValues.Next()) {
+        GeomShapePtr aValueShape;
+        if (!aNewValues.Value().IsNull()) {
+          aValueShape = std::make_shared<GeomAPI_Shape>();
+          aValueShape->setImpl<TopoDS_Shape>(new TopoDS_Shape(aNewValues.Value()));
+        }
+        myParent->append(*aNewCont, aValueShape);
+      }
+    }
+  }
+}
+
+void Model_AttributeSelection::setParent(Model_AttributeSelectionList* theParent)
+{
+  myParent = theParent;
+}