X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_AddMeshElementDlg.cxx;h=0de69046ad5285ebdf416e6208cbbdd9b1d9888e;hb=493747e8ea338a2d88204a5f12ba924d72ecbb5b;hp=a5d12e55906dd937cf49d230fb55715f3054164a;hpb=3a401076892f2f372c58a07199e36486a6c5c9af;p=modules%2Fsmesh.git

diff --git a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx
index a5d12e559..0de69046a 100644
--- a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx
@@ -1,23 +1,23 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2011  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
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  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
@@ -243,7 +243,8 @@ SMESHGUI_AddMeshElementDlg::SMESHGUI_AddMeshElementDlg( SMESHGUI* theModule,
                                                         int nbNodes )
   : QDialog( SMESH::GetDesktop( theModule ) ),
     mySMESHGUI( theModule ),
-    mySelectionMgr( SMESH::GetSelectionMgr( theModule ) )
+    mySelectionMgr( SMESH::GetSelectionMgr( theModule ) ),
+    myBusy ( false )
 {
   setModal( false );
   setAttribute( Qt::WA_DeleteOnClose, true );
@@ -371,6 +372,7 @@ SMESHGUI_AddMeshElementDlg::SMESHGUI_AddMeshElementDlg( SMESHGUI* theModule,
   TextLabel_GroupName = new QLabel( tr( "SMESH_GROUP" ), GroupGroups );
   ComboBox_GroupName = new QComboBox( GroupGroups );
   ComboBox_GroupName->setEditable( true );
+  ComboBox_GroupName->setInsertPolicy( QComboBox::NoInsert );
 
   GroupGroupsLayout->addWidget( TextLabel_GroupName );
   GroupGroupsLayout->addWidget( ComboBox_GroupName, 1 );
@@ -492,19 +494,19 @@ void SMESHGUI_AddMeshElementDlg::ClickOnApply()
     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;
+        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];
+      if ( idx > 0 && idx < myGroups.count() ) {
+        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];
       }
     }
 
@@ -530,24 +532,24 @@ void SMESHGUI_AddMeshElementDlg::ClickOnApply()
     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 );
-	}
+        // 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 );
+        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 ( !aGroupUsed->_is_nil() ) {
@@ -736,11 +738,11 @@ void SMESHGUI_AddMeshElementDlg::SelectionIntoArgument()
     for ( int i = 0, n = aListOfGroups.length(); i < n; i++ ) {
       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 );
-	}
+        QString aGroupName( aGroup->GetName() );
+        if ( !aGroupName.isEmpty() ) {
+          myGroups.append(SMESH::SMESH_GroupBase::_duplicate(aGroup));
+          ComboBox_GroupName->addItem( aGroupName );
+        }
       }
     }
   }