Update copyright info (2010->2011)

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

diff --git a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx
index 03ade25cb3965e7544d279adcf0a18e99f8d166b..d784b38d51f5056b9afa1d8a3cf7049690b1704d 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx
@@ -1,4 +1,4 @@
-//  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
@@ -447,6 +447,7 @@ void SMESHGUI_AddMeshElementDlg::Init()
   connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), SLOT(SelectionIntoArgument()));
   /* to close dialog if study frame change */
   connect(mySMESHGUI, SIGNAL (SignalStudyFrameChanged()), SLOT(ClickOnCancel()));
+  connect(mySMESHGUI, SIGNAL (SignalCloseAllDialogs()), SLOT(ClickOnCancel()));    
 
   if (Reverse)
     connect(Reverse, SIGNAL(stateChanged(int)), SLOT(CheckBox(int)));
@@ -491,19 +492,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];
+        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];
       }
     }
 
@@ -529,24 +530,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() ) {
@@ -570,6 +571,8 @@ void SMESHGUI_AddMeshElementDlg::ClickOnApply()
     myEditCurrentArgument->setText("");
 
     myBusy = false;
+
+    SMESHGUI::Modified();
   }
 }
 
@@ -733,11 +736,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 );
+        }
       }
     }
   }