[bos #32774] [CEA 32488] Selecting multiple faces with "Supress Faces"

Update selection in Suppress Faces algorithm.

diff --git a/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx b/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx
index 87094bd1ddcdc1ba9aa02987af995d6c31f72d9f..ebe6eed62e526485d3aca418b34ac11acf41ecaa 100644 (file)
--- a/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx
+++ b/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx
@@ -218,6 +218,7 @@ void RepairGUI_SuppressFacesDlg::SelectionIntoArgument()
       TopoDS_Shape aMainShape = GEOM_Client::get_client().GetShape(GeometryGUI::GetGeomGen(), myObject);
       TopExp::MapShapes(aMainShape, aMainMap);
 
+      SALOME_ListIO aSelListToShow;
       SALOME_ListIteratorOfListIO anIter (aSelList);
       for (int i = 0; anIter.More(); anIter.Next(), i++) {
         Handle(SALOME_InteractiveObject) anIO = anIter.Value();
@@ -231,17 +232,28 @@ void RepairGUI_SuppressFacesDlg::SelectionIntoArgument()
         if (GEOMBase::GetShape(aGeomObj, aShape)) {
           if (aGeomObj->GetType() == GEOM_GROUP || aShape.ShapeType() == TopAbs_FACE) {
             TopExp_Explorer anExp (aShape, TopAbs_FACE);
+            bool isInside = false;
             for (; anExp.More(); anExp.Next()) {
               TopoDS_Shape aSubShape = anExp.Current();
               int anIndex = aMainMap.FindIndex(aSubShape);
-              if (anIndex >= 0) {
+              if (anIndex > 0) {
                 aMap.Add(anIndex);
                 anIds.Add(anIndex);
+                isInside = true;
+                aSelListToShow.Append(anIO);
               }
             }
+            if (!isInside)
+            {
+              disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
+              aSelMgr->AddOrRemoveIndex(anIO, anIds, false);
+              connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+                      this, SLOT(SelectionIntoArgument()));
+            }
           }
         }
       }
+
       if (!aMap.IsEmpty()) {
         // highlight local faces, correspondent to OB selection
         disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
@@ -255,6 +267,11 @@ void RepairGUI_SuppressFacesDlg::SelectionIntoArgument()
 
         aSelMgr->AddOrRemoveIndex(aSh->getIO(), anIds, false);
 
+        SALOME_ListIteratorOfListIO anIter(aSelListToShow);
+        for (; anIter.More(); anIter.Next()) {
+          aSelMgr->AddOrRemoveIndex(anIter.Value(), anIds, false);
+        }
+
         connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
                 this, SLOT(SelectionIntoArgument()));
       }