X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_DuplicateNodesDlg.cxx;h=36ba427de29c88dbe49e7d47affbc9e539a586cd;hb=d502285de5fe37ccf721ee1841f833f516e7cee5;hp=a512786872ff380f4ec34a6d6364e468ec86d729;hpb=e30e3628ce1c7687b6e462e793c9e402684811e1;p=modules%2Fsmesh.git diff --git a/src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.cxx b/src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.cxx index a51278687..36ba427de 100644 --- a/src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.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 @@ -346,16 +346,16 @@ bool SMESHGUI_DuplicateNodesDlg::onApply() SMESH::ListOfGroups_var g1 = new SMESH::ListOfGroups(); g1->length( myGroups1.count() ); for ( int i = 0; i < myGroups1.count(); i++ ) - g1[i] = myGroups1[i]; + g1[i] = myGroups1[i]; SMESH::ListOfGroups_var g2 = new SMESH::ListOfGroups(); g2->length( myGroups2.count() ); for ( int i = 0; i < myGroups2.count(); i++ ) - g2[i] = myGroups2[i]; + g2[i] = myGroups2[i]; if ( toCreateGroup ) { SMESH::SMESH_GroupBase_var aNewGroup = aMeshEditor->DoubleNodeGroupsNew( g1.in(), g2.in() ); - result = !CORBA::is_nil( aNewGroup ); + result = !CORBA::is_nil( aNewGroup ); } else { result = aMeshEditor->DoubleNodeGroups( g1.in(), g2.in() ); @@ -365,20 +365,20 @@ bool SMESHGUI_DuplicateNodesDlg::onApply() SMESH::ListOfGroups_var g1 = new SMESH::ListOfGroups(); g1->length( myGroups1.count() ); for ( int i = 0; i < myGroups1.count(); i++ ) - g1[i] = myGroups1[i]; + g1[i] = myGroups1[i]; SMESH::ListOfGroups_var g2 = new SMESH::ListOfGroups(); g2->length( myGroups2.count() ); for ( int i = 0; i < myGroups2.count(); i++ ) - g2[i] = myGroups2[i]; + g2[i] = myGroups2[i]; SMESH::ListOfGroups_var g3 = new SMESH::ListOfGroups(); g3->length( myGroups3.count() ); for ( int i = 0; i < myGroups3.count(); i++ ) - g3[i] = myGroups3[i]; + g3[i] = myGroups3[i]; if ( toCreateGroup ) { SMESH::SMESH_GroupBase_ptr aNewGroup = aMeshEditor->DoubleNodeElemGroupsNew( g1.in(), g2.in(), g3.in() ); - result = !CORBA::is_nil( aNewGroup ); + result = !CORBA::is_nil( aNewGroup ); } else { result = aMeshEditor->DoubleNodeElemGroups( g1.in(), g2.in(), g3.in() ); @@ -446,7 +446,7 @@ void SMESHGUI_DuplicateNodesDlg::onSelectionChanged() SALOME_ListIO aList; mySelectionMgr->selectedObjects( aList ); - int aNbSel = aList.Extent(); + //int aNbSel = aList.Extent(); QList aGroups; @@ -467,14 +467,14 @@ void SMESHGUI_DuplicateNodesDlg::onSelectionChanged() if ( ok ) { SMESH::ElementType aGroupType = aGroup->GetType(); if ( operationMode == 0 ) { - ok = ( myCurrentLineEdit == myLineEdit1 && aGroupType == SMESH::NODE ) || - ( myCurrentLineEdit == myLineEdit2 && aGroupType != SMESH::NODE ); + ok = ( myCurrentLineEdit == myLineEdit1 && aGroupType == SMESH::NODE ) || + ( myCurrentLineEdit == myLineEdit2 && aGroupType != SMESH::NODE ); } else { - ok = ( myCurrentLineEdit == myLineEdit1 && ( aGroupType == SMESH::EDGE || - aGroupType == SMESH::FACE ) ) || - ( myCurrentLineEdit == myLineEdit2 && aGroupType == SMESH::NODE ) || - ( myCurrentLineEdit == myLineEdit3 && aGroupType != SMESH::NODE ); + ok = ( myCurrentLineEdit == myLineEdit1 && ( aGroupType == SMESH::EDGE || + aGroupType == SMESH::FACE ) ) || + ( myCurrentLineEdit == myLineEdit2 && aGroupType == SMESH::NODE ) || + ( myCurrentLineEdit == myLineEdit3 && aGroupType != SMESH::NODE ); } } if ( ok ) aGroups << aGroup; @@ -488,7 +488,7 @@ void SMESHGUI_DuplicateNodesDlg::onSelectionChanged() else if ( myCurrentLineEdit == myLineEdit2 ) myGroups2 = aGroups; else if ( myCurrentLineEdit == myLineEdit3 ) myGroups3 = aGroups; myCurrentLineEdit->setText( aGroups.count() == 1 ? aGroups[0]->GetName() : - QObject::tr( "SMESH_OBJECTS_SELECTED" ).arg( aGroups.count() ) ); + QObject::tr( "SMESH_OBJECTS_SELECTED" ).arg( aGroups.count() ) ); } else { if ( myCurrentLineEdit == myLineEdit1 ) myGroups1.clear();