Merge from V6_main_20120808 08Aug12

[modules/visu.git] / src / VISUGUI / VisuGUI_Sweep.h

diff --git a/src/VISUGUI/VisuGUI_Sweep.h b/src/VISUGUI/VisuGUI_Sweep.h
index 1055330afe5b2a718945a11ea152e5e3a02f55bc..e842d95093d4a24026881a63acd7439778ceb33b 100644 (file)
--- a/src/VISUGUI/VisuGUI_Sweep.h
+++ b/src/VISUGUI/VisuGUI_Sweep.h
@@ -1,24 +1,22 @@
-//  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
+// 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
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_Sweep.h
 //  Author : Oleg UVAROV
@@ -37,14 +35,13 @@
 class QComboBox;
 class QToolButton;
 class QSlider;
-class QSpinBox;
 class QCheckBox;
 class QMainWindow;
 class QTimer;
 class QAction;
 
-class QtxIntSpinBox;
-class QtxDoubleSpinBox;
+class SalomeApp_IntSpinBox;
+class SalomeApp_DoubleSpinBox;
 
 class LightApp_SelectionMgr;
 class SVTK_ViewWindow;
@@ -65,8 +62,8 @@ class VisuGUI_Sweep : public QWidget
 
 public:
   VisuGUI_Sweep( VisuGUI* theModule, 
-                QMainWindow* theParent,
-                LightApp_SelectionMgr* theSelectionMgr );
+                 QMainWindow* theParent,
+                 LightApp_SelectionMgr* theSelectionMgr );
 
   virtual ~VisuGUI_Sweep();
 
@@ -117,10 +114,10 @@ private:
   QCheckBox*        myIsCycled;
 
   QComboBox*        mySweepMode;
-  QtxIntSpinBox*    myNumberOfSteps;
+  SalomeApp_IntSpinBox* myNumberOfSteps;
 
   QComboBox*        myIntervals;
-  QtxDoubleSpinBox* myStepDelay;
+  SalomeApp_DoubleSpinBox*  myStepDelay;
 
   QTimer*           myTimer;
   QPixmap           myPlayPixmap;
@@ -130,7 +127,7 @@ private:
   VisuGUI*          myModule;
   SVTK_ViewWindow*  myViewWindow;
 
-  vtkSmartPointer< VISU_Actor > myActor;
+  VISU_Actor*       myActor;
   SALOME::GenericObjPtr< VISU::ColoredPrs3d_i > myColoredPrs3d;
 };