Merge from V6_main_20120808 08Aug12

[modules/geom.git] / src / TransformationGUI / TransformationGUI_MultiRotationDlg.h

diff --git a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.h b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.h
index 1134f7cfc6d3fbe6dab8b638bb945e0b59ddae4b..fac7bd50215dac1fec7c34223544baec0c98243f 100644 (file)
--- a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.h
+++ b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.h
@@ -1,24 +1,25 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  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
 //
+
 // GEOM GEOMGUI : GUI for Geometry component
 // File   : TransformationGUI_MultiRotationDlg.h
 // Author : Damien COQUERET, Open CASCADE S.A.S.
@@ -26,10 +27,11 @@
 #ifndef TRANSFORMATIONGUI_MULTIROTATIONDLG_H
 #define TRANSFORMATIONGUI_MULTIROTATIONDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
+#include "GEOM_GenericObjPtr.h"
 
 class DlgRef_2Sel4Spin1Check;
-class DlgRef_2Sel1Spin;
+class DlgRef_2Sel1SpinInt;
 
 //=================================================================================
 // class    : TransformationGUI_MultiRotationDlg
@@ -41,7 +43,7 @@ class TransformationGUI_MultiRotationDlg : public GEOMBase_Skeleton
 
 public:
   TransformationGUI_MultiRotationDlg( GeometryGUI*, QWidget* = 0,
-                                     bool = false, Qt::WindowFlags = 0 );
+                                      bool = false, Qt::WindowFlags = 0 );
   ~TransformationGUI_MultiRotationDlg();
   
 protected:
@@ -50,13 +52,14 @@ protected:
   virtual bool                       isValid( QString& );
   virtual bool                       execute( ObjectList& );
   virtual void                       addSubshapesToStudy();
+  virtual void                       restoreSubShapes( SALOMEDS::Study_ptr, SALOMEDS::SObject_ptr );
 
 private:
   void                               Init();
   void                               enterEvent( QEvent* );
  
 private:
-  GEOM::GEOM_Object_var              myBase, myVector;
+  GEOM::GeomObjPtr                   myBase, myVector;
   int                                myNbTimes1;
   int                                myNbTimes2;
   Standard_Real                      myAng;
@@ -65,18 +68,18 @@ private:
   // to initialize the first selection field with a selected object on the dialog creation
   bool                               myInitial;
   
-  DlgRef_2Sel1Spin*                  GroupPoints;
+  DlgRef_2Sel1SpinInt*               GroupPoints;
   DlgRef_2Sel4Spin1Check*            GroupDimensions;
 
 private slots:
   void                               ClickOnOk();
   bool                               ClickOnApply();
   void                               ActivateThisDialog();
-  void                               LineEditReturnPressed();
   void                               SelectionIntoArgument();
   void                               SetEditCurrentArgument();
   void                               ReverseAngle();
   void                               ValueChangedInSpinBox( double );
+  void                               ValueChangedInSpinBox( int );
   void                               TextValueChangedInSpinBox( const QString& );
   void                               ConstructorsClicked( int );
   void                               SetDoubleSpinBoxStep( double );