X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_AddMeshElementDlg.cxx;h=03ade25cb3965e7544d279adcf0a18e99f8d166b;hp=6df9978de5b4a4e68071c822a6815e20c9e9f7d0;hb=9357f5c87098aff2b95b754d69f66c76d2df9c24;hpb=48633271692b647b8b01eed5b6e0594f627b276c

diff --git a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx
index 6df9978de..03ade25cb 100644
--- a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,11 +19,12 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // SMESH SMESHGUI : GUI for SMESH component
 // File   : SMESHGUI_AddMeshElementDlg.cxx
 // Author : Nicolas REJNERI, Open CASCADE S.A.S.
-
 //  SMESH includes
+//
 #include "SMESHGUI_AddMeshElementDlg.h"
 
 #include "SMESHGUI.h"
@@ -429,6 +430,7 @@ void SMESHGUI_AddMeshElementDlg::Init()
 
   /* reset "Add to group" control */
   GroupGroups->setChecked( false );
+  GroupGroups->setVisible( myElementType != SMDSAbs_0DElement );
 
   myNbOkNodes = 0;
   myActor = 0;
@@ -481,6 +483,30 @@ void SMESHGUI_AddMeshElementDlg::ClickOnApply()
       else
         anArrayOfIndices[i] = aListId[ i ].toInt();
 
+    bool addToGroup = GroupGroups->isChecked();
+    QString aGroupName;
+
+    SMESH::SMESH_GroupBase_var aGroup;
+    int idx = 0;
+    if( addToGroup ) {
+      aGroupName = ComboBox_GroupName->currentText();
+      for ( int i = 1; i < ComboBox_GroupName->count(); i++ ) {
+	QString aName = ComboBox_GroupName->itemText( i );
+	if ( aGroupName == aName && ( i == ComboBox_GroupName->currentIndex() || idx == 0 ) )
+	  idx = i;
+      }
+      if ( idx > 0 ) {
+	SMESH::SMESH_GroupOnGeom_var aGeomGroup = SMESH::SMESH_GroupOnGeom::_narrow( myGroups[idx-1] );
+	if ( !aGeomGroup->_is_nil() ) {
+	  int res = SUIT_MessageBox::question( this, tr( "SMESH_WRN_WARNING" ),
+					       tr( "MESH_STANDALONE_GRP_CHOSEN" ).arg( aGroupName ),
+					       tr( "SMESH_BUT_YES" ), tr( "SMESH_BUT_NO" ), 0, 1 );
+	  if ( res == 1 ) return;
+	}
+	aGroup = myGroups[idx-1];
+      }
+    }
+
     long anElemId = -1;
     SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor();
     switch (myElementType) {
@@ -497,34 +523,37 @@ void SMESHGUI_AddMeshElementDlg::ClickOnApply()
     }
     case SMDSAbs_Volume:
       anElemId = aMeshEditor->AddVolume(anArrayOfIndices.inout()); break;
-    default:;
+    default: break;
     }
 
-    if( anElemId != -1 && GroupGroups->isChecked() ) {
-      SMESH::SMESH_Group_var aGroup;
-      QString aGroupName = ComboBox_GroupName->currentText();
-      SMESH::ListOfGroups aListOfGroups = *myMesh->GetGroups();
-      for( int i = 0, n = aListOfGroups.length(); i < n; i++ ) {
-        SMESH::SMESH_GroupBase_var aGroupBase = aListOfGroups[i];
-        if( !aGroupBase->_is_nil() ) {
-          SMESH::SMESH_Group_var aRefGroup = SMESH::SMESH_Group::_narrow( aGroupBase );
-          if( !aRefGroup->_is_nil() ) {
-            QString aRefGroupName( aRefGroup->GetName() );
-            if( aRefGroupName == aGroupName ) {
-              aGroup = aRefGroup; // // add node to existing group
-              break;
-            }
-          }
-        }
+    if ( anElemId != -1 && addToGroup && !aGroupName.isEmpty() ) {
+      SMESH::SMESH_Group_var aGroupUsed;
+      if ( aGroup->_is_nil() ) {
+	// create new group 
+	aGroupUsed = SMESH::AddGroup( myMesh, (SMESH::ElementType)myElementType, aGroupName );
+	if ( !aGroupUsed->_is_nil() ) {
+	  myGroups.append(SMESH::SMESH_GroupBase::_duplicate(aGroupUsed));
+	  ComboBox_GroupName->addItem( aGroupName );
+	}
+      }
+      else {
+	SMESH::SMESH_GroupOnGeom_var aGeomGroup = SMESH::SMESH_GroupOnGeom::_narrow( aGroup );
+	if ( !aGeomGroup->_is_nil() ) {
+	  aGroupUsed = myMesh->ConvertToStandalone( aGeomGroup );
+	  if ( !aGroupUsed->_is_nil() && idx > 0 ) {
+	    myGroups[idx-1] = SMESH::SMESH_GroupBase::_duplicate(aGroupUsed);
+	    SMESHGUI::GetSMESHGUI()->getApp()->updateObjectBrowser();
+	  }
+	}
+	else
+	  aGroupUsed = SMESH::SMESH_Group::_narrow( aGroup );
       }
-      if( aGroup->_is_nil() ) // create new group
-        aGroup = SMESH::AddGroup( myMesh, (SMESH::ElementType)myElementType, aGroupName );
 
-      if( !aGroup->_is_nil() ) {
+      if ( !aGroupUsed->_is_nil() ) {
         SMESH::long_array_var anIdList = new SMESH::long_array;
         anIdList->length( 1 );
         anIdList[0] = anElemId;
-        aGroup->Add( anIdList.inout() );
+        aGroupUsed->Add( anIdList.inout() );
       }
     }
 
@@ -697,18 +726,18 @@ void SMESHGUI_AddMeshElementDlg::SelectionIntoArgument()
 
   // process groups
   if ( !myMesh->_is_nil() && myEntry != aCurrentEntry ) {
+    myGroups.clear();
     ComboBox_GroupName->clear();
     ComboBox_GroupName->addItem( QString() );
     SMESH::ListOfGroups aListOfGroups = *myMesh->GetGroups();
     for ( int i = 0, n = aListOfGroups.length(); i < n; i++ ) {
-      SMESH::SMESH_GroupBase_var aGroupBase = aListOfGroups[i];
-      if ( !aGroupBase->_is_nil() && aGroupBase->GetType() == (SMESH::ElementType)myElementType ) {
-        SMESH::SMESH_Group_var aGroup = SMESH::SMESH_Group::_narrow( aGroupBase );
-        if ( !aGroup->_is_nil() ) {
-          QString aGroupName( aGroup->GetName() );
-          if ( !aGroupName.isEmpty() )
-            ComboBox_GroupName->addItem( aGroupName );
-        }
+      SMESH::SMESH_GroupBase_var aGroup = aListOfGroups[i];
+      if ( !aGroup->_is_nil() && aGroup->GetType() == (SMESH::ElementType)myElementType ) {
+	QString aGroupName( aGroup->GetName() );
+	if ( !aGroupName.isEmpty() ) {
+	  myGroups.append(SMESH::SMESH_GroupBase::_duplicate(aGroup));
+	  ComboBox_GroupName->addItem( aGroupName );
+	}
       }
     }
   }