Update copyright information

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

diff --git a/src/SMESHGUI/SMESHGUI_ScaleDlg.cxx b/src/SMESHGUI/SMESHGUI_ScaleDlg.cxx
index 4bb3c43871e5730376a16c6d93cdac5b90cf1618..1e3cd9f9542c7f6720342feee0dd965690519897 100644 (file)
--- 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
@@ -522,7 +519,7 @@ bool SMESHGUI_ScaleDlg::ClickOnApply()
     }
 
     SMESH::UpdateView();
-    if ( MakeGroupsCheck->isEnabled() && MakeGroupsCheck->isChecked() ||
+    if ( ( MakeGroupsCheck->isEnabled() && MakeGroupsCheck->isChecked() ) ||
          actionButton == MAKE_MESH_BUTTON ) {
       mySMESHGUI->updateObjBrowser(true); // new groups may appear
       if( LightApp_Application* anApp =