SMH: 3.0.0 preparation - merged and adopted version (POLYWORK+HEAD)

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

diff --git a/src/VISUGUI/VisuGUI_TimeAnimation.h b/src/VISUGUI/VisuGUI_TimeAnimation.h
index 1480326c1b9721fde41f43bc0a0e39947f677211..3c6c85fe5c035df273a284b6e75f64dcfcd202c5 100644 (file)
--- a/src/VISUGUI/VisuGUI_TimeAnimation.h
+++ b/src/VISUGUI/VisuGUI_TimeAnimation.h
@@ -19,10 +19,10 @@
 
 #include "VisuGUI_ScalarBarDlg.h"
 
-#include "SALOMEconfig.h"
-#include CORBA_SERVER_HEADER(SALOMEDS)
-#include CORBA_SERVER_HEADER(SALOMEDS_Attributes)
-#include CORBA_CLIENT_HEADER(VISU_Gen)
+//#include "SALOMEconfig.h"
+//#include CORBA_SERVER_HEADER(SALOMEDS)
+//#include CORBA_SERVER_HEADER(SALOMEDS_Attributes)
+//#include CORBA_CLIENT_HEADER(VISU_Gen)
 
 class VISU_TimeAnimation;
 
@@ -51,20 +51,23 @@ private:
   QComboBox* myTypeCombo;
   QPushButton* myPropBtn;
   QCheckBox* myUseRangeChk;
-  QAD_SpinBoxDbl* myMinVal;
-  QAD_SpinBoxDbl* myMaxVal;
+  QtxDblSpinBox* myMinVal;
+  QtxDblSpinBox* myMaxVal;
 };
 
 
+//class SALOMEDSClient_Study;
+//class SALOMEDSClient_SObject;
+
 
 class VisuGUI_TimeAnimationDlg: public QDialog
 { 
     Q_OBJECT
  public:
-    VisuGUI_TimeAnimationDlg(SALOMEDS::Study_var theStudy);
+    VisuGUI_TimeAnimationDlg(QWidget* parent, _PTR(Study) theStudy);
     ~VisuGUI_TimeAnimationDlg();
 
-    void addField(SALOMEDS::SObject_var theField);
+    void addField(_PTR(SObject) theField);
     void clearView();
 
  protected:
@@ -79,7 +82,7 @@ class VisuGUI_TimeAnimationDlg: public QDialog
    void onLastPressed();
    void onFirstPressed();
    void onSetupDlg();
-   void onFrameChanged(int index);
+   void onWindowChanged(int index);
    void createFrames();
    void onSpeedChange(double theSpeed);
    void onExecution(long theNewFrame, double theTime);
@@ -96,7 +99,7 @@ class VisuGUI_TimeAnimationDlg: public QDialog
     QPushButton* myGenBtn;
 
     QFrame* myPlayFrame;
-    SALOMEDS::Study_var myStudy;
+    _PTR(Study) myStudy;
 
     VISU_TimeAnimation* myAnimator;
     QCheckBox* mySaveCheck;