X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_AddQuadraticElementDlg.cxx;h=94819e6cebac9dc8511d130e7d7a3821b6ee0b2c;hp=5628a3482dfd79cb2f88390f005216a97df5033d;hb=14fc167a5302d96f900352c52688462298b0d4c0;hpb=b737ae98e6450e491ba13c6517858c279da77551 diff --git a/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx b/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx index 5628a3482..94819e6ce 100644 --- a/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2014 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 @@ -6,7 +6,7 @@ // 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. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -933,41 +933,37 @@ void SMESHGUI_AddQuadraticElementDlg::SelectionIntoArgument() QString aCurrentEntry = myEntry; + // clear + myActor = 0; if ( myCurrentLineEdit ) - { - // clear - myActor = 0; - myCurrentLineEdit->setText(""); - if (!GroupButtons->isEnabled()) // inactive - return; - - mySimulation->SetVisibility(false); - - // get selected mesh - SALOME_ListIO aList; - mySelectionMgr->selectedObjects(aList); + if (!GroupButtons->isEnabled()) // inactive + return; - if (aList.Extent() != 1) - { - UpdateTable(); - updateButtons(); - return; - } + mySimulation->SetVisibility(false); - Handle(SALOME_InteractiveObject) anIO = aList.First(); - myEntry = anIO->getEntry(); - myMesh = SMESH::GetMeshByIO(anIO); - if (myMesh->_is_nil()) { - updateButtons(); - return; - } + // get selected mesh + SALOME_ListIO aList; + mySelectionMgr->selectedObjects(aList); - myActor = SMESH::FindActorByEntry(anIO->getEntry()); + if (aList.Extent() != 1) + { + UpdateTable(); + updateButtons(); + return; + } + Handle(SALOME_InteractiveObject) anIO = aList.First(); + myEntry = anIO->getEntry(); + myMesh = SMESH::GetMeshByIO(anIO); + if (myMesh->_is_nil()) { + updateButtons(); + return; } + myActor = SMESH::FindActorByEntry(anIO->getEntry()); + // process groups if ( !myMesh->_is_nil() && myEntry != aCurrentEntry ) { SMESH::ElementType anElementType;