From aa5aaf1a3b7b8c9d7d6b61499c5386cc1430bc2a Mon Sep 17 00:00:00 2001
From: vsv <vsv@opencascade.com>
Date: Wed, 29 May 2019 10:22:35 +0300
Subject: [PATCH] Issue #2913: Make selectable original shape instead of
 substituting compound

---
 src/ModuleBase/ModuleBase_ResultPrs.cpp | 56 +++++++++++++++++--------
 src/ModuleBase/ModuleBase_ResultPrs.h   |  7 ++++
 src/XGUI/XGUI_Selection.cpp             | 10 ++++-
 3 files changed, 55 insertions(+), 18 deletions(-)

diff --git a/src/ModuleBase/ModuleBase_ResultPrs.cpp b/src/ModuleBase/ModuleBase_ResultPrs.cpp
index 11ab42dc6..281f8e36c 100644
--- a/src/ModuleBase/ModuleBase_ResultPrs.cpp
+++ b/src/ModuleBase/ModuleBase_ResultPrs.cpp
@@ -64,7 +64,7 @@ IMPLEMENT_STANDARD_RTTIEXT(ModuleBase_ResultPrs, ViewerData_AISShape);
 //********************************************************************
 ModuleBase_ResultPrs::ModuleBase_ResultPrs(ResultPtr theResult)
   : ViewerData_AISShape(TopoDS_Shape()), myResult(theResult), myAdditionalSelectionPriority(0),
-  myTransparency(1)
+  myTransparency(1), myIsSubstituted(false)
 {
   std::shared_ptr<GeomAPI_Shape> aShapePtr = ModelAPI_Tools::shape(theResult);
   TopoDS_Shape aShape = aShapePtr->impl<TopoDS_Shape>();
@@ -150,30 +150,44 @@ bool ModuleBase_ResultPrs::setSubShapeHidden(const NCollection_List<TopoDS_Shape
   TopoDS_Compound aCompound;
   BRep_Builder aBBuilder;
   aBBuilder.MakeCompound (aCompound);
+
+  TopoDS_Compound aShownComp;
+  if (myIsSubstituted)
+    aShownComp = TopoDS::Compound(Shape());
+
   // restore hidden shapes if there are not the shapes in parameter container
   NCollection_List<TopoDS_Shape> aVisibleSubShapes;
-  for (NCollection_List<TopoDS_Shape>::Iterator aHiddenIt(myHiddenSubShapes); aHiddenIt.More();
-       aHiddenIt.Next()) {
-    if (!theShapes.Contains(aHiddenIt.Value()))
+  NCollection_List<TopoDS_Shape>::Iterator aHiddenIt(myHiddenSubShapes);
+  for (; aHiddenIt.More(); aHiddenIt.Next()) {
+    if (!theShapes.Contains(aHiddenIt.Value())) {
       aVisibleSubShapes.Append(aHiddenIt.Value());
-    else
-      aBBuilder.Add (aCompound, aHiddenIt.Value());
+    }
+    else {
+      aBBuilder.Add(aCompound, aHiddenIt.Value());
+      if (!aShownComp.IsNull())
+        aBBuilder.Remove(aShownComp, aHiddenIt.Value());
+    }
   }
   isModified = !aVisibleSubShapes.IsEmpty();
-  for (NCollection_List<TopoDS_Shape>::Iterator aVisibleIt(aVisibleSubShapes); aVisibleIt.More();
-       aVisibleIt.Next())
-    myHiddenSubShapes.Remove(aVisibleIt.Value());
-
+  NCollection_List<TopoDS_Shape>::Iterator aVisibleIt(aVisibleSubShapes);
+  for (; aVisibleIt.More(); aVisibleIt.Next()) {
+    if (myHiddenSubShapes.Contains(aVisibleIt.Value())) {
+      myHiddenSubShapes.Remove(aVisibleIt.Value());
+      if (!aShownComp.IsNull())
+        aBBuilder.Add(aShownComp, aVisibleIt.Value());
+    }
+  }
   // append hidden shapes into internal container if there are not these shapes
-  for (NCollection_List<TopoDS_Shape>::Iterator aShapeIt(theShapes); aShapeIt.More();
-    aShapeIt.Next())
-  {
+  NCollection_List<TopoDS_Shape>::Iterator aShapeIt(theShapes);
+  for (; aShapeIt.More(); aShapeIt.Next()) {
     if (aShapeIt.Value().ShapeType() != TopAbs_FACE) // only face shape can be hidden
       continue;
 
     if (!myHiddenSubShapes.Contains(aShapeIt.Value())) {
       myHiddenSubShapes.Append(aShapeIt.Value());
       aBBuilder.Add (aCompound, aShapeIt.Value());
+      if (!aShownComp.IsNull())
+        aBBuilder.Remove(aShownComp, aShapeIt.Value());
       isModified = true;
     }
   }
@@ -236,16 +250,24 @@ void ModuleBase_ResultPrs::Compute(
   if (aReadyToDisplay) {
     myOriginalShape = aShapePtr->impl<TopoDS_Shape>();
     if (myHiddenSubShapes.IsEmpty() || myOriginalShape.ShapeType() > TopAbs_FACE ) {
-      if (!myOriginalShape.IsNull())
+      if (!myOriginalShape.IsNull()) {
         Set(myOriginalShape);
+        myIsSubstituted = false;
+      }
     }
     else { // convert shape into SHELL
       TopoDS_Compound aCompound;
-      BRep_Builder aBuilder;
-      aBuilder.MakeCompound (aCompound);
-      collectSubShapes(aBuilder, aCompound, myOriginalShape, myHiddenSubShapes);
+      if (!myIsSubstituted) {
+        BRep_Builder aBuilder;
+        aBuilder.MakeCompound(aCompound);
+        collectSubShapes(aBuilder, aCompound, myOriginalShape, myHiddenSubShapes);
+      }
+      else {
+        aCompound = TopoDS::Compound(Shape());
+      }
       bool isEmptyShape = BOPTools_AlgoTools3D::IsEmptyShape(aCompound);
       Set(aCompound);
+      myIsSubstituted = true;
       if (isEmptyShape)
         aReadyToDisplay = false;
     }
diff --git a/src/ModuleBase/ModuleBase_ResultPrs.h b/src/ModuleBase/ModuleBase_ResultPrs.h
index 5faaadf2b..f1ad5e1a0 100644
--- a/src/ModuleBase/ModuleBase_ResultPrs.h
+++ b/src/ModuleBase/ModuleBase_ResultPrs.h
@@ -107,6 +107,11 @@ public:
   /// \return false if parameter is out of [0, 1]
   Standard_EXPORT bool setHiddenSubShapeTransparency(double theTransparency);
 
+  Standard_EXPORT TopoDS_Shape originalShape() const { return myOriginalShape; }
+
+  Standard_EXPORT bool isSubstituted() const { return myIsSubstituted; }
+
+
   DEFINE_STANDARD_RTTIEXT(ModuleBase_ResultPrs, ViewerData_AISShape)
 
 protected:
@@ -149,6 +154,8 @@ private:
   /// Original shape of the result object
   TopoDS_Shape myOriginalShape;
 
+  bool myIsSubstituted;
+
   /// Container of original Shape sub shape to be hidden and not selectable
   NCollection_List<TopoDS_Shape> myHiddenSubShapes;
   TopoDS_Compound myHiddenCompound; /// compound of hidden sub shapes
diff --git a/src/XGUI/XGUI_Selection.cpp b/src/XGUI/XGUI_Selection.cpp
index 9e29e8b1b..09c0c1fcd 100644
--- a/src/XGUI/XGUI_Selection.cpp
+++ b/src/XGUI/XGUI_Selection.cpp
@@ -205,9 +205,17 @@ void XGUI_Selection::fillPresentation(ModuleBase_ViewerPrsPtr& thePrs,
   // for one feature
   Handle(StdSelect_BRepOwner) aBRO = Handle(StdSelect_BRepOwner)::DownCast(theOwner);
   if( !aBRO.IsNull() && aBRO->HasShape() ) {
+    TopoDS_Shape aShape = aBRO->Shape();
+    Handle(ModuleBase_ResultPrs) aPrsObj = Handle(ModuleBase_ResultPrs)::DownCast(aBRO->Selectable());
+    if (!aPrsObj.IsNull()) {
+      if (aPrsObj->isSubstituted()) {
+        if (aPrsObj->Shape().IsSame(aShape))
+          aShape = aPrsObj->originalShape();
+      }
+    }
     // the located method is called in the context to obtain the shape by the SelectedShape()
     // method, so the shape is located by the same rules
-    TopoDS_Shape aShape = aBRO->Shape().Located (aBRO->Location() * aBRO->Shape().Location());
+    aShape = aShape.Located(aBRO->Location() * aShape.Location());
 #ifdef BEFORE_TRIHEDRON_PATCH
 #ifndef DEBUG_DELIVERY
     if (aShape.IsNull())
-- 
2.30.2