Salome HOME
IPAL9285,9292,9314
[modules/visu.git] / src / VISUGUI / VisuGUI_TimeAnimation.cxx
index b7a04f4c31134a5a3cc0083928257381217a5715..1bae73cc5b17319169c07763503abd578a1870f3 100644 (file)
-//  File      : VisuGUI_TimeAnimation.cxx
-//  Created   : 28 / 03 / 2003
-//  Author    : Vitaly SMETANNIKOV
-//  Project   : SALOME 
-//  Module    : VISUGUI
-//  Copyright : Open CASCADE 
-
+//  VISU VISUGUI : GUI of VISU component
+//
+//  Copyright (C) 2003  CEA/DEN, EDF R&D
+//
+//
+//
+//  File   : VisuGUI_TimeAnimation.cxx
+//  Author : Vitaly SMETANNIKOV
+//  Module : VISU
 
 #include "VisuGUI_TimeAnimation.h"
+
 #include "VisuGUI.h"
+#include "VisuGUI_Tools.h"
+#include "VisuGUI_DeformedShapeDlg.h"
+#include "VisuGUI_CutPlanesDlg.h"
+#include "VisuGUI_Plot3DDlg.h"
+#include "VisuGUI_VectorsDlg.h"
+#include "VisuGUI_IsoSurfacesDlg.h"
+#include "VisuGUI_StreamLinesDlg.h"
+
+#include "VISU_TimeAnimation.h"
+
+#include "VISU_ScalarMap_i.hh"
+#include "VISU_IsoSurfaces_i.hh"
+#include "VISU_DeformedShape_i.hh"
+#include "VISU_CutPlanes_i.hh"
+#include "VISU_Plot3D_i.hh"
+#include "VISU_CutLines_i.hh"
+#include "VISU_Vectors_i.hh"
+#include "VISU_StreamLines_i.hh"
+
+#include "VISU_ViewManager_i.hh"
+
+#include "VISU_ScalarBarActor.hxx"
+#include "VISU_Actor.h"
+
+#include "SalomeApp_Study.h"
+#include "SalomeApp_Application.h"
+
+#include "SVTK_ViewWindow.h"
+
+#include "SUIT_OverrideCursor.h"
+#include "SUIT_MessageBox.h"
+#include "SUIT_Desktop.h"
+#include "SUIT_FileDlg.h"
+
+#include <vtkRenderer.h>
 
-#include <qlayout.h>
 #include <qhbox.h>
-#include <qhgroupbox.h>
-#include <qmessagebox.h>
+#include <qgrid.h>
+#include <qlayout.h>
+#include <qslider.h>
+#include <qthread.h>
+#include <qlistbox.h>
 #include <qwt_wheel.h>
+#include <qhgroupbox.h>
 #include <qlcdnumber.h>
-#include <qlistbox.h>
 #include <qvgroupbox.h>
 
+#define  MAXVAL 1e10
 
-#include "QAD_Application.h"
-#include "QAD_Desktop.h"
-#include "QAD_FileDlg.h"
+ArrangeDlg::ArrangeDlg(QWidget* theParent, VISU_TimeAnimation* theAnimator)
+  : QDialog(theParent, "ArrangeDlg", true, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu),
+    myAnimator(theAnimator), myViewWindow(theAnimator->getViewer())
+{
+  myCurrent = 0;
+  init();
+  QStringList aFieldNames;
+  // Find names of fields
+  for (int i = 0; i < theAnimator->getNbFields(); i++) {
+    aFieldNames.append(VISU::getValue(theAnimator->getFieldData(i).myField, "myName"));
+    Offset aOffs;
+    aOffs.myOffset[0] = myAnimator->getFieldData(i).myOffset[0];
+    aOffs.myOffset[1] = myAnimator->getFieldData(i).myOffset[1];
+    aOffs.myOffset[2] = myAnimator->getFieldData(i).myOffset[2];
+    myOffsets.append(aOffs);
+  }
+  myFieldLst->insertStringList(aFieldNames);
+  myFieldLst->setSelected(0, true);
+}
 
-#include "VTKViewer_ViewFrame.h"
-#include "VISU_ScalarBarActor.hxx"
+ArrangeDlg::ArrangeDlg(QWidget* theParent, SVTK_ViewWindow* theViewWindow)
+  : QDialog(theParent, "ArrangeDlg", true, WStyle_Customize |
+            WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu),
+    myAnimator(0), myViewWindow(theViewWindow)
+{
+  myCurrent = 0;
+  init();
+  QStringList aPrsNames;
+  vtkActor* anActor;
+  vtkActorCollection *anActColl = myViewWindow->getRenderer()->GetActors();
+  for (anActColl->InitTraversal(); (anActor = anActColl->GetNextActor()) != NULL;) {
+    VISU_Actor* anVISUActor = dynamic_cast<VISU_Actor*>(anActor);
+    if (anVISUActor)
+      if (anVISUActor->GetVisibility() != 0) {
+       VISU::Prs3d_i* aPrs = anVISUActor->GetParent()->GetPrs3d();
+       if (aPrs) {
+         if (!myPrsMap.contains(aPrs)) {
+           SALOMEDS::SObject_var aSObject = aPrs->GetSObject();
+           if(!aSObject->_is_nil()){
+             SALOMEDS::GenericAttribute_var anAttr;
+             if (aSObject->FindAttribute(anAttr, "AttributeName")) {
+               SALOMEDS::AttributeName_var aName = SALOMEDS::AttributeName::_narrow(anAttr);
+               string aNam = aName->Value();
+               QString strIn(aNam.c_str());
+               aPrsNames.append(strIn);
+               myPrsMap[aPrs] = myOffsets.count();
+               Offset aOffs;
+               anVISUActor->GetPosition(aOffs.myOffset);
+               myOffsets.append(aOffs);
+             }
+           }
+         }
+       }
+      }
+  }
+  myFieldLst->insertStringList(aPrsNames);
+  myFieldLst->setSelected(0, true);
+}
 
-#include "VisuGUI_MagnitudeDlg.h"
-#include "VisuGUI_CutPlanesDlg.h"
-#include "VisuGUI_VectorsDlg.h"
-#include "VisuGUI_IsoSurfacesDlg.h"
-#include "VisuGUI_StreamLinesDlg.h"
-#include "VISU_TimeAnimation.h"
+void ArrangeDlg::init()
+{
+  setCaption("Arrange Presentations");
+  setSizeGripEnabled( TRUE );
+
+  QVBoxLayout* aMainLayout = new QVBoxLayout(this, 7, 6);
+  aMainLayout->setSpacing(5);
+
+  QButtonGroup* aBtnGrp = new QButtonGroup(2, Qt::Horizontal, this);
+  aBtnGrp->setExclusive(true);
+  aMainLayout->addWidget(aBtnGrp);
+
+  QRadioButton* aAutoBtn = new QRadioButton("Auto", aBtnGrp);
+  aBtnGrp->insert(aAutoBtn, AutoMode);
+
+  QRadioButton* aManualBtn = new QRadioButton("Manual", aBtnGrp);
+  aBtnGrp->insert(aManualBtn, ManualMode);
+  aBtnGrp->setButton(AutoMode);
+
+  myStackWgt = new QWidgetStack(this);
+  aMainLayout->addWidget(myStackWgt);
+
+  //  AUTO Pane
+  QVBox* aAutoPane = new QVBox(myStackWgt);
+  aAutoPane->setSpacing(5);
+  // Axis Group
+  myAxisGrp = new QButtonGroup(3, Qt::Horizontal,"Axis", aAutoPane);
+
+  QRadioButton* aXBtn = new QRadioButton("X",myAxisGrp );
+  myAxisGrp->insert(aXBtn, XAxis);
+
+  QRadioButton* aYBtn = new QRadioButton("Y",myAxisGrp );
+  myAxisGrp->insert(aYBtn, YAxis);
+
+  QRadioButton* aZBtn = new QRadioButton("Z",myAxisGrp );
+  myAxisGrp->insert(aZBtn, ZAxis);
+
+  myAxisGrp->setButton(XAxis);
+
+  //Distance Input
+  QHBox* aDistPane = new QHBox(aAutoPane);
+  aDistPane->setSpacing(5);
+  new QLabel("Relative Distance", aDistPane);
+  myDistVal = new QtxDblSpinBox (-10,10, 0.5, aDistPane);
+  myDistVal->setValue(1);
+
+  myStackWgt->addWidget(aAutoPane, AutoMode);
+
+  // Manual Pane
+  QHBox* aManualPane = new QHBox(myStackWgt);
+  aManualPane->setSpacing(10);
+
+  myFieldLst = new QListBox(aManualPane);
+  connect( myFieldLst, SIGNAL( highlighted(int) ),
+          this, SLOT( onFieldChange(int) ) );
+
+  QGrid* aCoordPane = new QGrid(2, aManualPane);
+  aCoordPane->setSpacing(5);
+
+  new QLabel("X", aCoordPane);
+  myCoord[0] = new QtxDblSpinBox(aCoordPane);
+  myCoord[0]->setRange(-MAXVAL, MAXVAL);
 
-static double MAXVALUE = 1.0E+300;
+  new QLabel("Y", aCoordPane);
+  myCoord[1] = new QtxDblSpinBox(aCoordPane);
+  myCoord[1]->setRange(-MAXVAL, MAXVAL);
 
+  new QLabel("Z", aCoordPane);
+  myCoord[2] = new QtxDblSpinBox(aCoordPane);
+  myCoord[2]->setRange(-MAXVAL, MAXVAL);
 
+  myStackWgt->addWidget(aManualPane, ManualMode);
 
-SetupDlg::SetupDlg(QWidget* theParent, VISU_TimeAnimation* theAnimator) 
-  : QDialog( theParent, "SetupDlg", true, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )  
+  myStackWgt->raiseWidget(AutoMode);
+
+  connect(aBtnGrp, SIGNAL(clicked(int)), myStackWgt, SLOT(raiseWidget(int)) );
+
+  SUIT_Study* aSUITStudy = myViewWindow->getViewManager()->study();
+  SalomeApp_Study* anAppStudy = dynamic_cast<SalomeApp_Study*>(aSUITStudy);
+  _PTR(Study) aCStudy = VISU::GetCStudy(anAppStudy);
+  if (!myAnimator && !aCStudy->GetProperties()->IsLocked()) {
+    mySaveChk = new QCheckBox ("Save to presentation", this);
+    mySaveChk->setChecked(false);
+    aMainLayout->addWidget(mySaveChk);
+  } else {
+    mySaveChk = 0;
+  }
+
+  // Common buttons ===========================================================
+  QGroupBox* GroupButtons = new QGroupBox( this, "GroupButtons" );
+  GroupButtons->setColumnLayout(0, Qt::Vertical );
+  GroupButtons->layout()->setSpacing( 0 );
+  GroupButtons->layout()->setMargin( 0 );
+  QGridLayout* GroupButtonsLayout = new QGridLayout( GroupButtons->layout() );
+  GroupButtonsLayout->setAlignment( Qt::AlignTop );
+  GroupButtonsLayout->setSpacing( 6 );
+  GroupButtonsLayout->setMargin( 11 );
+
+  QPushButton* buttonOk = new QPushButton( tr( "&OK" ), GroupButtons, "buttonOk" );
+  buttonOk->setAutoDefault( TRUE );
+  buttonOk->setDefault( TRUE );
+  GroupButtonsLayout->addWidget( buttonOk, 0, 0 );
+  GroupButtonsLayout->addItem( new QSpacerItem( 5, 5, QSizePolicy::Expanding, QSizePolicy::Minimum ), 0, 1 );
+
+  QPushButton* buttonCancel = new QPushButton( tr( "&Cancel" ) , GroupButtons, "buttonCancel" );
+  buttonCancel->setAutoDefault( TRUE );
+  GroupButtonsLayout->addWidget( buttonCancel, 0, 2 );
+
+  aMainLayout->addWidget( GroupButtons );
+
+  connect( buttonOk,     SIGNAL( clicked() ),      this, SLOT( accept() ) );
+  connect( buttonCancel, SIGNAL( clicked() ),      this, SLOT( reject() ) );
+}
+
+void ArrangeDlg::accept()
+{
+  if (myAnimator) {
+    acceptAnimation();
+  } else {
+    acceptViewWindow();
+  }
+  QDialog::accept();
+}
+
+void ArrangeDlg::onFieldChange(int theCurrent)
+{
+  if (myCurrent != theCurrent) {
+    Offset& aOffs = myOffsets[myCurrent];
+    aOffs.myOffset[0] = myCoord[0]->value();
+    aOffs.myOffset[1] = myCoord[1]->value();
+    aOffs.myOffset[2] = myCoord[2]->value();
+  }
+  myCurrent = theCurrent;
+  const Offset& aNewOffs = myOffsets[myCurrent];
+  myCoord[0]->setValue(aNewOffs.myOffset[0]);
+  myCoord[1]->setValue(aNewOffs.myOffset[1]);
+  myCoord[2]->setValue(aNewOffs.myOffset[2]);
+}
+
+void ArrangeDlg::acceptAnimation()
+{
+  if (getMode() == ManualMode) {
+    // Save from GUI
+    Offset& aOffs = myOffsets[myCurrent];
+    aOffs.myOffset[0] = myCoord[0]->value();
+    aOffs.myOffset[1] = myCoord[1]->value();
+    aOffs.myOffset[2] = myCoord[2]->value();
+
+    for (int i = 0; i < myAnimator->getNbFields(); i++) {
+      Offset aOffs = myOffsets[i];
+      myAnimator->getFieldData(i).myOffset[0] = aOffs.myOffset[0];
+      myAnimator->getFieldData(i).myOffset[1] = aOffs.myOffset[1];
+      myAnimator->getFieldData(i).myOffset[2] = aOffs.myOffset[2];
+    }
+  } else {
+    QApplication::setOverrideCursor( Qt::waitCursor );
+    FieldData& aData = myAnimator->getFieldData(0);
+    if (aData.myPrs.empty())
+      myAnimator->generatePresentations(0);
+    VISU_Actor* aActor = aActor = aData.myPrs[0]->CreateActor();
+    float aBounds[6];
+    aActor->GetBounds(aBounds);
+    aActor->Delete();
+    float aDist = 0;
+    int aAxis = getAxis();
+    switch (aAxis) {
+    case XAxis:
+      aDist = fabs(aBounds[1] - aBounds[0]);
+      break;
+    case YAxis:
+      aDist = fabs(aBounds[3] - aBounds[2]);
+      break;
+    case ZAxis:
+      aDist = fabs(aBounds[5] - aBounds[4]);
+    }
+    aDist = aDist*getDistance();
+    for (int i = 0; i < myAnimator->getNbFields(); i++) {
+      myAnimator->getFieldData(i).myOffset[0] = 0;
+      myAnimator->getFieldData(i).myOffset[1] = 0;
+      myAnimator->getFieldData(i).myOffset[2] = 0;
+      myAnimator->getFieldData(i).myOffset[aAxis] = aDist * i;
+    }
+
+    QApplication::restoreOverrideCursor();
+  }
+}
+
+void ArrangeDlg::acceptViewWindow()
+{
+  if (getMode() == ManualMode) {
+    // Save from GUI
+    Offset& aOffs = myOffsets[myCurrent];
+    aOffs.myOffset[0] = myCoord[0]->value();
+    aOffs.myOffset[1] = myCoord[1]->value();
+    aOffs.myOffset[2] = myCoord[2]->value();
+
+    QMap<VISU::Prs3d_i*, int>::Iterator it;
+    for (it = myPrsMap.begin(); it != myPrsMap.end(); ++it) {
+      VISU::Prs3d_i* aPrs = it.key();
+      Offset& aOffs = myOffsets[it.data()];
+      if (VISU_Actor* anActor = VISU::GetActor(aPrs, myViewWindow)) anActor->SetPosition(aOffs.myOffset);
+      if (mySaveChk)
+       if (mySaveChk->isChecked())
+         aPrs->SetOffset(aOffs.myOffset);
+    }
+  } else {
+    float aDist = 0;
+    float aShift = 0;
+    float aPrevDist = 0;
+    //    bool aInit = true;
+    int i;
+    QMap<VISU::Prs3d_i*, int>::Iterator it;
+    for (it = myPrsMap.begin(), i = 0; it != myPrsMap.end(); ++it, i++) {
+      VISU::Prs3d_i* aPrs = it.key();
+      if (VISU_Actor* aActor = VISU::GetActor(aPrs, myViewWindow)){
+       int aAxis = getAxis();
+       //      if (aInit) {
+       float aBounds[6];
+       aActor->GetBounds(aBounds);
+       switch (aAxis) {
+       case XAxis:
+         aDist = fabs(aBounds[1] - aBounds[0]);
+         break;
+       case YAxis:
+         aDist = fabs(aBounds[3] - aBounds[2]);
+         break;
+       case ZAxis:
+         aDist = fabs(aBounds[5] - aBounds[4]);
+       }
+       //        aInit = false;
+       //      }
+       float aOffset[3];
+       aOffset[0] = aOffset[1] = aOffset[2] = 0;
+
+       aShift = (i == 0)? 0 : aShift + (aDist + aPrevDist) * getDistance() / 2;
+
+       aOffset[aAxis] = aShift;
+       aActor->SetPosition(aOffset);
+       if (mySaveChk)
+         if (mySaveChk->isChecked())
+           aPrs->SetOffset(aOffset);
+       aPrevDist = aDist;
+      }
+    }
+  }
+  myViewWindow->getRenderer()->ResetCameraClippingRange();
+  myViewWindow->Repaint();
+}
+
+
+//*****************************************************************************************************
+//*****************************************************************************************************
+//*****************************************************************************************************
+SetupDlg::SetupDlg (VisuGUI* theModule, VISU_TimeAnimation* theAnimator)
+     : QDialog(VISU::GetDesktop(theModule), "SetupDlg", true, WStyle_Customize |
+               WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu),
+       myModule(theModule)
 {
   setCaption("Setup Animation");
   setSizeGripEnabled( TRUE );
   myAnimator = theAnimator;
-  
+
   QVBoxLayout* aMainLayout = new QVBoxLayout(this, 7, 6);
   aMainLayout->setSpacing(5);
 
 
   QFrame* aRangeGrp = new QFrame(this);
-  QGridLayout* aRangeLayout = new QGridLayout( aRangeGrp ); 
+  QGridLayout* aRangeLayout = new QGridLayout( aRangeGrp );
   aRangeLayout->setSpacing( 6 );
   aRangeLayout->setMargin( 11 );
   aRangeGrp->setFrameStyle(QFrame::Box | QFrame::Raised);
@@ -57,13 +394,18 @@ SetupDlg::SetupDlg(QWidget* theParent, VISU_TimeAnimation* theAnimator)
   myUseRangeChk = new QCheckBox("Use range of time stamps", aRangeGrp);
   aRangeLayout->addMultiCellWidget(myUseRangeChk, 0, 0, 0, 3);
   myUseRangeChk->setChecked(myAnimator->isRangeDefined());
-  
+
   QLabel* aMinLbl = new QLabel("From", aRangeGrp);
   aMinLbl->setEnabled(myUseRangeChk->isChecked());
   aRangeLayout->addWidget(aMinLbl, 1, 0);
-  myMinVal = new QAD_SpinBoxDbl(aRangeGrp, -MAXVALUE, MAXVALUE, 0.1 );
+  double aStep = (myAnimator->getMaxTime() - myAnimator->getMinTime())/(theAnimator->getFieldData(0).myNbTimes - 1);
+  myMinVal = new QtxDblSpinBox( myAnimator->getMinTime(), myAnimator->getMaxTime(), aStep, aRangeGrp );
   myMinVal->setEnabled(myUseRangeChk->isChecked());
-  myMinVal->setValue( myAnimator->getMinRange() );
+  if (myUseRangeChk->isChecked())
+    myMinVal->setValue( myAnimator->getMinRange() );
+  else
+    myMinVal->setValue( myAnimator->getMinTime() );
+
   connect(myMinVal, SIGNAL( valueChanged(double)),
          this, SLOT( onMinValue(double) ));
   aRangeLayout->addWidget(myMinVal, 1, 1);
@@ -71,13 +413,17 @@ SetupDlg::SetupDlg(QWidget* theParent, VISU_TimeAnimation* theAnimator)
   QLabel* aMaxLbl = new QLabel("To", aRangeGrp);
   aMaxLbl->setEnabled(myUseRangeChk->isChecked());
   aRangeLayout->addWidget(aMaxLbl, 1, 2);
-  myMaxVal = new QAD_SpinBoxDbl(aRangeGrp, -MAXVALUE, MAXVALUE, 0.1 );
+  myMaxVal = new QtxDblSpinBox( myAnimator->getMinTime(), myAnimator->getMaxTime(), aStep, aRangeGrp );
   myMaxVal->setEnabled(myUseRangeChk->isChecked());
-  myMaxVal->setValue( myAnimator->getMaxRange() );
+  if (myUseRangeChk->isChecked())
+    myMaxVal->setValue( myAnimator->getMaxRange() );
+  else
+    myMaxVal->setValue( myAnimator->getMaxTime() );
+
   connect(myMaxVal, SIGNAL( valueChanged(double)),
          this, SLOT( onMaxValue(double) ));
   aRangeLayout->addWidget(myMaxVal, 1, 3);
-  
+
   connect(myUseRangeChk, SIGNAL( toggled(bool)),
          aMinLbl, SLOT( setEnabled(bool) ));
   connect(myUseRangeChk, SIGNAL( toggled(bool)),
@@ -87,200 +433,253 @@ SetupDlg::SetupDlg(QWidget* theParent, VISU_TimeAnimation* theAnimator)
 
   aMainLayout->addWidget(aRangeGrp);
 
-  
+
   QHBox* aPropFrame = new QHBox(this);
   aPropFrame->setSpacing(5);
-  
-  QVGroupBox* aNamesBox = new QVGroupBox("Fields",aPropFrame);  
+
+  QVGroupBox* aNamesBox = new QVGroupBox("Fields",aPropFrame);
   myFieldLst = new QListBox(aNamesBox);
   QStringList aFieldNames;
   // Find names of fields
   for (int i = 0; i < theAnimator->getNbFields(); i++) {
-    aFieldNames.append(VisuGUI::getValue(theAnimator->getFieldData(i).myField, "myName"));
+    _PTR(SObject) aSO = theAnimator->getFieldData(i).myField;
+    aFieldNames.append(VISU::getValue(aSO, "myName"));
   }
   myFieldLst->insertStringList(aFieldNames);
   myFieldLst->setSelected(0, true);
-  connect( myFieldLst, SIGNAL( highlighted(int) ), 
+  connect( myFieldLst, SIGNAL( highlighted(int) ),
           this, SLOT( onFieldChange(int) ) );
 
-  
-  QVGroupBox* aPropBox = new QVGroupBox("Properties", aPropFrame);  
+
+  QVBox* aSetupBox = new QVBox(aPropFrame);
+  aSetupBox->setSpacing(5);
+
+  QVGroupBox* aPropBox = new QVGroupBox("Properties", aSetupBox);
+  //QVGroupBox* aPropBox = new QVGroupBox("Properties", aPropFrame);
   myTypeCombo = new QComboBox(aPropBox);
-  connect( myTypeCombo, SIGNAL( activated(int) ), 
+  connect( myTypeCombo, SIGNAL( activated(int) ),
           this, SLOT( onTypeChanged(int) ) );
-  
-  QPushButton* aBarBtn = new QPushButton("Scalar Bar...", aPropBox);
-  connect( aBarBtn, SIGNAL( clicked() ), 
-          this, SLOT( onScalarBarDlg() ) );
+
+  //  QPushButton* aBarBtn = new QPushButton("Scalar Bar...", aPropBox);
+  //connect( aBarBtn, SIGNAL( clicked() ),
+  //      this, SLOT( onScalarBarDlg() ) );
+
   myPropBtn = new QPushButton("Properties...", aPropBox);
-  myPropBtn->setEnabled(theAnimator->getFieldData(0).myPrsType != VISU::TSCALARMAP);
-  connect( myPropBtn, SIGNAL( clicked() ), 
+  //  myPropBtn->setEnabled(theAnimator->getFieldData(0).myPrsType != VISU::TSCALARMAP);
+  connect( myPropBtn, SIGNAL( clicked() ),
           this, SLOT( onPreferencesDlg() ) );
 
+  if (myAnimator->getNbFields() > 1) {
+    myArrangeBtn = new QPushButton("Arrange...", aSetupBox);
+    connect( myArrangeBtn, SIGNAL( clicked() ), this, SLOT( onArrangeDlg() ) );
+  }
   onFieldChange(0);
   aMainLayout->addWidget(aPropFrame);
-  
+
   QHBox* aBtnBox = new QHBox(this);
-  QHBoxLayout* aBtnLayout = new QHBoxLayout(aBtnBox->layout()); 
+  QHBoxLayout* aBtnLayout = new QHBoxLayout(aBtnBox->layout());
   aBtnLayout->addStretch();
-  
-  QPushButton* aCloseBtn = new QPushButton(tr("BUT_CLOSE"), aBtnBox);
+
+  QPushButton* aCloseBtn = new QPushButton(tr("BUT_OK"), aBtnBox);
   connect(aCloseBtn, SIGNAL(clicked()), this, SLOT(close()));
-  
+
   aMainLayout->addWidget(aBtnBox);
 }
 
+//************************************************************************
+enum PrsComboItem {
+  TSCALARMAP_ITEM     = 0, // VISU::TSCALARMAP
+  TISOSURFACE_ITEM    = 1, // VISU::TISOSURFACE
+  TCUTPLANES_ITEM     = 2, // VISU::TCUTPLANES
+  TPLOT3D_ITEM        = 3, // VISU::TPLOT3D
+  TDEFORMEDSHAPE_ITEM = 4, // VISU::TDEFORMEDSHAPE
+  TVECTORS_ITEM       = 5, // VISU::TVECTORS
+  TSTREAMLINES_ITEM   = 6  // VISU::TSTREAMLINES
+};
 
 //************************************************************************
-void SetupDlg::onFieldChange(int theIndex) {
+void SetupDlg::onFieldChange (int theIndex)
+{
   FieldData& aData = myAnimator->getFieldData(theIndex);
   myTypeCombo->clear();
-  myTypeCombo->insertItem("Scalar Map");
-  myTypeCombo->insertItem("Iso Surfaces");
-  myTypeCombo->insertItem("Cut Planes");
-
-  SALOMEDS::SObject_var aSObject = aData.myField;
-  long aNumComp = VisuGUI::getValue(aSObject, "myNumComponent").toLong();
+  // ATTENTION: append items in the same order like it is done in the PrsComboItem enumeration
+  myTypeCombo->insertItem("Scalar Map");   // item 0
+  myTypeCombo->insertItem("Iso Surfaces"); // item 1
+  myTypeCombo->insertItem("Cut Planes");   // item 2
+  myTypeCombo->insertItem("Plot 3D");      // item 3
+
+  _PTR(SObject) aSObject = aData.myField;
+  long aNumComp = VISU::getValue(aSObject, "myNumComponent").toLong();
   if (aNumComp > 1) {
-    myTypeCombo->insertItem("Deformed Shape");
-    myTypeCombo->insertItem("Vectors");
-    myTypeCombo->insertItem("Stream Lines");
+    myTypeCombo->insertItem("Deformed Shape"); // item 4
+    myTypeCombo->insertItem("Vectors");        // item 5
+    myTypeCombo->insertItem("Stream Lines");   // item 6
   }
   switch (aData.myPrsType) {
   case VISU::TSCALARMAP: //Scalar Map
-    myTypeCombo->setCurrentItem(0);
+    myTypeCombo->setCurrentItem(TSCALARMAP_ITEM);
     break;
   case VISU::TISOSURFACE: //Iso Surfaces
-    myTypeCombo->setCurrentItem(1);
+    myTypeCombo->setCurrentItem(TISOSURFACE_ITEM);
     break;
   case VISU::TCUTPLANES: //Cut Planes
-    myTypeCombo->setCurrentItem(2);
+    myTypeCombo->setCurrentItem(TCUTPLANES_ITEM);
+    break;
+  case VISU::TPLOT3D: //Plot 3D
+    myTypeCombo->setCurrentItem(TPLOT3D_ITEM);
     break;
   case VISU::TDEFORMEDSHAPE: //Deformed Shape
-    myTypeCombo->setCurrentItem(3);
+    myTypeCombo->setCurrentItem(TDEFORMEDSHAPE_ITEM);
     break;
   case VISU::TVECTORS: //Vectors
-    myTypeCombo->setCurrentItem(4);
+    myTypeCombo->setCurrentItem(TVECTORS_ITEM);
     break;
   case VISU::TSTREAMLINES: //Stream Lines
-    myTypeCombo->setCurrentItem(5);
+    myTypeCombo->setCurrentItem(TSTREAMLINES_ITEM);
     aData.myPrsType = VISU::TSTREAMLINES;
     break;
-  }  
-  myPropBtn->setEnabled(aData.myPrsType != VISU::TSCALARMAP);
+  }
+  //myPropBtn->setEnabled(aData.myPrsType != VISU::TSCALARMAP);
 }
 
 //************************************************************************
-void SetupDlg::onTypeChanged(int theIndex) {
+void SetupDlg::onTypeChanged (int theIndex)
+{
   FieldData& aData = myAnimator->getFieldData(myFieldLst->currentItem());
   switch (theIndex) {
-  case 0: //Scalar Map
+  case TSCALARMAP_ITEM: //Scalar Map
     aData.myPrsType = VISU::TSCALARMAP;
     break;
-  case 1: //Iso Surfaces
+  case TISOSURFACE_ITEM: //Iso Surfaces
     aData.myPrsType = VISU::TISOSURFACE;
     break;
-  case 2: //Cut Planes
+  case TCUTPLANES_ITEM: //Cut Planes
     aData.myPrsType = VISU::TCUTPLANES;
     break;
-  case 3: //Deformed Shape
+  case TPLOT3D_ITEM: //Plot 3D
+    aData.myPrsType = VISU::TPLOT3D;
+    break;
+  case TDEFORMEDSHAPE_ITEM: //Deformed Shape
     aData.myPrsType = VISU::TDEFORMEDSHAPE;
     break;
-  case 4: //Vectors
+  case TVECTORS_ITEM: //Vectors
     aData.myPrsType = VISU::TVECTORS;
     break;
-  case 5: //Stream Lines
+  case TSTREAMLINES_ITEM: //Stream Lines
     aData.myPrsType = VISU::TSTREAMLINES;
     break;
   }
   myAnimator->clearData(aData);
-  myPropBtn->setEnabled(aData.myPrsType != VISU::TSCALARMAP);
+  //myPropBtn->setEnabled(aData.myPrsType != VISU::TSCALARMAP);
   //myAnimator->generatePresentations(myFieldLst->currentItem());
 }
 
-
 //************************************************************************
-void SetupDlg::onScalarBarDlg() {
+/*void SetupDlg::onScalarBarDlg() {
   QApplication::setOverrideCursor( Qt::waitCursor );
   FieldData& aData = myAnimator->getFieldData(myFieldLst->currentItem());
-  if (aData.myPrs == 0) 
+  if (aData.myPrs == 0)
     myAnimator->generatePresentations(myFieldLst->currentItem());
   QApplication::restoreOverrideCursor();
 
   VisuGUI_ScalarBarDlg* aScalarBarDlg = new VisuGUI_ScalarBarDlg();
   aScalarBarDlg->initFromPrsObject(aData.myPrs[0]);
   if (aScalarBarDlg->exec()) {
-    for (int i = 0; i < aData.myNbTimes; i++)
+    for (int i = 0; i < aData.myNbFrames; i++)
       aScalarBarDlg->storeToPrsObject(aData.myPrs[i]);
   }
 }
+*/
 
 //************************************************************************
-void SetupDlg::onPreferencesDlg() {
-  QApplication::setOverrideCursor( Qt::waitCursor );
+void SetupDlg::onPreferencesDlg()
+{
+  MESSAGE("SetupDlg::onPreferencesDlg() is not implemented");
+  SUIT_OverrideCursor c;
   FieldData& aData = myAnimator->getFieldData(myFieldLst->currentItem());
-  if (aData.myPrs == 0)
+  if (aData.myPrs.empty())
     myAnimator->generatePresentations(myFieldLst->currentItem());
-  QApplication::restoreOverrideCursor();
+
+// BUG VISU5725 : Compatibility gcc 2.95
+// #define EDITPRS(TYPE, DLG) \
+//     { \
+//       DLG* aDlg = new DLG(); \
+//       aDlg->initFromPrsObject(dynamic_cast<TYPE*>(aData.myPrs.at(0))); \
+//       if (aDlg->exec()) { \
+//     for (int i = 0; i < aData.myNbFrames; i++) \
+//       aDlg->storeToPrsObject(dynamic_cast<TYPE*>(aData.myPrs.at(i))); \
+//       } \
+//       delete aDlg; \
+//     }
+
+
+#define EDITPRS(TYPE, DLG) {\
+        DLG* aDlg = new DLG (myModule);\
+        aDlg->initFromPrsObject(dynamic_cast<TYPE*>(aData.myPrs[0]));\
+        if (aDlg->exec())\
+        { \
+         for (int i = 0; i < aData.myNbFrames; i++)\
+          aDlg->storeToPrsObject(dynamic_cast<TYPE*>(aData.myPrs[i]));\
+        } \
+        delete aDlg;}
 
   switch (myTypeCombo->currentItem()) {
-  case 1: //Iso Surfaces
-    {
-      VisuGUI_IsoSurfacesDlg* aDlg = new VisuGUI_IsoSurfacesDlg();
-      aDlg->initFromPrsObject(dynamic_cast<VISU::IsoSurfaces_i*>(aData.myPrs[0]));
-      if (aDlg->exec()) {
-       for (int i = 0; i < aData.myNbTimes; i++)
-         aDlg->storeToPrsObject(dynamic_cast<VISU::IsoSurfaces_i*>(aData.myPrs[i]));
-      }
-    }
+  case TSCALARMAP_ITEM: //Scalar Map
+    c.suspend();
+    EDITPRS(VISU::ScalarMap_i, VisuGUI_ScalarBarDlg);
+    break;
+  case TISOSURFACE_ITEM: //Iso Surfaces
+    c.suspend();
+    EDITPRS(VISU::IsoSurfaces_i, VisuGUI_IsoSurfacesDlg);
     break;
-  case 2: //Cut Planes
+  case TCUTPLANES_ITEM: //Cut Planes
+    //    EDITPRS(VISU::CutPlanes_i, VisuGUI_CutPlanesDlg);
     {
-      VisuGUI_CutPlanesDlg* aDlg = new VisuGUI_CutPlanesDlg();
+      c.suspend();
+      VisuGUI_CutPlanesDlg* aDlg = new VisuGUI_CutPlanesDlg(false, true);
+      //_CS_PhB :operator [] .at      aDlg->initFromPrsObject(dynamic_cast<VISU::CutPlanes_i*>(aData.myPrs.at(0)));
       aDlg->initFromPrsObject(dynamic_cast<VISU::CutPlanes_i*>(aData.myPrs[0]));
+
       if (aDlg->exec()) {
-       for (int i = 0; i < aData.myNbTimes; i++)
+       for (int i = 0; i < aData.myNbFrames; i++)
+      //_CS_PhB:operator [] .at          aDlg->storeToPrsObject(dynamic_cast<VISU::CutPlanes_i*>(aData.myPrs.at(i)));
          aDlg->storeToPrsObject(dynamic_cast<VISU::CutPlanes_i*>(aData.myPrs[i]));
       }
+      delete aDlg;
     }
     break;
-  case 3: //Deformed Shape
-    {
-      VisuGUI_MagnitudeDlg* aDlg = new VisuGUI_MagnitudeDlg();
-      aDlg->initFromPrsObject(dynamic_cast<VISU::DeformedShape_i*>(aData.myPrs[0]));      
-      if (aDlg->exec()) {
-       for (int i = 0; i < aData.myNbTimes; i++)
-         aDlg->storeToPrsObject(dynamic_cast<VISU::DeformedShape_i*>(aData.myPrs[i]));
-      }
-    }
+  case TPLOT3D_ITEM: //Plot 3D
+    c.suspend();
+    EDITPRS(VISU::Plot3D_i, VisuGUI_Plot3DDlg);
     break;
-  case 4: //Vectors
-    {
-      VisuGUI_VectorsDlg* aDlg = new VisuGUI_VectorsDlg();
-      aDlg->initFromPrsObject(dynamic_cast<VISU::Vectors_i*>(aData.myPrs[0]));
-      if (aDlg->exec()) {
-       for (int i = 0; i < aData.myNbTimes; i++)
-         aDlg->storeToPrsObject(dynamic_cast<VISU::Vectors_i*>(aData.myPrs[i]));
-      }
-    }
+  case TDEFORMEDSHAPE_ITEM: //Deformed Shape
+    c.suspend();
+    EDITPRS(VISU::DeformedShape_i, VisuGUI_DeformedShapeDlg);
     break;
-  case 5: //Stream Lines
-    {
-      VisuGUI_StreamLinesDlg* aDlg = new VisuGUI_StreamLinesDlg();
-      aDlg->initFromPrsObject(dynamic_cast<VISU::StreamLines_i*>(aData.myPrs[0]));
-      if (aDlg->exec()) {
-       for (int i = 0; i < aData.myNbTimes; i++)
-         aDlg->storeToPrsObject(dynamic_cast<VISU::StreamLines_i*>(aData.myPrs[i]));
-      }
-    }
+  case TVECTORS_ITEM: //Vectors
+    c.suspend();
+    EDITPRS(VISU::Vectors_i, VisuGUI_VectorsDlg);
+    break;
+  case TSTREAMLINES_ITEM: //Stream Lines
+    c.suspend();
+    EDITPRS(VISU::StreamLines_i, VisuGUI_StreamLinesDlg);
     break;
   }
+#undef EDITPRS
 }
 
+
 //************************************************************************
-void SetupDlg::onRangeCheck(bool theCheck) {
-  for (int i = 0; i < myAnimator->getNbFields(); i++) 
+void SetupDlg::onArrangeDlg()
+{
+  ArrangeDlg aDlg(this, myAnimator);
+  aDlg.exec();
+}
+
+//************************************************************************
+void SetupDlg::onRangeCheck (bool theCheck)
+{
+  for (int i = 0; i < myAnimator->getNbFields(); i++)
     myAnimator->clearData(myAnimator->getFieldData(i));
 
   myMinVal->setEnabled(theCheck);
@@ -288,23 +687,42 @@ void SetupDlg::onRangeCheck(bool theCheck) {
 
   if (!theCheck)
     myAnimator->setAnimationRange(0, 0);
+  else {
+    //    if (myMinVal->value() < myMaxVal->value())
+    myAnimator->setAnimationRange(myMinVal->value(), myMaxVal->value());
+//     else if (myMinVal->value() > myMaxVal->value())
+//       myAnimator->setAnimationRange(myMaxVal->value(), myMinVal->value());
+//     else // equal case
+//       myAnimator->setAnimationRange(0, 0);
+  }
 }
 
 //************************************************************************
-void SetupDlg::onMinValue(double theVal) {
-  for (int i = 0; i < myAnimator->getNbFields(); i++) 
+void SetupDlg::onMinValue (double theVal)
+{
+  if (theVal > myAnimator->getMaxRange()) {
+    myMinVal->setValue( myAnimator->getMinTime() );
+    myMinVal->setFocus();
+    return;
+  }
+  for (int i = 0; i < myAnimator->getNbFields(); i++)
     myAnimator->clearData(myAnimator->getFieldData(i));
   myAnimator->setAnimationRange(theVal, myAnimator->getMaxRange());
 }
 
 //************************************************************************
-void SetupDlg::onMaxValue(double theVal) {
-  for (int i = 0; i < myAnimator->getNbFields(); i++) 
+void SetupDlg::onMaxValue (double theVal)
+{
+  if (theVal < myAnimator->getMinRange()) {
+    myMaxVal->setValue( myAnimator->getMaxTime() );
+    myMaxVal->setFocus();
+    return;
+  }
+  for (int i = 0; i < myAnimator->getNbFields(); i++)
     myAnimator->clearData(myAnimator->getFieldData(i));
   myAnimator->setAnimationRange(myAnimator->getMinRange(), theVal);
 }
 
-
 static const char * firstIco[] = {
 "18 10 2 1",
 "      g None",
@@ -374,7 +792,6 @@ static const char * playIco[] = {
 static QPixmap MYplayPixmap(playIco);
 
 
-
 static const char * rightIco[] = {
 "11 10 2 1",
 "      g None",
@@ -413,39 +830,43 @@ static const char * pauseIco[] = {
 static QPixmap MYpausePixmap(pauseIco);
 
 
-VisuGUI_TimeAnimationDlg::VisuGUI_TimeAnimationDlg(SALOMEDS::Study_var theStudy) 
-  : QDialog( QAD_Application::getDesktop(), "VisuGUI_TimeAnimationDlg", false, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose)
+VisuGUI_TimeAnimationDlg::VisuGUI_TimeAnimationDlg (VisuGUI* theModule, _PTR(Study) theStudy)
+     : QDialog(VISU::GetDesktop(theModule), "VisuGUI_TimeAnimationDlg", false, WStyle_Customize |
+               WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose)
 {
   setCaption("Animation");
   setSizeGripEnabled( TRUE );
-
+  myModule = theModule;
   myStudy = theStudy;
-  myAnimator = new VISU_TimeAnimation(theStudy);
+  isClosing = false;
+
+  //myAnimator = new VISU_TimeAnimation (VISU::GetDSStudy(theStudy));
+  myAnimator = new VISU_TimeAnimation (theStudy);
   myAnimator->setSpeed(1);
-  myAnimator->setViewer(VisuGUI::GetVtkViewFrame());
-  connect( myAnimator, SIGNAL( frameChanged(long, double) ), 
-          this, SLOT( onExecution(long, double) ) );
+  myAnimator->setViewer(VISU::GetViewWindow());
+  connect(myAnimator, SIGNAL(frameChanged(long, double)), this, SLOT(onExecution(long, double)));
+  connect(myAnimator, SIGNAL(stopped()),                 this, SLOT(onStop()));
 
   QVBoxLayout* aMainLayout = new QVBoxLayout(this, 7, 6);
   aMainLayout->setSpacing(5);
 
-  QPushButton* aSetupBtn = new QPushButton("Setup Animation...", this);
-  connect( aSetupBtn, SIGNAL( clicked() ), 
+  mySetupBtn = new QPushButton("Setup Animation...", this);
+  connect( mySetupBtn, SIGNAL( clicked() ),
           this, SLOT( onSetupDlg() ) );
-  aMainLayout->addWidget(aSetupBtn);  
-  
-  QPushButton* aGenBtn = new QPushButton("Generate frames", this);
-  connect( aGenBtn, SIGNAL( clicked() ), 
+  aMainLayout->addWidget(mySetupBtn);
+
+  myGenBtn = new QPushButton("Generate frames", this);
+  connect( myGenBtn, SIGNAL( clicked() ),
           this, SLOT( createFrames() ) );
-  aMainLayout->addWidget(aGenBtn);
+  aMainLayout->addWidget(myGenBtn);
 
   myPlayFrame = new QFrame(this);
   myPlayFrame->setFrameStyle(QFrame::WinPanel | QFrame::Sunken);
   myPlayFrame->setLineWidth( 1 );
+
 
   // --- Play controls ---
-  QGridLayout* TopLayout = new QGridLayout( myPlayFrame ); 
+  QGridLayout* TopLayout = new QGridLayout( myPlayFrame );
   TopLayout->setSpacing( 6 );
   TopLayout->setMargin( 11 );
 
@@ -458,41 +879,41 @@ VisuGUI_TimeAnimationDlg::VisuGUI_TimeAnimationDlg(SALOMEDS::Study_var theStudy)
   mySlider->setTickInterval(1);
   //mySlider->setTickmarks(QSlider::Below);
   mySlider->setTracking(false);
-  connect( mySlider, SIGNAL( valueChanged(int) ), 
-          this, SLOT( onFrameChanged(int) ) );
+  connect( mySlider, SIGNAL( valueChanged(int) ),
+          this, SLOT( onWindowChanged(int) ) );
   TopLayout->addMultiCellWidget(mySlider, 1, 1, 0, 2);
 
   myPlayBtn = new QToolButton(myPlayFrame);
   myPlayBtn->setIconSet(MYplayPixmap);
   myPlayBtn->setToggleButton(true);
-  connect( myPlayBtn, SIGNAL( clicked() ), 
+  connect( myPlayBtn, SIGNAL( clicked() ),
           this, SLOT( onPlayPressed() ) );
   TopLayout->addMultiCellWidget(myPlayBtn, 2, 2, 0, 1);
 
   QToolButton* aBackBtn = new QToolButton(myPlayFrame);
   aBackBtn->setIconSet(QPixmap(leftIco));
-  connect( aBackBtn, SIGNAL( clicked() ), 
+  connect( aBackBtn, SIGNAL( clicked() ),
           this, SLOT( onBackPressed() ) );
   TopLayout->addWidget(aBackBtn, 3, 0);
 
   QToolButton* aForvardBtn = new QToolButton(myPlayFrame);
   aForvardBtn->setIconSet(QPixmap(rightIco));
-  connect( aForvardBtn, SIGNAL( clicked() ), 
+  connect( aForvardBtn, SIGNAL( clicked() ),
           this, SLOT( onForvardPressed() ) );
   TopLayout->addWidget(aForvardBtn, 3, 1);
 
   QToolButton* aFirstBtn = new QToolButton(myPlayFrame);
   aFirstBtn->setIconSet(QPixmap(firstIco));
-  connect( aFirstBtn, SIGNAL( clicked() ), 
+  connect( aFirstBtn, SIGNAL( clicked() ),
           this, SLOT( onFirstPressed() ) );
   TopLayout->addWidget(aFirstBtn, 4, 0);
-  
+
   QToolButton* aLastBtn = new QToolButton(myPlayFrame);
   aLastBtn->setIconSet(QPixmap(lastIco));
-  connect( aLastBtn, SIGNAL( clicked() ), 
+  connect( aLastBtn, SIGNAL( clicked() ),
           this, SLOT( onLastPressed() ) );
   TopLayout->addWidget(aLastBtn, 4, 1);
-  
+
   QLabel* aSpeedLbl = new QLabel("Speed", myPlayFrame);
   TopLayout->addWidget(aSpeedLbl, 4, 2, Qt::AlignRight);
 
@@ -504,194 +925,282 @@ VisuGUI_TimeAnimationDlg::VisuGUI_TimeAnimationDlg(SALOMEDS::Study_var theStudy)
   QwtWheel* aWheel = new QwtWheel(myPlayFrame);
   aWheel->setOrientation(Qt::Vertical);
   aWheel->setRange(1, 99, 1);
-  connect( aWheel, SIGNAL(valueChanged(double)), 
+  connect( aWheel, SIGNAL(valueChanged(double)),
           aSpeedNum, SLOT(display(double)) );
-  connect( aWheel, SIGNAL(valueChanged(double)), 
+  connect( aWheel, SIGNAL(valueChanged(double)),
           this, SLOT(onSpeedChange(double)) );
   TopLayout->addMultiCellWidget(aWheel, 1, 3, 3, 3, Qt::AlignRight);
 
+  QCheckBox* aCycleCheck = new QCheckBox("Cycled animation",myPlayFrame);
+  aCycleCheck->setChecked(myAnimator->isCycling());
+  connect(aCycleCheck, SIGNAL(toggled(bool)), myAnimator, SLOT(setCyclingSlot(bool)));
+  TopLayout->addMultiCellWidget(aCycleCheck, 5, 5, 0, 3);
+
   QCheckBox* aPropCheck = new QCheckBox("Use proportional timing",myPlayFrame);
   aPropCheck->setChecked(myAnimator->isProportional());
-  connect(aPropCheck, SIGNAL(toggled(bool)), myAnimator, SLOT(setProportional(bool)));
-  TopLayout->addMultiCellWidget(aPropCheck, 5, 5, 0, 3);
+  connect(aPropCheck, SIGNAL(toggled(bool)), myAnimator, SLOT(setProportionalSlot(bool)));
+  TopLayout->addMultiCellWidget(aPropCheck, 6, 6, 0, 3);
+
+  QGroupBox* aSaveBox = new QGroupBox( "Saving", myPlayFrame );
+  aSaveBox->setColumnLayout(0, Qt::Horizontal );
+  QGridLayout* aSaveLay = new QGridLayout(aSaveBox->layout());
+  aSaveLay->setSpacing( 5 );
+  aSaveLay->setMargin( 5 );
 
-  mySaveCheck = new QCheckBox("Save pictures to directory",myPlayFrame);
-  TopLayout->addMultiCellWidget(mySaveCheck, 6, 6, 0, 3);
+  mySaveCheck = new QCheckBox("Save pictures to directory", aSaveBox);
+  aSaveLay->addMultiCellWidget(mySaveCheck, 0, 0, 0, 2);
+  connect(mySaveCheck, SIGNAL( toggled(bool)),
+         aWheel, SLOT( setDisabled(bool) ));
 
-  QLabel* aPathLbl = new QLabel("Path:", myPlayFrame);
+  QLabel* aPathLbl = new QLabel("Path:", aSaveBox);
+  aPathLbl->setEnabled(false);
   connect(mySaveCheck, SIGNAL( toggled(bool)),
          aPathLbl, SLOT( setEnabled(bool) ));
-  TopLayout->addWidget(aPathLbl, 7, 0);
-  
-  myPathEdit = new QLineEdit(myPlayFrame);
+  aSaveLay->addWidget(aPathLbl, 1, 0);
+
+  myPathEdit = new QLineEdit(aSaveBox);
+  myPathEdit->setEnabled(false);
   connect(mySaveCheck, SIGNAL( toggled(bool)),
          myPathEdit, SLOT( setEnabled(bool) ));
-  TopLayout->addMultiCellWidget(myPathEdit, 7, 7, 1, 2);
+  aSaveLay->addWidget(myPathEdit, 1, 1);
 
-  QPushButton* aBrowseBtn = new QPushButton("Browse...", myPlayFrame);
+  QPushButton* aBrowseBtn = new QPushButton("Browse...", aSaveBox);
+  aBrowseBtn->setEnabled(false);
   connect(mySaveCheck, SIGNAL( toggled(bool)),
          aBrowseBtn, SLOT( setEnabled(bool) ));
   connect(aBrowseBtn, SIGNAL( clicked()),
          this, SLOT( onBrowse() ));
-
   mySaveCheck->setChecked(false);
-  TopLayout->addWidget(aBrowseBtn, 7, 3);
+  aSaveLay->addWidget(aBrowseBtn, 1, 2);
+
+  TopLayout->addMultiCellWidget(aSaveBox, 7, 7, 0, 3);
 
   aMainLayout->addWidget(myPlayFrame);
 
+  QHBox* aPublishBox = new QHBox(this);
+  aPublishBox->setSpacing(5);
+
+  myPublishBtn = new QPushButton("Publish to study", aPublishBox);
+  connect(myPublishBtn, SIGNAL(clicked()), this, SLOT(publishToStudy()));
+
+  mySaveBtn = new QPushButton("Save Animation", aPublishBox);
+  mySaveBtn->setEnabled(myAnimator->isSavedInStudy());
+  connect(mySaveBtn, SIGNAL(clicked()), this, SLOT(saveToStudy()));
+
+  aMainLayout->addWidget(aPublishBox);
+
+
   QHBox* aBtnBox = new QHBox(this);
-  QHBoxLayout* aBtnLayout = new QHBoxLayout(aBtnBox->layout()); 
+  QHBoxLayout* aBtnLayout = new QHBoxLayout(aBtnBox->layout());
   aBtnLayout->addStretch();
 
   QPushButton* aCloseBtn = new QPushButton(tr("BUT_CLOSE"), aBtnBox);
   connect(aCloseBtn, SIGNAL(clicked()), this, SLOT(close()));
-  
+
   aMainLayout->addWidget(aBtnBox);
 
   myPlayFrame->setEnabled(false);
 }
 
-
 //************************************************************************
-VisuGUI_TimeAnimationDlg::~VisuGUI_TimeAnimationDlg() {
-  VTKViewer_ViewFrame* aView = myAnimator->getViewer();
+VisuGUI_TimeAnimationDlg::~VisuGUI_TimeAnimationDlg()
+{
   delete myAnimator;
-  aView->Repaint();
 }
 
-
 //************************************************************************
-void VisuGUI_TimeAnimationDlg::onTypeChange(int index) {
+void VisuGUI_TimeAnimationDlg::onTypeChange (int index)
+{
   stopAnimation();
   myPropBtn->setEnabled(index != 0);
-  
+
   clearView();
   myPlayFrame->setEnabled(false);
 }
 
-
 //************************************************************************
-void  VisuGUI_TimeAnimationDlg::addField(SALOMEDS::SObject_var theSObject) {
+void VisuGUI_TimeAnimationDlg::addField (_PTR(SObject) theSObject)
+{
   myPlayFrame->setEnabled(false);
-  myAnimator->addField(theSObject);
+  myAnimator->addField(VISU::GetSObject(theSObject));
 }
 
-
-
 //************************************************************************
-void VisuGUI_TimeAnimationDlg::createFrames() {
+void VisuGUI_TimeAnimationDlg::createFrames()
+{
   stopAnimation();
-  QApplication::setOverrideCursor( Qt::waitCursor );
+  SUIT_OverrideCursor c;
 
   for (int i = 0; i < myAnimator->getNbFields(); i++) {
-    if (myAnimator->getFieldData(i).myPrs == 0) 
+    if (myAnimator->getFieldData(i).myPrs.empty())
       myAnimator->generatePresentations(i);
   }
+  if (myAnimator->getNbFrames() == 0) {
+    myPlayFrame->setEnabled(false);
+    c.suspend();
+    SUIT_MessageBox::warn1(this,
+                           tr("ERROR"),
+                           tr("MSG_NO_ANIMATIONDATA"),
+                           tr("&OK"));
+    return;
+  }
   mySlider->setMaxValue(myAnimator->getNbFrames()-1);
+  myPlayFrame->setEnabled(true);
   if (!myAnimator->generateFrames()) {
-    QApplication::restoreOverrideCursor();
-    QMessageBox::warning(QAD_Application::getDesktop(), tr("ERROR"), "Defined presentation can not be created"); 
+    c.suspend();
+    //myPlayFrame->setEnabled(false);
+    SUIT_MessageBox::warn1(this,
+                           tr("ERROR"),
+                           myAnimator->getLastErrorMsg(),
+                           tr("&OK"));
     return;
   }
-  myPlayFrame->setEnabled(true);
-  QApplication::restoreOverrideCursor();
+  //myPlayFrame->setEnabled(true);
 }
-  
 
 //************************************************************************
-void VisuGUI_TimeAnimationDlg::onPlayPressed() {
-  if (myPlayBtn->isOn()) {
+void VisuGUI_TimeAnimationDlg::onPlayPressed()
+{
+  if (myPlayBtn->isOn() && (!myAnimator->running())) {
     myPlayBtn->setIconSet(MYpausePixmap);
     if (mySaveCheck->isChecked())
       myAnimator->dumpTo(myPathEdit->text());
     else
       myAnimator->dumpTo("");
+    mySetupBtn->setEnabled(false);
+    myGenBtn->setEnabled(false);
     myAnimator->startAnimation();
   } else {
     myPlayBtn->setIconSet(MYplayPixmap);
     myAnimator->stopAnimation();
+    mySetupBtn->setEnabled(true);
+    myGenBtn->setEnabled(true);
   }
 }
 
 //************************************************************************
-void VisuGUI_TimeAnimationDlg::onBackPressed() {
-  stopAnimation();
+void VisuGUI_TimeAnimationDlg::onBackPressed()
+{
+  //stopAnimation();
   myAnimator->prevFrame();
 }
 
-
 //************************************************************************
-void VisuGUI_TimeAnimationDlg::onForvardPressed() {
-  stopAnimation();
+void VisuGUI_TimeAnimationDlg::onForvardPressed()
+{
   myAnimator->nextFrame();
 }
 
-
 //************************************************************************
-void VisuGUI_TimeAnimationDlg::onLastPressed() {
-  stopAnimation();
+void VisuGUI_TimeAnimationDlg::onLastPressed()
+{
   myAnimator->lastFrame();
 }
 
-
 //************************************************************************
-void VisuGUI_TimeAnimationDlg::onFirstPressed() {
-  stopAnimation();
+void VisuGUI_TimeAnimationDlg::onFirstPressed()
+{
   myAnimator->firstFrame();
 }
 
-
-
 //************************************************************************
-void VisuGUI_TimeAnimationDlg::clearView() {
+void VisuGUI_TimeAnimationDlg::clearView()
+{
   myAnimator->clearView();
 }
 
-
 //************************************************************************
-void VisuGUI_TimeAnimationDlg::closeEvent(QCloseEvent* theEvent) {
-  stopAnimation();
-  clearView();
-  QDialog::closeEvent(theEvent);
+void VisuGUI_TimeAnimationDlg::closeEvent (QCloseEvent* theEvent)
+{
+  myAnimator->stopAnimation();
+  myAnimator->wait(500);
+  if (myAnimator->running() && (! myAnimator->finished())) {
+    isClosing = true;
+    myEvent = theEvent;
+  } else {
+    QDialog::closeEvent(theEvent);
+  }
 }
 
-
 //************************************************************************
-void VisuGUI_TimeAnimationDlg::onFrameChanged(int index) {
+void VisuGUI_TimeAnimationDlg::onWindowChanged (int index)
+{
   if (myAnimator->isRunning()) return;
   myAnimator->gotoFrame(index);
 }
 
-
 //************************************************************************
-void VisuGUI_TimeAnimationDlg::onSpeedChange(double theSpeed) {
+void VisuGUI_TimeAnimationDlg::onSpeedChange (double theSpeed)
+{
   myAnimator->setSpeed((int)theSpeed);
 }
-    
 
 //************************************************************************
-void VisuGUI_TimeAnimationDlg::stopAnimation() {
+void VisuGUI_TimeAnimationDlg::stopAnimation()
+{
   myAnimator->stopAnimation();
   myPlayBtn->setOn(false);
   myPlayBtn->setIconSet(MYplayPixmap);
+  mySetupBtn->setEnabled(true);
+  myGenBtn->setEnabled(true);
 }
 
 //************************************************************************
-void VisuGUI_TimeAnimationDlg::onExecution(long theNewFrame, double theTime) {
+void VisuGUI_TimeAnimationDlg::onExecution (long theNewFrame, double theTime)
+{
   myTimeLbl->setText(QString("%1").arg(theTime));
   mySlider->setValue(theNewFrame);
 }
 
-
 //************************************************************************
-void VisuGUI_TimeAnimationDlg::onSetupDlg() {
-  SetupDlg* aDlg = new SetupDlg(this, myAnimator);
+void VisuGUI_TimeAnimationDlg::onSetupDlg()
+{
+  if (myAnimator->getNbFrames() > 0) myAnimator->firstFrame();
+  SetupDlg* aDlg = new SetupDlg (myModule, myAnimator);
   aDlg->exec();
+  myPlayFrame->setEnabled(false);
   delete aDlg;
 }
 
 //************************************************************************
-void VisuGUI_TimeAnimationDlg::onBrowse() {
-  myPathEdit->setText(QAD_FileDlg::getExistingDirectory(this, "/","Select path"));
+void VisuGUI_TimeAnimationDlg::onBrowse()
+{
+  QString aPath = SUIT_FileDlg::getExistingDirectory(this, "/","Select path");
+  if (!aPath.isEmpty())
+    myPathEdit->setText(aPath);
+}
+
+//************************************************************************
+void VisuGUI_TimeAnimationDlg::onStop()
+{
+  if (isClosing) {
+    QDialog::closeEvent(myEvent);
+  } else {
+    myPlayBtn->setOn(false);
+    myPlayBtn->setIconSet(MYplayPixmap);
+    mySetupBtn->setEnabled(true);
+    myGenBtn->setEnabled(true);
+  }
+}
+
+//************************************************************************
+void VisuGUI_TimeAnimationDlg::saveToStudy()
+{
+  myAnimator->saveAnimation();
+  myModule->updateObjBrowser( true );
+}
+
+//************************************************************************
+void VisuGUI_TimeAnimationDlg::publishToStudy()
+{
+  myAnimator->publishInStudy();
+  myModule->updateObjBrowser( true );
+  mySaveBtn->setEnabled(myAnimator->isSavedInStudy());
+}
+
+//************************************************************************
+void VisuGUI_TimeAnimationDlg::restoreFromStudy(_PTR(SObject) theAnimation)
+{
+  myAnimator->restoreFromStudy(theAnimation);
+  mySaveBtn->setEnabled(myAnimator->isSavedInStudy());
 }