0020317: EDF SMESH 1004: "Edit group" changes the name of the group

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_GroupDlg.cxx

diff --git a/src/SMESHGUI/SMESHGUI_GroupDlg.cxx b/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
index 1fbdabfad59f94b6d3a1fe2f3971efa80b47821b..24246eec6491fef2abead7bca158318204ba99af 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
@@ -19,11 +19,11 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //

-// SMESH SMESHGUI : GUI for SMESH component
-// File   : SMESHGUI_GroupDlg.cxx
-// Author : Natalia KOPNOVA, Open CASCADE S.A.S.
-// SMESH includes
-//
+//  SMESH SMESHGUI : GUI for SMESH component
+//  File   : SMESHGUI_GroupDlg.cxx
+//  Author : Natalia KOPNOVA, Open CASCADE S.A.S.
+//  SMESH includes
+

 #include "SMESHGUI_GroupDlg.h"
 
 #include "SMESHGUI.h"
 #include "SMESHGUI_GroupDlg.h"
 
 #include "SMESHGUI.h"


@@ -592,7 +592,7 @@ void SMESHGUI_GroupDlg::init (SMESH::SMESH_GroupBase_ptr theGroup,
     myGeomGroupLine->setText( aShapeName );
     myNameChanged = true;
     myName->blockSignals(true);
     myGeomGroupLine->setText( aShapeName );
     myNameChanged = true;
     myName->blockSignals(true);

-    myName->setText( "Group On " + aShapeName);
+    myName->setText(theGroup->GetName());

     myName->blockSignals(false);
   }
   updateButtons();
     myName->blockSignals(false);
   }
   updateButtons();


@@ -2206,7 +2206,7 @@ bool SMESHGUI_GroupDlg::SetAppropriateActor()
       // any visible actor, that belongs to group or submesh of current mesh
       vtkActorCollection *aCollection = aViewWindow->getRenderer()->GetActors();
       int nbItems = aCollection->GetNumberOfItems();
       // any visible actor, that belongs to group or submesh of current mesh
       vtkActorCollection *aCollection = aViewWindow->getRenderer()->GetActors();
       int nbItems = aCollection->GetNumberOfItems();

-      for (int i=0; i<nbItems; i++)
+      for (int i=0; i<nbItems && !isActor; i++)

       {
         SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(aCollection->GetItemAsObject(i));
         if (anActor && anActor->hasIO()) {
       {
         SMESH_Actor *anActor = dynamic_cast<SMESH_Actor*>(aCollection->GetItemAsObject(i));
         if (anActor && anActor->hasIO()) {