X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_ScaleDlg.cxx;h=1e3cd9f9542c7f6720342feee0dd965690519897;hb=7881caca4efdd7b7416025b66e58c453b650a4d6;hp=6934532cd43fa7e630ddff9b22142fa65a904acb;hpb=790c5cfa903e3b809e6bd5b7aefed48d17f15dc5;p=modules%2Fsmesh.git diff --git a/src/SMESHGUI/SMESHGUI_ScaleDlg.cxx b/src/SMESHGUI/SMESHGUI_ScaleDlg.cxx index 6934532cd..1e3cd9f95 100644 --- a/src/SMESHGUI/SMESHGUI_ScaleDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_ScaleDlg.cxx @@ -1,22 +1,21 @@ -// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// 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 // File : SMESHGUI_ScaleDlg.cxx // Author : Michael ZORIN, Open CASCADE S.A.S. // SMESH includes @@ -476,6 +475,9 @@ bool SMESHGUI_ScaleDlg::ClickOnApply() try { SUIT_OverrideCursor aWaitCursor; SMESH::SMESH_MeshEditor_var aMeshEditor = myMesh->GetMeshEditor(); + + myMesh->SetParameters( aParameters.join(":").toLatin1().constData() ); + SMESH::SMESH_IDSource_var obj; if ( CheckBoxMesh->isChecked() ) obj = mySelectedObject; @@ -486,8 +488,6 @@ bool SMESHGUI_ScaleDlg::ClickOnApply() case MOVE_ELEMS_BUTTON: aMeshEditor->Scale(obj, aPoint, aScaleFact, false); - if( !myMesh->_is_nil()) - myMesh->SetParameters( aParameters.join(":").toLatin1().constData() ); break; case COPY_ELEMS_BUTTON: @@ -496,8 +496,6 @@ bool SMESHGUI_ScaleDlg::ClickOnApply() aMeshEditor->ScaleMakeGroups(obj, aPoint, aScaleFact); else aMeshEditor->Scale(obj, aPoint, aScaleFact, true); - if( !myMesh->_is_nil()) - myMesh->SetParameters( aParameters.join(":").toLatin1().constData() ); break; case MAKE_MESH_BUTTON: { @@ -505,7 +503,6 @@ bool SMESHGUI_ScaleDlg::ClickOnApply() aMeshEditor->ScaleMakeMesh(obj, aPoint, aScaleFact, makeGroups, LineEditNewMesh->text().toLatin1().data()); if (!mesh->_is_nil()) { - mesh->SetParameters(aParameters.join(":").toLatin1().constData()); if( _PTR(SObject) aSObject = SMESH::ObjectToSObject( mesh ) ) anEntryList.append( aSObject->GetID().c_str() ); #ifdef WITHGENERICOBJ