Merge from V6_3_BR 06/06/2011

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

diff --git a/src/SMESHGUI/SMESHGUI_MergeDlg.cxx b/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
index 26922e93dfd085e9ca0370d70c97b11daca5e679..7a7b0fa9ee4716b61838fe9c2040686ccac1243b 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_MergeDlg.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
@@ -804,15 +804,15 @@ void SMESHGUI_MergeDlg::onDetect()
     switch (myAction) {
     case 0 :
       for ( int i = 0; GroupExclude->isChecked() && i < ListExclude->count(); i++ ) {
-       if ( ListExclude->item( i )->checkState() == Qt::Checked ) {
-         aExcludeGroups->length( aExcludeGroups->length()+1 );
-         aExcludeGroups[ aExcludeGroups->length()-1 ] = SMESH::SMESH_IDSource::_duplicate( myGroups[i] );
-       }
+        if ( ListExclude->item( i )->checkState() == Qt::Checked ) {
+          aExcludeGroups->length( aExcludeGroups->length()+1 );
+          aExcludeGroups[ aExcludeGroups->length()-1 ] = SMESH::SMESH_IDSource::_duplicate( myGroups[i] );
+        }
       }
       aMeshEditor->FindCoincidentNodesOnPartBut(src.in(),
-                                               SpinBoxTolerance->GetValue(), 
-                                               aGroupsArray.out(),
-                                               aExcludeGroups.in());
+                                                SpinBoxTolerance->GetValue(), 
+                                                aGroupsArray.out(),
+                                                aExcludeGroups.in());
       break;
     case 1 :
       aMeshEditor->FindEqualElements(src.in(), aGroupsArray.out());
@@ -1155,17 +1155,17 @@ void SMESHGUI_MergeDlg::SelectionIntoArgument()
       ListExclude->clear();
       SMESH::ListOfGroups_var aListOfGroups = myMesh->GetGroups();
       for( int i = 0, n = aListOfGroups->length(); i < n; i++ ) {
-       SMESH::SMESH_GroupBase_var aGroup = aListOfGroups[i];
-       if ( !aGroup->_is_nil() ) { // && aGroup->GetType() == SMESH::NODE
-         QString aGroupName( aGroup->GetName() );
-         if ( !aGroupName.isEmpty() ) {
-           myGroups.append(SMESH::SMESH_GroupBase::_duplicate(aGroup));
-           QListWidgetItem* item = new QListWidgetItem( aGroupName );
-           item->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable );
-           item->setCheckState( Qt::Unchecked );
-           ListExclude->addItem( item );
-         }
-       }
+        SMESH::SMESH_GroupBase_var aGroup = aListOfGroups[i];
+        if ( !aGroup->_is_nil() ) { // && aGroup->GetType() == SMESH::NODE
+          QString aGroupName( aGroup->GetName() );
+          if ( !aGroupName.isEmpty() ) {
+            myGroups.append(SMESH::SMESH_GroupBase::_duplicate(aGroup));
+            QListWidgetItem* item = new QListWidgetItem( aGroupName );
+            item->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable );
+            item->setCheckState( Qt::Unchecked );
+            ListExclude->addItem( item );
+          }
+        }
       }
     }