Correction of selection for Comp Solids

diff --git a/src/ModuleBase/ModuleBase_ResultPrs.cpp b/src/ModuleBase/ModuleBase_ResultPrs.cpp
index f7f360422b244a5d9320c29295624c15bb5faee5..ed92d8eb3c34ca2797aa22c8339e56310336ccfc 100755 (executable)
--- a/src/ModuleBase/ModuleBase_ResultPrs.cpp
+++ b/src/ModuleBase/ModuleBase_ResultPrs.cpp
@@ -23,6 +23,7 @@
 #include <StdPrs_WFDeflectionShape.hxx>
 #include <StdSelect_BRepSelectionTool.hxx>
 #include <AIS_InteractiveContext.hxx>
+#include <AIS_Selection.hxx>
 #include <TColStd_ListIteratorOfListOfInteger.hxx>
 
 
@@ -62,7 +63,7 @@ ModuleBase_ResultPrs::ModuleBase_ResultPrs(ResultPtr theResult)
 
   // Activate individual repaintng if this is a part of compsolid
   ResultCompSolidPtr aCompSolid = ModelAPI_Tools::compSolidOwner(myResult);
-  SetAutoHilight(aCompSolid.get() == NULL);
+  //SetAutoHilight(aCompSolid.get() == NULL);
 }
 
 
@@ -183,8 +184,8 @@ TopoDS_Shape ModuleBase_ResultPrs::getSelectionShape() const
 void ModuleBase_ResultPrs::HilightSelected(const Handle(PrsMgr_PresentationManager3d)& thePM, 
                                            const SelectMgr_SequenceOfOwner& theOwners)
 {
-  TopoDS_Shape aShape = getSelectionShape();
-  if (!aShape.IsNull()) {
+  if (hasCompSolidSelectionMode()) {
+    TopoDS_Shape aShape = getSelectionShape();
     Handle( Prs3d_Presentation ) aSelectionPrs = GetSelectPresentation( thePM );
     aSelectionPrs->Clear();
 
@@ -194,6 +195,15 @@ void ModuleBase_ResultPrs::HilightSelected(const Handle(PrsMgr_PresentationManag
     aSelectionPrs->Highlight(Aspect_TOHM_COLOR, aSelectionPrs->HighlightColor());
     aSelectionPrs->Display();
     thePM->Highlight(this);
+  } else {
+    Handle(SelectMgr_EntityOwner) anOwner;
+    for (int i = 1; i <= theOwners.Length(); i++) {
+      anOwner = theOwners.Value(i);
+      if (!anOwner->IsSelected()) { // anOwner is not selected
+        anOwner->SetSelected(true);
+        AIS_Selection::Select(anOwner);
+      }
+    }
   }
 }