Salome HOME
0021514: EDF GEOM: Partition failure. A fix by PKV.
[modules/geom.git] / src / TransformationGUI / TransformationGUI_RotationDlg.cxx
index f0cca0130cedf71ef000d6efda4f318b7a295576..4dd135d4c84f4aeeb789e10a153d6edb18e24996 100644 (file)
@@ -1,38 +1,40 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  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 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 
-// 
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// 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 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
 //
-//  File   : TransformationGUI_RotationDlg.cxx
-//  Author : Lucien PIGNOLONI
-//  Module : GEOM
-//  $Header$
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : TransformationGUI_RotationDlg.cxx
+// Author : Lucien PIGNOLONI, Open CASCADE S.A.S.
 
 #include "TransformationGUI_RotationDlg.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <DlgRef.h>
+#include <GeometryGUI.h>
+#include <GEOMBase.h>
+
+#include <SUIT_Session.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Application.h>
+#include <LightApp_SelectionMgr.h>
 
+// OCCT Includes
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS.hxx>
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
-#include <qcheckbox.h>
-#include <qlabel.h>
-
-#include "GEOMImpl_Types.hxx"
-
-#include "utilities.h"
-
-using namespace std;
+#include <GEOMImpl_Types.hxx>
 
 //=================================================================================
 // class    : TransformationGUI_RotationDlg()
@@ -57,81 +52,57 @@ using namespace std;
 //            TRUE to construct a modal dialog.
 //=================================================================================
 TransformationGUI_RotationDlg::TransformationGUI_RotationDlg
-  (GeometryGUI* theGeometryGUI, QWidget* parent,  const char* name, bool modal, WFlags fl)
-  :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize |
-                     WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu)
+(GeometryGUI* theGeometryGUI, QWidget* parent, bool modal, Qt::WindowFlags fl)
+  : GEOMBase_Skeleton(theGeometryGUI, parent, modal, fl),
+    myInitial(true)
 {
   SUIT_ResourceMgr* aResMgr = myGeomGUI->getApp()->resourceMgr();
-  QPixmap image0 (aResMgr->loadPixmap("GEOM",tr("ICON_DLG_ROTATION")));
-  QPixmap image1 (aResMgr->loadPixmap("GEOM",tr("ICON_SELECT")));
-  QPixmap image2 (aResMgr->loadPixmap("GEOM",tr("ICON_DLG_ROTATION_THREE_POINTS")));
+  QPixmap image0 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_ROTATION")));
+  QPixmap image1 (aResMgr->loadPixmap("GEOM", tr("ICON_SELECT")));
+  QPixmap image2 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_ROTATION_THREE_POINTS")));
 
-  setCaption(tr("GEOM_ROTATION_TITLE"));
+  setWindowTitle(tr("GEOM_ROTATION_TITLE"));
 
   /***************************************************************/
-  GroupConstructors->setTitle(tr("GEOM_ROTATION"));
-  RadioButton1->setPixmap(image0);
-  RadioButton2->setPixmap(image2);
-  RadioButton3->close(TRUE);
+  mainFrame()->GroupConstructors->setTitle(tr("GEOM_ROTATION"));
+  mainFrame()->RadioButton1->setIcon(image0);
+  mainFrame()->RadioButton2->setIcon(image2);
+  mainFrame()->RadioButton3->setAttribute(Qt::WA_DeleteOnClose);
+  mainFrame()->RadioButton3->close();
 
-  GroupPoints = new DlgRef_4Sel1Spin2Check(this, "GroupPoints");
+  GroupPoints = new DlgRef_4Sel1Spin2Check(centralWidget());
   GroupPoints->GroupBox1->setTitle(tr("GEOM_ARGUMENTS"));
   GroupPoints->TextLabel1->setText(tr("GEOM_OBJECTS"));
   GroupPoints->TextLabel2->setText(tr("GEOM_AXIS"));
   GroupPoints->TextLabel3->setText(tr("GEOM_ANGLE"));
-  GroupPoints->TextLabel4->setText(tr("GEOM_POINT_I").arg("1"));
-  GroupPoints->TextLabel5->setText(tr("GEOM_POINT_I").arg("2"));
+  GroupPoints->TextLabel4->setText(tr("GEOM_POINT_I").arg(1));
+  GroupPoints->TextLabel5->setText(tr("GEOM_POINT_I").arg(2));
 
   GroupPoints->LineEdit1->setReadOnly(true);
   GroupPoints->LineEdit2->setReadOnly(true);
   GroupPoints->LineEdit4->setReadOnly(true);
   GroupPoints->LineEdit5->setReadOnly(true);
-  GroupPoints->PushButton1->setPixmap(image1);
-  GroupPoints->PushButton2->setPixmap(image1);
-  GroupPoints->PushButton4->setPixmap(image1);
-  GroupPoints->PushButton5->setPixmap(image1);
+  GroupPoints->PushButton1->setIcon(image1);
+  GroupPoints->PushButton2->setIcon(image1);
+  GroupPoints->PushButton4->setIcon(image1);
+  GroupPoints->PushButton5->setIcon(image1);
   GroupPoints->CheckButton1->setText(tr("GEOM_CREATE_COPY"));
   GroupPoints->CheckButton2->setText(tr("GEOM_REVERSE"));
 
-  Layout1->addWidget(GroupPoints, 2, 0);
+  QVBoxLayout* layout = new QVBoxLayout(centralWidget());
+  layout->setMargin(0); layout->setSpacing(6);
+  layout->addWidget(GroupPoints);
   /***************************************************************/
 
-  double anAngle = 0;
-  double SpecificStep = 5;
-  /* min, max, step and decimals for spin boxes & initial values */
-  GroupPoints->SpinBox_DX->RangeStepAndValidator(COORD_MIN, COORD_MAX, SpecificStep, DBL_DIGITS_DISPLAY);
-  GroupPoints->SpinBox_DX->SetValue(anAngle);
+  setHelpFileName("rotation_operation_page.html");
 
   // Activate Create a Copy mode
   GroupPoints->CheckButton1->setChecked(true);
-  CreateCopyModeChanged(true);
-
-  /* signals and slots connections */
-  connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk()));
-  connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
-  connect(GroupConstructors, SIGNAL(clicked(int)), SLOT(ConstructorsClicked(int)));
-
-  connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints->PushButton4, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-  connect(GroupPoints->PushButton5, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
-
-  connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-  connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed()));
-
-  connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
-  connect(GroupPoints->CheckButton1, SIGNAL(toggled(bool)), this, SLOT(CreateCopyModeChanged(bool)));
-  connect(GroupPoints->CheckButton2, SIGNAL(toggled(bool)), this, SLOT(onReverse()));
-
-  connect(myGeomGUI->getApp()->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
-
-  setHelpFileName("rotation_operation_page.html");
+  CreateCopyModeChanged();
 
   Init();
 }
 
-
 //=================================================================================
 // function : ~TransformationGUI_RotationDlg()
 // purpose  : Destroys the object and frees any allocated resources
@@ -141,65 +112,110 @@ TransformationGUI_RotationDlg::~TransformationGUI_RotationDlg()
   // no need to delete child widgets, Qt does it all for us
 }
 
-
 //=================================================================================
 // function : Init()
 // purpose  :
 //=================================================================================
 void TransformationGUI_RotationDlg::Init()
 {
-  /* init variables */
-  myEditCurrentArgument = GroupPoints->LineEdit1;
-  GroupPoints->LineEdit2->clear();
+  double anAngle = 0;
+  double SpecificStep = 5;
+
+  // min, max, step and decimals for spin boxes & initial values
+  initSpinBox(GroupPoints->SpinBox_DX, COORD_MIN, COORD_MAX, SpecificStep, "angle_precision" );
+  GroupPoints->SpinBox_DX->setValue(anAngle);
+
+  // init variables
+  GroupPoints->LineEdit1->setText("");
+  GroupPoints->LineEdit2->setText("");
+  GroupPoints->LineEdit4->setText("");
+  GroupPoints->LineEdit5->setText("");
 
-  myAxis = myCentPoint = myPoint1 = myPoint2 = GEOM::GEOM_Object::_nil();
+  myObjects.clear();
+  myAxis.nullify();
+  myCentPoint.nullify();
+  myPoint1.nullify();
+  myPoint2.nullify();
 
-  initName( tr( "GEOM_ROTATION" ) );
-  ConstructorsClicked( 0 );
+  mainFrame()->GroupBoxPublish->show();
+
+  // signals and slots connections
+  connect(buttonOk(),    SIGNAL(clicked()), this, SLOT(ClickOnOk()));
+  connect(buttonApply(), SIGNAL(clicked()), this, SLOT(ClickOnApply()));
+
+  connect(this, SIGNAL(constructorsClicked(int)), this, SLOT(ConstructorsClicked(int)));
+
+  connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect(GroupPoints->PushButton2, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect(GroupPoints->PushButton4, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+  connect(GroupPoints->PushButton5, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));
+
+  connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox()));
+
+  connect(GroupPoints->SpinBox_DX, SIGNAL(textChanged( const QString& )),
+          this, SLOT(TextValueChangedInSpinBox( const QString&)));
+
+  connect(GroupPoints->CheckButton1, SIGNAL(toggled(bool)), this, SLOT(CreateCopyModeChanged()));
+  connect(GroupPoints->CheckButton2, SIGNAL(toggled(bool)), this, SLOT(onReverse()));
+
+  initName(tr("GEOM_ROTATION"));
+
+  ConstructorsClicked(0);
 }
 
 //=================================================================================
 // function : ConstructorsClicked()
 // purpose  : Radio button management
 //=================================================================================
-void TransformationGUI_RotationDlg::ConstructorsClicked(int constructorId)
+void TransformationGUI_RotationDlg::ConstructorsClicked (int constructorId)
 {
   disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
 
-  myEditCurrentArgument = GroupPoints->LineEdit1;
-  globalSelection();
+  switch (constructorId) {
+  case 0: // rotation an object angle and axis
+    {
+      GroupPoints->ShowRows(2, 3, false);
+      GroupPoints->TextLabel2->setText(tr("GEOM_AXIS"));
+      GroupPoints->LineEdit2->clear();
+      GroupPoints->ShowRows(4, 4, true);
+
+      myAxis.nullify();
 
-  switch (constructorId)
+      GroupPoints->PushButton1->click();
+    }
+    break;
+  case 1: // rotation an object by 3 points
     {
-    case 0: /* rotation an object angle and axis */
-      {
-       GroupPoints->ShowRows(2,3,false);
-       resize(0,0);
-       GroupPoints->TextLabel2->setText(tr("GEOM_AXIS"));
-       GroupPoints->LineEdit2->clear();
-       GroupPoints->ShowRows(4,4,true);
-       myAxis = GEOM::GEOM_Object::_nil();
-       break;
-      }
-    case 1: /* rotation an object by 3 points */
-      {
-       GroupPoints->ShowRows(4,4,false);
-       resize(0,0);
-       GroupPoints->ShowRows(2,3,true);
-       GroupPoints->TextLabel2->setText(tr("GEOM_CENTRAL_POINT"));
-       GroupPoints->TextLabel4->setText(tr("GEOM_POINT_I").arg("1"));
-       GroupPoints->TextLabel5->setText(tr("GEOM_POINT_I").arg("2"));
-       GroupPoints->LineEdit2->clear();
-       GroupPoints->LineEdit4->clear();
-       GroupPoints->LineEdit5->clear();
-       myCentPoint = myPoint1 = myPoint2 = GEOM::GEOM_Object::_nil();
-       break;
-      }
+      GroupPoints->ShowRows(4, 4, false);
+      GroupPoints->ShowRows(2, 3, true);
+      GroupPoints->TextLabel2->setText(tr("GEOM_CENTRAL_POINT"));
+      GroupPoints->TextLabel4->setText(tr("GEOM_POINT_I").arg(1));
+      GroupPoints->TextLabel5->setText(tr("GEOM_POINT_I").arg(2));
+
+      GroupPoints->LineEdit2->clear();
+      GroupPoints->LineEdit4->clear();
+      GroupPoints->LineEdit5->clear();
+
+      myCentPoint.nullify();
+      myPoint1.nullify();
+      myPoint2.nullify();
+
+      GroupPoints->PushButton1->click();
     }
+    break;
+  }
 
-  myEditCurrentArgument->setFocus();
-  connect(myGeomGUI->getApp()->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  qApp->processEvents();
+  updateGeometry();
+  resize(minimumSizeHint());
+
+  if (myInitial) {
+    myInitial = false;
+    SelectionIntoArgument();
+  }
+  else {
+    processPreview();
+  }
 }
 
 //=================================================================================
@@ -208,121 +224,110 @@ void TransformationGUI_RotationDlg::ConstructorsClicked(int constructorId)
 //=================================================================================
 void TransformationGUI_RotationDlg::ClickOnOk()
 {
-  if ( ClickOnApply() )
+  setIsApplyAndClose( true );
+  if (ClickOnApply())
     ClickOnCancel();
 }
 
-
 //=================================================================================
 // function : ClickOnApply()
 // purpose  :
 //=================================================================================
 bool TransformationGUI_RotationDlg::ClickOnApply()
 {
-  if ( !onAccept( GroupPoints->CheckButton1->isChecked()) )
+  if (!onAccept(GroupPoints->CheckButton1->isChecked()))
     return false;
 
   initName();
-  ConstructorsClicked( getConstructorId() );
+
+  // activate selection and connect selection manager
+  ConstructorsClicked(getConstructorId());
+  SelectionIntoArgument();
+
   return true;
 }
 
-
 //=================================================================================
 // function : SelectionIntoArgument()
-// purpose  : Called when selection as changed or other case
+// purpose  : Called when selection is changed or on dialog initialization or activation
 //=================================================================================
 void TransformationGUI_RotationDlg::SelectionIntoArgument()
 {
-  myEditCurrentArgument->setText("");
-  QString aName;
+  erasePreview();
 
-  if(myEditCurrentArgument == GroupPoints->LineEdit1)
-    {
-      int aNbSel = GEOMBase::GetNameOfSelectedIObjects(selectedIO(), aName);
-      if(aNbSel < 1)
-       {
-         myObjects.length(0);
-         return;
-       }
-      GEOMBase::ConvertListOfIOInListOfGO(selectedIO(), myObjects);
-      if (!myObjects.length())
-       return;
+  if ( myEditCurrentArgument == GroupPoints->LineEdit1 ) {
+    myObjects = getSelected( TopAbs_SHAPE, -1 );
+    if ( !myObjects.isEmpty() ) {
+      QString aName = myObjects.count() > 1 ? QString( "%1_objects").arg( myObjects.count() ) : GEOMBase::GetName( myObjects[0].get() );
+      myEditCurrentArgument->setText( aName );
     }
-  else
-    {
-      if(IObjectCount() != 1)
-       {
-         if(myEditCurrentArgument == GroupPoints->LineEdit2 && getConstructorId() == 0)
-           myAxis = GEOM::GEOM_Object::_nil();
-         else if(myEditCurrentArgument == GroupPoints->LineEdit2 && getConstructorId() == 1)
-           myCentPoint  = GEOM::GEOM_Object::_nil();
-          else if(myEditCurrentArgument == GroupPoints->LineEdit4)
-           myPoint1 = GEOM::GEOM_Object::_nil();
-         else if(myEditCurrentArgument == GroupPoints->LineEdit5)
-           myPoint2 = GEOM::GEOM_Object::_nil();
-         return;
+    else {
+      myEditCurrentArgument->setText("");
+    }
+  }
+  else {
+    TopAbs_ShapeEnum aNeedType = ( myEditCurrentArgument == GroupPoints->LineEdit2 && getConstructorId() == 0 ) ?
+      TopAbs_EDGE : TopAbs_VERTEX;
+    GEOM::GeomObjPtr aSelectedObject = getSelected( aNeedType );
+    TopoDS_Shape aShape;
+    if ( aSelectedObject && GEOMBase::GetShape( aSelectedObject.get(), aShape ) && !aShape.IsNull() ) {
+      QString aName = GEOMBase::GetName( aSelectedObject.get() );
+      myEditCurrentArgument->setText( aName );
+      if ( myEditCurrentArgument == GroupPoints->LineEdit2 ) {
+       if ( getConstructorId() == 0 ) {
+         myAxis = aSelectedObject;
+         if ( myObjects.isEmpty() )
+           GroupPoints->PushButton1->click();
        }
-
-      Standard_Boolean testResult = Standard_False;
-      GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(firstIObject(), testResult );
-      if(!testResult || CORBA::is_nil( aSelectedObject ))
-       return;
-
-      aName = GEOMBase::GetName( aSelectedObject );
-      TopoDS_Shape aShape;
-      if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) && !aShape.IsNull() )
-       {
-         TopAbs_ShapeEnum aNeedType = TopAbs_VERTEX;
-         if (myEditCurrentArgument == GroupPoints->LineEdit2 && getConstructorId() == 0)
-           aNeedType = TopAbs_EDGE;
-
-         LightApp_SelectionMgr* aSelMgr = myGeomGUI->getApp()->selectionMgr();
-         TColStd_IndexedMapOfInteger aMap;
-         aSelMgr->GetIndexes( firstIObject(), aMap );
-         if ( aMap.Extent() == 1 )
-           {
-             int anIndex = aMap( 1 );
-             if (aNeedType == TopAbs_EDGE)
-               aName += QString(":edge_%1").arg(anIndex);
-             else
-               aName += QString(":vertex_%1").arg(anIndex);
-
-             //Find SubShape Object in Father
-             GEOM::GEOM_Object_var aFindedObject = findObjectInFather(aSelectedObject, aName);
-
-             if ( aFindedObject == GEOM::GEOM_Object::_nil() ) { // Object not found in study
-               GEOM::GEOM_IShapesOperations_var aShapesOp =
-                 getGeomEngine()->GetIShapesOperations( getStudyId() );
-               aSelectedObject = aShapesOp->GetSubShape(aSelectedObject, anIndex);
-             }
-             else
-               aSelectedObject = aFindedObject; // get Object from study
-           }
-         else {
-           if (aShape.ShapeType() != aNeedType) {
-             aSelectedObject = GEOM::GEOM_Object::_nil();
-             aName = "";
-           }
-         }
+       else if ( getConstructorId() == 1 ) {
+         myCentPoint = aSelectedObject;
+         if ( !myPoint1 )
+           GroupPoints->PushButton4->click();
+         else if ( !myPoint2 )
+           GroupPoints->PushButton5->click();
+         else if ( myObjects.isEmpty() )
+           GroupPoints->PushButton1->click();
        }
-     
-      if(myEditCurrentArgument == GroupPoints->LineEdit2 && getConstructorId() == 0)
-       myAxis = aSelectedObject;
-      else if(myEditCurrentArgument == GroupPoints->LineEdit2 && getConstructorId() == 1)
-       myCentPoint = aSelectedObject;
-      else if(myEditCurrentArgument == GroupPoints->LineEdit4)
+      }
+      else if ( myEditCurrentArgument == GroupPoints->LineEdit4 ) {
        myPoint1 = aSelectedObject;
-      else if(myEditCurrentArgument == GroupPoints->LineEdit5)
+       if ( !myPoint2 )
+         GroupPoints->PushButton5->click();
+       else if ( myObjects.isEmpty() )
+         GroupPoints->PushButton1->click();
+       else if ( !myCentPoint )
+         GroupPoints->PushButton2->click();
+      }
+      else if ( myEditCurrentArgument == GroupPoints->LineEdit5 ) {
        myPoint2 = aSelectedObject;
-
+       if ( myObjects.isEmpty() )
+         GroupPoints->PushButton1->click();
+       else if ( !myCentPoint )
+         GroupPoints->PushButton2->click();
+       else if ( !myPoint1 )
+         GroupPoints->PushButton4->click();
+      }
     }
-  myEditCurrentArgument->setText( aName );
+    else {
+      if (myEditCurrentArgument == GroupPoints->LineEdit2 ) {
+       if ( getConstructorId() == 0 )
+         myAxis.nullify();
+       else if ( getConstructorId() == 1 )
+         myCentPoint.nullify();
+      }
+      else if ( myEditCurrentArgument == GroupPoints->LineEdit4 ) {
+       myPoint1.nullify();
+      }
+      else if ( myEditCurrentArgument == GroupPoints->LineEdit5 ) {
+       myPoint2.nullify();
+      }
+      myEditCurrentArgument->setText("");
+    }
+  }
 
-  displayPreview();
+  processPreview();
 }
 
-
 //=================================================================================
 // function : SetEditCurrentArgument()
 // purpose  :
@@ -330,49 +335,71 @@ void TransformationGUI_RotationDlg::SelectionIntoArgument()
 void TransformationGUI_RotationDlg::SetEditCurrentArgument()
 {
   QPushButton* send = (QPushButton*)sender();
+
+  disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0);
   globalSelection();
 
-  if(send == GroupPoints->PushButton1) {
+  if (send == GroupPoints->PushButton1) {
     myEditCurrentArgument = GroupPoints->LineEdit1;
+
+    GroupPoints->PushButton2->setDown(false);
+    GroupPoints->PushButton4->setDown(false);
+    GroupPoints->PushButton5->setDown(false);
+    GroupPoints->LineEdit2->setEnabled(false);
+    GroupPoints->LineEdit4->setEnabled(false);
+    GroupPoints->LineEdit5->setEnabled(false);
   }
-  else if(send == GroupPoints->PushButton2) {
+  else if (send == GroupPoints->PushButton2) {
     myEditCurrentArgument = GroupPoints->LineEdit2;
+
+    GroupPoints->PushButton1->setDown(false);
+    GroupPoints->PushButton4->setDown(false);
+    GroupPoints->PushButton5->setDown(false);
+    GroupPoints->LineEdit1->setEnabled(false);
+    GroupPoints->LineEdit4->setEnabled(false);
+    GroupPoints->LineEdit5->setEnabled(false);
+
     if (getConstructorId() == 0)
-      localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE );
+      localSelection(GEOM::GEOM_Object::_nil(), TopAbs_EDGE);
     else
-      localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
+      localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
   }
-  else if (send == GroupPoints->PushButton4)
-    {
-      myEditCurrentArgument = GroupPoints->LineEdit4;
-      localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
-    }
-  else if (send == GroupPoints->PushButton5)
-    {
-      myEditCurrentArgument = GroupPoints->LineEdit5;
-      localSelection( GEOM::GEOM_Object::_nil(), TopAbs_VERTEX );
-    }
+  else if (send == GroupPoints->PushButton4) {
+    myEditCurrentArgument = GroupPoints->LineEdit4;
 
-  myEditCurrentArgument->setFocus();
-  SelectionIntoArgument();
-}
+    GroupPoints->PushButton1->setDown(false);
+    GroupPoints->PushButton2->setDown(false);
+    GroupPoints->PushButton5->setDown(false);
+    GroupPoints->LineEdit1->setEnabled(false);
+    GroupPoints->LineEdit2->setEnabled(false);
+    GroupPoints->LineEdit5->setEnabled(false);
 
+    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
+  }
+  else if (send == GroupPoints->PushButton5) {
+    myEditCurrentArgument = GroupPoints->LineEdit5;
 
-//=================================================================================
-// function : LineEditReturnPressed()
-// purpose  :
-//=================================================================================
-void TransformationGUI_RotationDlg::LineEditReturnPressed()
-{
-  QLineEdit* send = (QLineEdit*)sender();
-  if(send == GroupPoints->LineEdit1 ||
-     send == GroupPoints->LineEdit2)
-    {
-      myEditCurrentArgument = send;
-      GEOMBase_Skeleton::LineEditReturnPressed();
-    }
-}
+    GroupPoints->PushButton1->setDown(false);
+    GroupPoints->PushButton2->setDown(false);
+    GroupPoints->PushButton4->setDown(false);
+    GroupPoints->LineEdit1->setEnabled(false);
+    GroupPoints->LineEdit2->setEnabled(false);
+    GroupPoints->LineEdit4->setEnabled(false);
 
+    localSelection(GEOM::GEOM_Object::_nil(), TopAbs_VERTEX);
+  }
+  connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()),
+          this, SLOT(SelectionIntoArgument()));
+
+  // enable line edit
+  myEditCurrentArgument->setEnabled(true);
+  myEditCurrentArgument->setFocus();
+  // after setFocus(), because it will be setDown(false) when loses focus
+  send->setDown(true);
+
+  // seems we need it only to avoid preview disappearing, caused by selection mode change
+  processPreview();
+}
 
 //=================================================================================
 // function : ActivateThisDialog()
@@ -381,23 +408,31 @@ void TransformationGUI_RotationDlg::LineEditReturnPressed()
 void TransformationGUI_RotationDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
-  connect(myGeomGUI->getApp()->selectionMgr(),
-         SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
+  connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ),
+           this, SLOT( SelectionIntoArgument() ) );
 
   ConstructorsClicked( getConstructorId() );
 }
 
-
 //=================================================================================
 // function : enterEvent()
 // purpose  :
 //=================================================================================
-void TransformationGUI_RotationDlg::enterEvent(QEvent* e)
+void TransformationGUI_RotationDlg::enterEvent (QEvent*)
 {
-  if (!GroupConstructors->isEnabled())
+  if (!mainFrame()->GroupConstructors->isEnabled())
     ActivateThisDialog();
 }
 
+void TransformationGUI_RotationDlg::TextValueChangedInSpinBox( const QString& s)
+{
+  bool isDigit = true;
+  s.toDouble(&isDigit);
+  if(!isDigit) {
+    GroupPoints->CheckButton2->setChecked(false);
+  }
+  GroupPoints->CheckButton2->setEnabled(isDigit); 
+}
 
 //=================================================================================
 // function : ValueChangedInSpinBox()
@@ -405,164 +440,178 @@ void TransformationGUI_RotationDlg::enterEvent(QEvent* e)
 //=================================================================================
 void TransformationGUI_RotationDlg::ValueChangedInSpinBox()
 {
-  displayPreview();
+  processPreview();
 }
 
-
 //=================================================================================
 // function : createOperation
 // purpose  :
 //=================================================================================
 GEOM::GEOM_IOperations_ptr TransformationGUI_RotationDlg::createOperation()
 {
-  return getGeomEngine()->GetITransformOperations( getStudyId() );
+  return getGeomEngine()->GetITransformOperations(getStudyId());
 }
 
-
 //=================================================================================
 // function : isValid
 // purpose  :
 //=================================================================================
-bool TransformationGUI_RotationDlg::isValid( QString& msg )
+bool TransformationGUI_RotationDlg::isValid (QString& msg)
 {
-  switch (getConstructorId())
-    {
-    case 0:
-      {
-       return !(myObjects.length() == 0 || myAxis->_is_nil());
-       break;
-      }
-    case 1:
-      {
-       return !(myObjects.length() == 0 || myCentPoint->_is_nil() || myPoint1->_is_nil() || myPoint2->_is_nil() );
-       break;
-      }
-    default: return false;
-    }
+  bool ok = false;
+  switch (getConstructorId()) {
+  case 0:
+    ok = GroupPoints->SpinBox_DX->isValid( msg, !IsPreview() ) && !myObjects.isEmpty() && myAxis;
+    break;
+  case 1:
+    ok = !myObjects.isEmpty() && myCentPoint && myPoint1 && myPoint2;
+    break;
+  default:
+    break;
+  }
+  return ok;
 }
 
-
 //=================================================================================
 // function : execute
 // purpose  :
 //=================================================================================
-bool TransformationGUI_RotationDlg::execute( ObjectList& objects )
+bool TransformationGUI_RotationDlg::execute (ObjectList& objects)
 {
   bool res = false;
   bool toCreateCopy = IsPreview() || GroupPoints->CheckButton1->isChecked();
 
   GEOM::GEOM_Object_var anObj;
 
-  switch ( getConstructorId() )
+  GEOM::GEOM_ITransformOperations_var anOper = GEOM::GEOM_ITransformOperations::_narrow(getOperation());
+
+  switch (getConstructorId()) {
+  case 0:
+    {
+      QStringList aParameters;
+      aParameters<<GroupPoints->SpinBox_DX->text();
+      if (toCreateCopy) {
+        for (int i = 0; i < myObjects.count(); i++) {
+          myCurrObject = myObjects[i];
+          anObj = anOper->RotateCopy(myObjects[i].get(), myAxis.get(), GetAngle() * M_PI / 180.);
+          if (!anObj->_is_nil()) {
+            if(!IsPreview()) {
+              anObj->SetParameters(aParameters.join(":").toLatin1().constData());
+            }
+            objects.push_back(anObj._retn());
+          }
+        }
+      }
+      else {
+        for (int i = 0; i < myObjects.count(); i++) {
+          myCurrObject = myObjects[i];
+          anObj = anOper->Rotate(myObjects[i].get(), myAxis.get(), GetAngle() * M_PI / 180.);
+          if (!anObj->_is_nil()) {
+            if(!IsPreview()) {
+              anObj->SetParameters(aParameters.join(":").toLatin1().constData());
+              updateAttributes(anObj, aParameters);
+            }
+            objects.push_back(anObj._retn());
+          }
+        }
+      }
+      res = true;
+      break;
+    }
+  case 1:
     {
-    case 0 :
-      {
-       if (toCreateCopy)
-         for (int i = 0; i < myObjects.length(); i++)
-           {
-             anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->
-                RotateCopy( myObjects[i], myAxis, GetAngle() * PI180 );
-             if ( !anObj->_is_nil() )
-               objects.push_back( anObj._retn() );
-           }
-       else
-         for (int i = 0; i < myObjects.length(); i++)
-           {
-             anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->
-                Rotate( myObjects[i], myAxis, GetAngle() * PI180 );
-             if ( !anObj->_is_nil() )
-               objects.push_back( anObj._retn() );
-           }
-       res = true;
-       break;
+      if (toCreateCopy) {
+        for (int i = 0; i < myObjects.count(); i++) {
+          myCurrObject = myObjects[i];
+          anObj = anOper->RotateThreePointsCopy(myObjects[i].get(), myCentPoint.get(), myPoint1.get(), myPoint2.get());
+          if (!anObj->_is_nil())
+            objects.push_back(anObj._retn());
+        }
       }
-    case 1 :
-      {
-       if (toCreateCopy)
-         for (int i = 0; i < myObjects.length(); i++)
-           {
-             anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->
-                RotateThreePointsCopy( myObjects[i], myCentPoint, myPoint1, myPoint2 );
-             if ( !anObj->_is_nil() )
-               objects.push_back( anObj._retn() );
-           }
-       else
-         for (int i = 0; i < myObjects.length(); i++)
-           {
-             anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->
-                RotateThreePoints( myObjects[i], myCentPoint, myPoint1, myPoint2 );    
-             if ( !anObj->_is_nil() )
-               objects.push_back( anObj._retn() );
-           }
-       res = true;
-       break;
+      else {
+        for (int i = 0; i < myObjects.count(); i++) {
+          myCurrObject = myObjects[i];
+          anObj = anOper->RotateThreePoints(myObjects[i].get(), myCentPoint.get(), myPoint1.get(), myPoint2.get());
+          if (!anObj->_is_nil())
+            objects.push_back(anObj._retn());
+        }
       }
+      res = true;
+      break;
     }
+  }
 
   return res;
 }
 
-
 //=================================================================================
-// function : closeEvent
+// function : restoreSubShapes
 // purpose  :
 //=================================================================================
-void TransformationGUI_RotationDlg::closeEvent( QCloseEvent* e )
+void TransformationGUI_RotationDlg::restoreSubShapes (SALOMEDS::Study_ptr   theStudy,
+                                                      SALOMEDS::SObject_ptr theSObject)
 {
-  GEOMBase_Skeleton::closeEvent( e );
+  if (mainFrame()->CheckBoxRestoreSS->isChecked()) {
+    // we pass here the first operation argument (object) through the list of arguments
+    // because the rotation operation place its arguments in the data structure in another order,
+    // and we need to point the first argument directly
+    GEOM::ListOfGO_var anArgs = new GEOM::ListOfGO;
+    anArgs->length(1);
+    anArgs[0] = myCurrObject.copy();
+    getGeomEngine()->RestoreSubShapesSO(theStudy, theSObject, anArgs,
+                                        /*theFindMethod=*/GEOM::FSM_Transformed,
+                                        /*theInheritFirstArg=*/true,
+                                        mainFrame()->CheckBoxAddPrefix->isChecked());
+  }
 }
 
-
 //=================================================================================
 // function : GetAngle()
 // purpose  :
 //=================================================================================
 double TransformationGUI_RotationDlg::GetAngle() const
 {
-  return GroupPoints->SpinBox_DX->GetValue();
+  return GroupPoints->SpinBox_DX->value();
 }
 
-
 //=================================================================================
 // function :  CreateCopyModeChanged()
 // purpose  :
 //=================================================================================
-void TransformationGUI_RotationDlg::CreateCopyModeChanged(bool isCreateCopy)
+void TransformationGUI_RotationDlg::CreateCopyModeChanged()
 {
-  this->GroupBoxName->setEnabled(isCreateCopy);
+  mainFrame()->GroupBoxName->setEnabled(GroupPoints->CheckButton1->isChecked());
 }
 
-
 //=================================================================================
 // function :  onReverse()
 // purpose  :
 //=================================================================================
 void TransformationGUI_RotationDlg::onReverse()
 {
-  double anOldValue = GroupPoints->SpinBox_DX->GetValue();
-  GroupPoints->SpinBox_DX->SetValue( -anOldValue );
+  double anOldValue = GroupPoints->SpinBox_DX->value();
+  GroupPoints->SpinBox_DX->setValue(-anOldValue);
 }
 
 //=================================================================================
-// function : addSubshapeToStudy
+// function : addSubshapesToStudy
 // purpose  : virtual method to add new SubObjects if local selection
 //=================================================================================
 void TransformationGUI_RotationDlg::addSubshapesToStudy()
 {
   bool toCreateCopy = IsPreview() || GroupPoints->CheckButton1->isChecked();
   if (toCreateCopy) {
-  QMap<QString, GEOM::GEOM_Object_var> objMap;
-  switch (getConstructorId())
-    {
+    switch (getConstructorId()) {
     case 0:
-      objMap[GroupPoints->LineEdit2->text()] = myAxis;
+      GEOMBase::PublishSubObject( myAxis.get() );
       break;
     case 1:
-      objMap[GroupPoints->LineEdit2->text()] = myCentPoint;
-      objMap[GroupPoints->LineEdit4->text()] = myPoint1;
-      objMap[GroupPoints->LineEdit5->text()] = myPoint2;
+      GEOMBase::PublishSubObject( myCentPoint.get() );
+      GEOMBase::PublishSubObject( myPoint1.get() );
+      GEOMBase::PublishSubObject( myPoint2.get() );
+      break;
+    default:
       break;
     }
-  addSubshapesToFather( objMap );
   }
 }