Salome HOME
Join modifications from branch OCC_debug_for_3_2_0b1
[modules/visu.git] / src / VISU_I / VISU_TimeAnimation.cxx
index bd00adca6dfbcc5b0ce3e00db8c311ccfcfdc577..66b97cd5cc67bc3f896279dd674013c74634a7a5 100644 (file)
 //  Module : VISU
 
 #include "VISU_TimeAnimation.h"
+
+#include "VISUConfig.hh"
+
 #include "VISU_Result_i.hh"
 #include "VISU_Prs3d_i.hh"
 #include "VISU_Mesh_i.hh"
 #include "VISU_ScalarMap_i.hh"
 #include "VISU_IsoSurfaces_i.hh"
 #include "VISU_DeformedShape_i.hh"
+#include "VISU_ScalarMapOnDeformedShape_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_GaussPoints_i.hh"
 #include "VISU_ViewManager_i.hh"
+#include "VISU_View_i.hh"
+
 #include "VISU_ScalarBarActor.hxx"
 #include "VISU_Actor.h"
 
+#include "SalomeApp_Study.h"
+
+#include "SVTK_ViewWindow.h"
+
 #include "SALOME_Event.hxx"
 
-#include "VTKViewer_ViewFrame.h"
+#include "SUIT_ResourceMgr.h"
+#include "SUIT_Application.h"
+#include "SUIT_Session.h"
+#include "SUIT_Study.h"
 
-#include "QAD_Config.h"
+#include "SALOMEDSClient_AttributeComment.hxx"
+#include "SALOMEDSClient_AttributeName.hxx"
+#include "CASCatch.hxx"
 
-using namespace std;
+#include <qpixmap.h>
+#include <qimage.h>
+#include <qstrlist.h>
+#include <qdir.h>
 
-//QWaitCondition myCondition;
-static int MYDELAY = 1;
+using namespace std;
 
 
-//************************************************************************
-VISU_TimeAnimation::VISU_TimeAnimation(SALOMEDS::Study_ptr theStudy, VISU::View3D_ptr theView3D) {
-  myStudy = SALOMEDS::Study::_duplicate(theStudy);
+//------------------------------------------------------------------------
+VISU_TimeAnimation::VISU_TimeAnimation (_PTR(Study) theStudy,
+                                        VISU::View3D_ptr theView3D)
+{
+  myStudy = theStudy;
   myIsActive = false;
   myFrame = 0;
   mySpeed = 1;
   myProportional = false;
   myView = 0;
 
-  if(!CORBA::is_nil(theView3D)){
+  if (!CORBA::is_nil(theView3D)) {
     VISU::View3D_i* pView = dynamic_cast<VISU::View3D_i*>(GetServant(theView3D).in());
-    QAD_StudyFrame* aStudyFrame = pView->GetStudyFrame();
-    myView = VISU::GetViewFrame(aStudyFrame);
+    SUIT_ViewWindow* aVW = pView->GetViewWindow();
+    myView = dynamic_cast<SVTK_ViewWindow*>(aVW);
+    connect( myView, SIGNAL( destroyed() ), this, SLOT( onViewDeleted() ) );
   }
 
-  myMaxVal = 0;
-  myMinVal = 0;
+  myTimeMinVal = 0;
+  myTimeMaxVal = 0;
   myTimeMin = 0;
   myTimeMax = 0;
   myLastError = "";
   myCycling = false;
+
+  myAnimEntry = "";
+
+  myDumpPath = "";
+  myAVIMaker = "jpeg2yuv";
 }
 
 
-//************************************************************************
-VISU_TimeAnimation::~VISU_TimeAnimation() {
+//------------------------------------------------------------------------
+VISU_TimeAnimation::~VISU_TimeAnimation()
+{
+  if (!myView) {
+    MESSAGE("Viewer is not defined for animation");
+    return;
+  }
+
   for (int i = 0; i < getNbFields(); i++) {
     clearData(myFieldsLst[i]);
   }
+
+  /* Terminates the execution of the thread. 
+   * The thread may or may not be terminated immediately, 
+   * depending on the operating system's scheduling policies. 
+   *  
+   * Use QThread::wait() after terminate() for synchronous termination.
+   *
+   * When the thread is terminated, all threads waiting for the the thread to finish will be woken up.
+   * 
+   * Warning: This function is dangerous, and its use is discouraged. 
+   * The thread can be terminated at any point in its code path. 
+   * Threads can be terminated while modifying data. 
+   * There is no chance for the thread to cleanup after itself, 
+   * unlock any held mutexes, etc. In short, use this function only if absolutely necessary. 
+   */
+  myDumpPath = "";
+  QThread::wait(100);
+  QThread::terminate();
+  QThread::wait(400);
 }
 
 
-//************************************************************************
-void VISU_TimeAnimation::addField(SALOMEDS::SObject_ptr theField) {
+//------------------------------------------------------------------------
+void VISU_TimeAnimation::addField (_PTR(SObject) theField)
+{
   FieldData aNewData;
-  aNewData.myField = SALOMEDS::SObject::_duplicate(theField);
+  aNewData.myField = theField;
   aNewData.myNbFrames = 0;
   aNewData.myPrsType = VISU::TSCALARMAP;
+  aNewData.myOffset[0] = aNewData.myOffset[1] = aNewData.myOffset[2] = 0;
   VISU::Storable::TRestoringMap aMap = getMapOfValue(aNewData.myField);
   aNewData.myNbTimes = VISU::Storable::FindValue(aMap,"myNbTimeStamps").toLong();
   myFieldsLst.append(aNewData);
 
   //find Min/Max timestamps
   if ((myTimeMin == 0) && (myTimeMax == 0)) {
-    SALOMEDS::ChildIterator_var anIter = myStudy->NewChildIterator(theField);
-    SALOMEDS::SObject_var aTimeStamp;
+    _PTR(ChildIterator) anIter = myStudy->NewChildIterator(theField);
     anIter->Next(); // First is reference on support
     myTimeMin = getTimeValue(anIter->Value());
     for(; anIter->More(); anIter->Next()) {
@@ -87,167 +140,240 @@ void VISU_TimeAnimation::addField(SALOMEDS::SObject_ptr theField) {
   }
 }
 
+//------------------------------------------------------------------------
+void VISU_TimeAnimation::addField (SALOMEDS::SObject_ptr theField)
+{
+  SALOMEDS::SObject_var theFieldDup = SALOMEDS::SObject::_duplicate(theField);
+  _PTR(SObject) aField = VISU::GetClientSObject(theFieldDup, myStudy);
+  addField(aField);
+}
 
-//************************************************************************
+
+//------------------------------------------------------------------------
 void VISU_TimeAnimation::clearData(FieldData& theData) {
+  if (!myView) {
+    MESSAGE("Viewer is not defined for animation");
+    return;
+  }
   theData.myTiming.clear();
   vtkRenderer* aRen = myView->getRenderer();
   if (!theData.myActors.empty()) {
     for (int i = 0, iEnd = theData.myActors.size(); i < iEnd; i++) {
-      if (theData.myActors.at(i) != 0) {
-       theData.myActors.at(i)->RemoveFromRender(aRen);
-       theData.myActors.at(i)->Delete();
+      if (theData.myActors[i] != 0) {
+       theData.myActors[i]->RemoveFromRender(aRen);
       }
     }
     theData.myActors.clear();
   }
   if (!theData.myPrs.empty()) {
-    for (int i = 0, iEnd = theData.myPrs.size(); i < iEnd; i++) 
-      if (theData.myPrs.at(i) != 0) {
-       theData.myPrs.at(i)->_remove_ref();
+    for (int i = 0, iEnd = theData.myPrs.size(); i < iEnd; i++)
+      if (theData.myPrs[i] != 0) {
+       theData.myPrs[i]->_remove_ref();
       }
     theData.myPrs.clear();
-  }  
+  }
   theData.myNbFrames = 0;
   myView->update();
 }
 
 
-//************************************************************************
+namespace
+{
+  //------------------------------------------------------------------------
+  template<class TPrs3d>
+  void
+  GeneratePresentations(_PTR(Study) theStudy,
+                       FieldData& theData,
+                       VISU::Result_i* theResult,
+                       bool theIsRangeDefined,
+                       CORBA::Double theTimeMin,
+                       CORBA::Double theTimeMax)
+  {
+    double aMin = VTK_LARGE_FLOAT, aMax = -VTK_LARGE_FLOAT;
+
+    _PTR(ChildIterator) anIter = theStudy->NewChildIterator(theData.myField);
+    anIter->Next(); // First is reference on support
+
+    long aFrameId = 0;
+    for(; anIter->More(); anIter->Next()){
+      if (aFrameId == theData.myNbTimes) {
+       MESSAGE("There are extra timestamps in field");
+       return;
+      }
+      _PTR(SObject) aTimeStamp = anIter->Value();
+      if(!aTimeStamp) 
+       continue;
+
+      theData.myTiming[aFrameId] = VISU_TimeAnimation::getTimeValue(aTimeStamp);
+      if (theIsRangeDefined) {
+       if (theData.myTiming[aFrameId] < theTimeMin) 
+         continue;
+       if (theData.myTiming[aFrameId] > theTimeMax) 
+         break;
+      }
+
+      VISU::Storable::TRestoringMap aTimeMap = VISU_TimeAnimation::getMapOfValue(aTimeStamp);
+      QString aMeshName = VISU::Storable::FindValue(aTimeMap,"myMeshName");
+      VISU::Entity anEntity = (VISU::Entity) VISU::Storable::FindValue(aTimeMap,"myEntityId").toInt();
+      QString aFieldName = VISU::Storable::FindValue(aTimeMap,"myFieldName");
+      int aTimeStampId = VISU::Storable::FindValue(aTimeMap,"myTimeStampId").toInt();
+      
+      bool anIsCreated = false;
+      TPrs3d* aPresent = new TPrs3d(theResult, false);
+      CASCatch_TRY{       
+       try{
+         if(aPresent->Create(aMeshName.latin1(),anEntity,aFieldName.latin1(),aTimeStampId)){
+           anIsCreated = true;
+           theData.myPrs[aFrameId++] = aPresent;
+           aMin = std::min(aPresent->GetMin(), aMin);
+           aMax = std::max(aPresent->GetMax(), aMax);
+         }
+       }catch(std::exception& exc){
+         INFOS("Follow exception was occured :\n"<<exc.what());
+       }catch(...){
+         INFOS("Unknown exception was occured!");
+       }
+      }CASCatch_CATCH(Standard_Failure) {
+       Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+       INFOS("Follow signal was occured :\n"<<aFail->GetMessageString());
+      }
+      if(!anIsCreated)
+       aPresent->_remove_ref();
+    }
+    theData.myNbFrames = aFrameId;
+
+    if (theData.myPrsType != VISU::TGAUSSPOINTS){
+      int aRangeType = VISU::GetResourceMgr()->integerValue("VISU" , "scalar_range_type", 0);
+      if( aRangeType != 1 ){
+       for(long aFrameId = 0; aFrameId < theData.myNbFrames; aFrameId++) {
+         if (VISU::ScalarMap_i* aPrs = dynamic_cast<VISU::ScalarMap_i*>(theData.myPrs[aFrameId])){
+           aPrs->SetRange(aMin, aMax);
+           aPrs->SetOffset(theData.myOffset);
+         }
+       }
+      }
+      if (theData.myPrsType == VISU::TISOSURFACE)
+       for (long aFrameId = 0; aFrameId < theData.myNbFrames; aFrameId++)
+         if (VISU::IsoSurfaces_i* aPrs = dynamic_cast<VISU::IsoSurfaces_i*>(theData.myPrs[aFrameId]))
+           aPrs->SetSubRange(aMin, aMax);
+    }
+  }
+}
+  
 void VISU_TimeAnimation::generatePresentations(CORBA::Long theFieldNum) {
   FieldData& aData = myFieldsLst[theFieldNum];
 
   // Delete previous presentations
   clearData(aData);
 
-  VISU::Result_i* pResult = createPresent(aData.myField); 
+  VISU::Result_i* aResult = createPresent(aData.myField);
   VISU::Storable::TRestoringMap aMap = getMapOfValue(aData.myField);
   aData.myNbFrames = aData.myNbTimes;
-    //VISU::Storable::FindValue(aMap,"myNbTimeStamps").toLong();
+  //VISU::Storable::FindValue(aMap,"myNbTimeStamps").toLong();
 
   aData.myPrs.resize(aData.myNbTimes,NULL);
   aData.myTiming.resize(aData.myNbTimes);
 
-  SALOMEDS::ChildIterator_var anIter = myStudy->NewChildIterator(aData.myField);
-  SALOMEDS::SObject_var aTimeStamp;
-  anIter->Next(); // First is reference on support
-  long i = 0;
-  double aMin = VTK_LARGE_FLOAT, aMax = -VTK_LARGE_FLOAT;
-  for(;anIter->More();anIter->Next()) {
-    if (i == aData.myNbTimes) {
-      MESSAGE("There are extra timestamps in field");
-      return;
-    }
-    aTimeStamp = anIter->Value();
-    if (aTimeStamp->_is_nil()) continue;
-
-    aData.myTiming.at(i) = getTimeValue(aTimeStamp);
-    if (isRangeDefined()) {
-      if (aData.myTiming.at(i) < myMinVal) continue;
-      if (aData.myTiming.at(i) > myMaxVal) break;
-    }
-
-    VISU::Storable::TRestoringMap aTimeMap = getMapOfValue(aTimeStamp);
-    QString aMeshName = VISU::Storable::FindValue(aTimeMap,"myMeshName"); 
-    VISU::Entity anEntity = (VISU::Entity) VISU::Storable::FindValue(aTimeMap,"myEntityId").toInt(); 
-    QString aFieldName = VISU::Storable::FindValue(aTimeMap,"myFieldName"); 
-    int aTimeStampId = VISU::Storable::FindValue(aTimeMap,"myTimeStampId").toInt(); 
-    
-    switch (aData.myPrsType) {
-    case VISU::TSCALARMAP: // ScalarMap
-      {
-       VISU::ScalarMap_i* aPresent = new VISU::ScalarMap_i(pResult, false);
-       aPresent->Create(aMeshName.latin1(), anEntity, 
-                        aFieldName.latin1(), aTimeStampId);
-       //VISU::ScalarMap_var aTmp = aPresent->_this();
-       //aPresent->_remove_ref();
-       aData.myPrs.at(i) = aPresent;
-      }
-      break;
-      
-    case VISU::TISOSURFACE: // Iso Surfaces
-      {
-       VISU::IsoSurfaces_i* aPresent = new VISU::IsoSurfaces_i(pResult, false);
-       aPresent->Create(aMeshName.latin1(), anEntity, 
-                        aFieldName.latin1(), aTimeStampId);
-       //VISU::IsoSurfaces_var aTmp = aPresent->_this();
-       //aPresent->_remove_ref();
-       aData.myPrs.at(i) = aPresent;
-      }
-      break;
-    
-    case VISU::TCUTPLANES: // Cut Planes
-      {
-       VISU::CutPlanes_i* aPresent = new VISU::CutPlanes_i(pResult, false);
-       aPresent->Create(aMeshName.latin1(), anEntity, 
-                        aFieldName.latin1(), aTimeStampId);
-       //VISU::CutPlanes_var aTmp = aPresent->_this();
-       //aPresent->_remove_ref();
-       aData.myPrs.at(i) = aPresent;
-      }
-      break;
-      
-    case VISU::TDEFORMEDSHAPE: // Deformed Shape
-      {
-       VISU::DeformedShape_i* aPresent = new VISU::DeformedShape_i(pResult, false);
-       aPresent->Create(aMeshName.latin1(), anEntity, 
-                        aFieldName.latin1(), aTimeStampId);
-       //VISU::DeformedShape_var aTmp = aPresent->_this();
-       //aPresent->_remove_ref();
-       aData.myPrs.at(i) = aPresent;
-      }
-      break;
-      
-    case VISU::TVECTORS: // Vectors
-      {
-       VISU::Vectors_i* aPresent = new VISU::Vectors_i(pResult, false);
-       aPresent->Create(aMeshName.latin1(), anEntity,  
-                        aFieldName.latin1(), aTimeStampId);
-       //VISU::Vectors_var aTmp = aPresent->_this();
-       //aPresent->_remove_ref();
-       aData.myPrs.at(i) = aPresent;
-      }
-      break;
-      
-    case VISU::TSTREAMLINES: // Stream Lines
-      {
-       VISU::StreamLines_i* aPresent = new VISU::StreamLines_i(pResult, false);
-       aPresent->Create(aMeshName.latin1(), anEntity, 
-                        aFieldName.latin1(), aTimeStampId);
-       //VISU::StreamLines_var aTmp = aPresent->_this();
-       //aPresent->_remove_ref();
-       aData.myPrs.at(i) = aPresent;
-      }
-      break;
-    }
-    if (aData.myPrs.at(i)->GetMin() < aMin) aMin = aData.myPrs.at(i)->GetMin();
-    if (aData.myPrs.at(i)->GetMax() > aMax) aMax = aData.myPrs.at(i)->GetMax();
-    i++;
-  }
-  aData.myNbFrames = i;
-  QString aFixRange = QAD_CONFIG->getSetting("Visu:SBImposeRange");
-  if (aFixRange.compare("true") != 0) {
-    for (i = 0; i < aData.myNbFrames; i++) 
-      aData.myPrs.at(i)->SetRange(aMin, aMax);
-    if(aData.myPrsType == VISU::TISOSURFACE)
-      for (i = 0; i < aData.myNbFrames; i++) 
-       if(VISU::IsoSurfaces_i* aPrs = dynamic_cast<VISU::IsoSurfaces_i*>(aData.myPrs.at(i)))
-          aPrs->SetSubRange(aMin, aMax);
+  using namespace VISU;
+  switch (aData.myPrsType) {
+  case VISU::TSCALARMAP: // ScalarMap
+    GeneratePresentations<ScalarMap_i>(myStudy,
+                                      aData,
+                                      aResult,
+                                      isRangeDefined(),
+                                      myTimeMinVal,
+                                      myTimeMaxVal);
+    break;
+  case VISU::TISOSURFACE: // Iso Surfaces
+    GeneratePresentations<IsoSurfaces_i>(myStudy,
+                                        aData,
+                                        aResult,
+                                        isRangeDefined(),
+                                        myTimeMinVal,
+                                        myTimeMaxVal);
+    break;
+  case VISU::TCUTPLANES: // Cut Planes
+    GeneratePresentations<CutPlanes_i>(myStudy,
+                                      aData,
+                                      aResult,
+                                      isRangeDefined(),
+                                      myTimeMinVal,
+                                      myTimeMaxVal);
+    break;
+  case VISU::TCUTLINES: // Cut Lines
+    GeneratePresentations<CutLines_i>(myStudy,
+                                     aData,
+                                     aResult,
+                                     isRangeDefined(),
+                                     myTimeMinVal,
+                                     myTimeMaxVal);
+    break;
+  case VISU::TPLOT3D: // Plot3d
+    GeneratePresentations<Plot3D_i>(myStudy,
+                                   aData,
+                                   aResult,
+                                   isRangeDefined(),
+                                   myTimeMinVal,
+                                   myTimeMaxVal);
+    break;
+  case VISU::TDEFORMEDSHAPE: // Deformed Shape
+    GeneratePresentations<DeformedShape_i>(myStudy,
+                                          aData,
+                                          aResult,
+                                          isRangeDefined(),
+                                          myTimeMinVal,
+                                          myTimeMaxVal);
+    break;
+  case VISU::TVECTORS: // Vectors
+    GeneratePresentations<Vectors_i>(myStudy,
+                                    aData,
+                                    aResult,
+                                    isRangeDefined(),
+                                    myTimeMinVal,
+                                    myTimeMaxVal);
+    break;
+  case VISU::TSTREAMLINES: // Stream Lines
+    GeneratePresentations<StreamLines_i>(myStudy,
+                                        aData,
+                                        aResult,
+                                        isRangeDefined(),
+                                        myTimeMinVal,
+                                        myTimeMaxVal);
+    break;
+  case VISU::TGAUSSPOINTS: // Gauss Points
+    GeneratePresentations<GaussPoints_i>(myStudy,
+                                        aData,
+                                        aResult,
+                                        isRangeDefined(),
+                                        myTimeMinVal,
+                                        myTimeMaxVal);
+    break;
+  case VISU::TSCALARMAPONDEFORMEDSHAPE: // Scalar map on deformed shape
+    GeneratePresentations<ScalarMapOnDeformedShape_i>(myStudy,
+                                                     aData,
+                                                     aResult,
+                                                     isRangeDefined(),
+                                                     myTimeMinVal,
+                                                     myTimeMaxVal);
+    break;
+  default:
+    MESSAGE("Not implemented for this presentation type: " << aData.myPrsType);
+    return;
   }
 }
 
 
-//************************************************************************
-CORBA::Boolean VISU_TimeAnimation::generateFrames(){
+//------------------------------------------------------------------------
+CORBA::Boolean VISU_TimeAnimation::generateFrames() {
   if (!myView) {
-    MESSAGE("Viewer is nod defined for animation");
+    MESSAGE("Viewer is not defined for animation");
     return false;
   }
 
   myLastError = QString("Frame(s) for ");
   bool aNoError = true;
+
   clearView();
-  vtkRenderer* aRen = myView->getRenderer();
 
   for (int i = 0; i < getNbFields(); i++) {
     FieldData& aData = myFieldsLst[i];
@@ -255,7 +381,8 @@ CORBA::Boolean VISU_TimeAnimation::generateFrames(){
     for (long j = 0; j < aData.myNbFrames; j++) {
       VISU_Actor* aActor = NULL;
       try{
-       aActor = aData.myPrs.at(j)->CreateActor();
+       aData.myPrs[j]->SetOffset(aData.myOffset);
+       aActor = aData.myPrs[j]->CreateActor();
        myView->AddActor(aActor);
        if(j == 0)
          aActor->VisibilityOn();
@@ -263,22 +390,22 @@ CORBA::Boolean VISU_TimeAnimation::generateFrames(){
          aActor->VisibilityOff();
       }catch(...){ //catch(std::runtime_error& exc){
        aNoError = false;
-       myLastError += QString("%1 ").arg(aData.myTiming.at(j));
+       myLastError += QString("%1 ").arg(aData.myTiming[j]);
       }
-      aData.myActors.at(j) = aActor;
+      aData.myActors[j] = aActor;
     }
   }
   myFrame = 0;
   myLastError += QString(" timestamp(s) cannot be created.");
-  emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame));
+  emit frameChanged(myFrame, myFieldsLst[0].myTiming[myFrame]);
   myView->Repaint();
   return aNoError;
 }
 
-//************************************************************************
+//------------------------------------------------------------------------
 void VISU_TimeAnimation::clearView() {
   if (!myView) {
-    MESSAGE("Viewer is nod defined for animation");
+    MESSAGE("Viewer is not defined for animation");
     return;
   }
   vtkRenderer* aRen = myView->getRenderer();
@@ -286,24 +413,22 @@ void VISU_TimeAnimation::clearView() {
     FieldData& aData = myFieldsLst[i];
     if (!aData.myActors.empty()) {
       for (int i = 0, iEnd = aData.myActors.size(); i < iEnd; i++) {
-       if (aData.myActors.at(i) != 0) {
-         aData.myActors.at(i)->RemoveFromRender(aRen);
-         aData.myActors.at(i)->Delete();
+       if (aData.myActors[i] != 0) {
+         aData.myActors[i]->RemoveFromRender(aRen);
        }
-      } 
+      }
       aData.myActors.clear();
     }
   }
-  myView->getRW()->getRenderWindow()->Render();
-  //myView->update();
+  VISU::RepaintView(myView);
 }
 
-//************************************************************************
+//------------------------------------------------------------------------
 void VISU_TimeAnimation::stopAnimation() {
   myIsActive = false;
 }
 
-//************************************************************************
+//------------------------------------------------------------------------
 void VISU_TimeAnimation::startAnimation() {
   if (!myIsActive) {
     myIsActive = true;
@@ -311,183 +436,265 @@ void VISU_TimeAnimation::startAnimation() {
   }
 }
 
-//************************************************************************
+//------------------------------------------------------------------------
 void VISU_TimeAnimation::nextFrame() {
+  if (!myView) {
+    MESSAGE("Viewer is not defined for animation");
+    return;
+  }
   stopAnimation();
   if (myFrame < (myFieldsLst[0].myNbFrames-1)) {
     int i;
-    for (i = 0; i < getNbFields(); i++) 
-      if (myFieldsLst[i].myActors.at(myFrame) != 0)
-       myFieldsLst[i].myActors.at(myFrame)->VisibilityOff();
+    for (i = 0; i < getNbFields(); i++)
+      if (myFieldsLst[i].myActors[myFrame] != 0)
+       myFieldsLst[i].myActors[myFrame]->VisibilityOff();
+
     myFrame++;
-    for (i = 0; i < getNbFields(); i++) 
-      if (myFieldsLst[i].myActors.at(myFrame) != 0)
-       myFieldsLst[i].myActors.at(myFrame)->VisibilityOn(); 
+    for (i = 0; i < getNbFields(); i++)
+      if (myFieldsLst[i].myActors[myFrame] != 0)
+       myFieldsLst[i].myActors[myFrame]->VisibilityOn();
 
-    emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame));
+    emit frameChanged(myFrame, myFieldsLst[0].myTiming[myFrame]);
     myView->Repaint();
   }
 }
 
-//************************************************************************
+//------------------------------------------------------------------------
 void VISU_TimeAnimation::prevFrame() {
+  if (!myView) {
+    MESSAGE("Viewer is not defined for animation");
+    return;
+  }
   stopAnimation();
   if (myFrame > 0) {
     int i;
-    for (i = 0; i < getNbFields(); i++) 
-      if (myFieldsLst[i].myActors.at(myFrame) != 0)
-       myFieldsLst[i].myActors.at(myFrame)->VisibilityOff();
+    for (i = 0; i < getNbFields(); i++)
+      if (myFieldsLst[i].myActors[myFrame] != 0)
+       myFieldsLst[i].myActors[myFrame]->VisibilityOff();
+
     myFrame--;
-    for (i = 0; i < getNbFields(); i++) 
-      if (myFieldsLst[i].myActors.at(myFrame) != 0)
-       myFieldsLst[i].myActors.at(myFrame)->VisibilityOn();    
+    for (i = 0; i < getNbFields(); i++)
+      if (myFieldsLst[i].myActors[myFrame] != 0)
+       myFieldsLst[i].myActors[myFrame]->VisibilityOn();
 
-    emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame));
+    emit frameChanged(myFrame, myFieldsLst[0].myTiming[myFrame]);
     myView->Repaint();
   }
 }
 
-//************************************************************************
+//------------------------------------------------------------------------
 void VISU_TimeAnimation::firstFrame() {
+  if (!myView) {
+    MESSAGE("Viewer is not defined for animation");
+    return;
+  }
   stopAnimation();
   int i;
-  for (i = 0; i < getNbFields(); i++) 
+  for (i = 0; i < getNbFields(); i++)
     if(!myFieldsLst[i].myActors.empty())
-      if (myFieldsLst[i].myActors.at(myFrame) != 0)
-       myFieldsLst[i].myActors.at(myFrame)->VisibilityOff();
+      if (myFieldsLst[i].myActors[myFrame] != 0)
+       myFieldsLst[i].myActors[myFrame]->VisibilityOff();
   myFrame = 0;
-  for (i = 0; i < getNbFields(); i++) 
+  for (i = 0; i < getNbFields(); i++)
     if(!myFieldsLst[i].myActors.empty())
-      if (myFieldsLst[i].myActors.at(myFrame) != 0)
-       myFieldsLst[i].myActors.at(myFrame)->VisibilityOn();    
+      if (myFieldsLst[i].myActors[myFrame] != 0)
+       myFieldsLst[i].myActors[myFrame]->VisibilityOn();
   if(!myFieldsLst[0].myTiming.empty()){
-    emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame));
+    emit frameChanged(myFrame, myFieldsLst[0].myTiming[myFrame]);
     myView->Repaint();
   }
 }
 
-//************************************************************************
+//------------------------------------------------------------------------
 void VISU_TimeAnimation::lastFrame() {
+  if (!myView) {
+    MESSAGE("Viewer is not defined for animation");
+    return;
+  }
   stopAnimation();
   int i;
-  for (i = 0; i < getNbFields(); i++) 
-    if (myFieldsLst[i].myActors.at(myFrame) != 0)
-      myFieldsLst[i].myActors.at(myFrame)->VisibilityOff();
+  for (i = 0; i < getNbFields(); i++)
+   if (myFieldsLst[i].myActors[myFrame] != 0)
+      myFieldsLst[i].myActors[myFrame]->VisibilityOff();
+
   myFrame = myFieldsLst[0].myNbFrames-1;
-  for (i = 0; i < getNbFields(); i++) 
-    if (myFieldsLst[i].myActors.at(myFrame) != 0)
-      myFieldsLst[i].myActors.at(myFrame)->VisibilityOn();
-    
-  emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame));
+  for (i = 0; i < getNbFields(); i++)
+    if (myFieldsLst[i].myActors[myFrame] != 0)
+      myFieldsLst[i].myActors[myFrame]->VisibilityOn();
+
+  emit frameChanged(myFrame, myFieldsLst[0].myTiming[myFrame]);
   myView->Repaint();
 }
 
 
-//************************************************************************
+//------------------------------------------------------------------------
 // For Batchmode using
 void VISU_TimeAnimation::gotoFrame(CORBA::Long theFrame) {
-  if ((theFrame < 0) || (theFrame > (getNbFrames()-1))) 
+  if (!myView) {
+    MESSAGE("Viewer is not defined for animation");
+    return;
+  }
+  if ((theFrame < 0) || (theFrame > (getNbFrames()-1)))
     return;
   stopAnimation();
   qApp->lock();
   qApp->syncX();
   int i;
-  for (i = 0; i < getNbFields(); i++) 
-    if (myFieldsLst[i].myActors.at(myFrame) != 0)
-      myFieldsLst[i].myActors.at(myFrame)->VisibilityOff();
+  for (i = 0; i < getNbFields(); i++)
+    if (myFieldsLst[i].myActors[myFrame] != 0)
+      myFieldsLst[i].myActors[myFrame]->VisibilityOff();
+
   myFrame = theFrame;
-  for (i = 0; i < getNbFields(); i++) 
-    if (myFieldsLst[i].myActors.at(myFrame) != 0)
-      myFieldsLst[i].myActors.at(myFrame)->VisibilityOn();
-  emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame));
+  for (i = 0; i < getNbFields(); i++)
+    if (myFieldsLst[i].myActors[myFrame] != 0)
+      myFieldsLst[i].myActors[myFrame]->VisibilityOn();
+
+  emit frameChanged(myFrame, myFieldsLst[0].myTiming[myFrame]);
   myView->Repaint();
-  qApp->flushX(); 
+  qApp->flushX();
   qApp->processEvents(3);
   qApp->unlock();
 }
 
 
-//************************************************************************
-VISU::ScalarMap_ptr VISU_TimeAnimation::getPresentation(CORBA::Long theField, CORBA::Long theFrame) {
+//------------------------------------------------------------------------
+VISU::ColoredPrs3d_ptr VISU_TimeAnimation::getPresentation(CORBA::Long theField, CORBA::Long theFrame) {
   if ((theField > getNbFields()) || (theField < 0))
-    return VISU::ScalarMap::_nil();
+    return VISU::ColoredPrs3d::_nil();
   if ((theFrame < 0) || (theFrame > (myFieldsLst[theField].myNbFrames - 1)))
-    return VISU::ScalarMap::_nil();
-  return myFieldsLst[theField].myPrs.at(theFrame)->_this();
+    return VISU::ColoredPrs3d::_nil();
+  return myFieldsLst[theField].myPrs[theFrame]->_this();
 }
 
 
-//************************************************************************
-CORBA::Long VISU_TimeAnimation::getNbFrames() { 
+//------------------------------------------------------------------------
+CORBA::Long VISU_TimeAnimation::getNbFrames() {
   return (getNbFields() > 0)? myFieldsLst[0].myNbFrames : 0;
 }
 
 
-//************************************************************************
-void VISU_TimeAnimation::run() {
+//------------------------------------------------------------------------
+void VISU_TimeAnimation::run()
+{
   if (!myView) {
-    MESSAGE("Viewer is nod defined for animation");
+    MESSAGE("Viewer is not defined for animation");
     return;
   }
-  double k=1;
-  double aOneVal;
-  bool isDumping = !myDumpPath.isEmpty();
-  aOneVal = (myFieldsLst[0].myNbFrames > 2) ?
-    myFieldsLst[0].myTiming.at(1) - myFieldsLst[0].myTiming.at(0) : 1;
-  qApp->lock();      
+  double k = 1;
+  bool   isDumping = !myDumpPath.isEmpty();
+  double aOneVal = 1;
+  if (myFieldsLst[0].myNbFrames > 2)
+    aOneVal = myFieldsLst[0].myTiming[1] - myFieldsLst[0].myTiming[0];
+  myFileIndex = 0;
+  int aNbFiles = 0;
+  QValueList<int> anIndexList;
+
+  qApp->lock();
   while (myIsActive) {
-    emit frameChanged(myFrame, myFieldsLst[0].myTiming.at(myFrame));
+    emit frameChanged(myFrame, myFieldsLst[0].myTiming[myFrame]);
+    if(!(myFieldsLst[0].myField))
+      break;
     for (int i = 0; i < getNbFields(); i++) {
       FieldData& aData = myFieldsLst[i];
       if (myFrame > 0) {
-       if (aData.myActors.at(myFrame-1) != 0) 
-         aData.myActors.at(myFrame-1)->VisibilityOff();
-      } else { 
-       if (aData.myActors.at(aData.myNbFrames-1) != 0)
-         aData.myActors.at(aData.myNbFrames-1)->VisibilityOff();
+       if (aData.myActors[myFrame-1] != 0)
+         aData.myActors[myFrame-1]->VisibilityOff();
+      } else {
+       if (aData.myActors[aData.myNbFrames-1] != 0)
+         aData.myActors[aData.myNbFrames-1]->VisibilityOff();
       }
-      if (aData.myActors.at(myFrame) != 0) {
-       aData.myActors.at(myFrame)->VisibilityOn();
+      if (aData.myActors[myFrame] != 0) {
+       aData.myActors[myFrame]->VisibilityOn();
       }
     }
     myView->Repaint(false);
-    if (isDumping) {
-      QPixmap px = QPixmap::grabWindow(myView->getViewWidget()->winId());
-      QString aFile(myDumpPath);
-      QString aName = QString("%1").arg(myFieldsLst[0].myTiming.at(myFrame));
-      int aPos = -1;
-      while ((aPos = aName.find(".")) > -1 )
-       aName.replace(aPos, 1, "_");
-      aFile += aName;
-      aFile += ".jpeg";
-      px.save(aFile, "JPEG");
+
+    k = 1;
+    if (myProportional) {
+      switch (myFrame) {
+      case 0:
+        break;
+      case 1:
+        if (myFieldsLst[0].myNbFrames > 2)
+          k = (myFieldsLst[0].myTiming[myFrame+1] -
+               myFieldsLst[0].myTiming[myFrame]) / aOneVal;
+        break;
+      default:
+        if (myFrame < (myFieldsLst[0].myNbFrames - 1))
+          k = (myFieldsLst[0].myTiming[myFrame+1] -
+               myFieldsLst[0].myTiming[myFrame]) / aOneVal;
+      }
+    }
+    int delay = (int)(1000. * k / mySpeed);
+    isDumping = !myDumpPath.isEmpty();
+    if (delay < 1 && isDumping) {
+      // We must unlock mutex for some time before grabbing to allow view updating
+      delay = 1;
     }
-    if (!isDumping) {
-      if (myProportional) {
+    qApp->unlock();
+    msleep(delay);
+    qApp->lock();
+
+    if (isDumping) {
+      // We must unlock mutex for some time before grabbing to allow view updating
+      qApp->unlock();
+      msleep(delay);
+      qApp->lock();
+      if(!(myFieldsLst[0].myField)) // break, if field was deleted.
+       break;
+      if (myDumpFormat.compare("AVI") != 0) {
+       QString aFile(myDumpPath);
+       QString aName = QString("%1").arg(myFieldsLst[0].myTiming[myFrame]);
+       int aPos = -1;
+       while ((aPos = aName.find(".")) > -1 )
+         aName.replace(aPos, 1, "_");
+       aFile += aName;
+       aFile += ".";
+       aFile += myDumpFormat.lower();
+       myView->dumpViewToFormat(aFile,myDumpFormat);
+      } else {
+       QFileInfo aFileInfo(myDumpPath);
+       QString aDirPath = aFileInfo.dirPath(true);
+       QString aBaseName = aFileInfo.fileName();
+
        switch (myFrame) {
-       case 0:
-         k=1;
-         break;        
+       case 0: 
+         break;
        case 1:
-         if (myFieldsLst[0].myNbFrames > 2)
-           k = (myFieldsLst[0].myTiming.at(myFrame+1) - myFieldsLst[0].myTiming.at(myFrame))/aOneVal;
-         else
-           k = 1;
-         break;        
+         myFileIndex += 5;
+         break;
        default:
-         k = (myFrame < (myFieldsLst[0].myNbFrames-1))? 
-           (myFieldsLst[0].myTiming.at(myFrame+1) - myFieldsLst[0].myTiming.at(myFrame))/aOneVal : 1;
+         if (myProportional) {
+           double p = (myFieldsLst[0].myTiming[myFrame] -
+                       myFieldsLst[0].myTiming[myFrame-1]) / aOneVal;
+           myFileIndex += (long) (5*p);
+         } else {
+           myFileIndex += 5;
+         }
        }
-      } else
-       k = 1;
-      qApp->unlock();
-      msleep((int)(1000.*k/mySpeed));
-      qApp->lock();
-    } else {
-      qApp->unlock();
-      msleep(100);
-      qApp->lock();
+
+       QString aFile = aDirPath + QDir::separator() + aBaseName;
+       aFile += "_";
+       aFile += QString("%1").arg(myFileIndex).rightJustify(8, '0');
+       aFile += ".jpeg";
+
+       /* check image size is divisable 16
+       myView->dumpViewToFormat(aFile,"JPEG");
+       */
+       SUIT_ViewWindow* aView = myView;
+       QImage img = aView->dumpView();
+       if (!img.isNull()) {
+         int width = img.width(); width = (width/16)*16;
+         int height = img.height(); height = (height/16)*16;
+         QImage copy = img.copy(0, 0, width, height);
+         if (copy.save(aFile, "JPEG")) {
+           anIndexList.append(myFileIndex);
+           aNbFiles++;
+         }
+       }
+      }
     }
+
     if (!myIsActive) break;
 
     myFrame++;
@@ -500,216 +707,622 @@ void VISU_TimeAnimation::run() {
        myFrame = 0;
     }
   }
+
+  // make AVI file if need
+  if (isDumping && myDumpFormat.compare("AVI") == 0) {
+    double aFPS = 17.3 * mySpeed;
+
+    QFileInfo aFileInfo(myDumpPath);
+    QString aDirPath = aFileInfo.dirPath(true);
+    QString aBaseName = aFileInfo.fileName();
+
+    // add missing files
+    if (anIndexList.count() > 1) {
+      QString aFFile = aDirPath + QDir::separator() + aBaseName;
+      aFFile += QString("_%1.jpeg");
+      int aStartIndex = anIndexList[0], anEndIndex;
+      for (int i = 1; i < anIndexList.count(); i++) {
+       anEndIndex = anIndexList[i];
+       QString aCurFile = aFFile.arg(QString::number(aStartIndex).rightJustify(8, '0'));
+       QStringList aCommands;
+       for (int j = aStartIndex+1; j < anEndIndex; j++) {
+         QString aFile = aFFile.arg(QString::number(j).rightJustify(8, '0'));
+         aCommands.append(QString("ln -s %1 %2").arg(aCurFile).arg(aFile));
+       }
+       system(aCommands.join(" ; \\\n").latin1());
+       aStartIndex = anEndIndex;
+      }
+    }
+
+    // make AVI file
+    QString aPattern = aDirPath + QDir::separator() + aBaseName;
+    aPattern += "_\%08d.jpeg";
+
+    QString aCmd = myAVIMaker;
+    aCmd += " -I p";
+    aCmd += " -v 0";
+    aCmd += QString(" -f %1").arg(aFPS);
+    // aCmd += QString(" -n %1").arg(aNbFiles);
+    aCmd += QString(" -n %1").arg(myFileIndex+1);
+    aCmd += QString(" -j %1").arg(aPattern);
+    aCmd += " | yuv2lav";
+    aCmd += QString(" -o %1").arg(myDumpPath);
+    system(aCmd.latin1());
+
+    // remove temporary jpeg files
+    aCmd = "( ";
+    aCmd += QString("cd %1").arg(aDirPath);
+    aCmd += "; ls";
+    aCmd += QString(" | egrep '%1_[0-9]*.jpeg'").arg(aBaseName);
+    aCmd += " | xargs rm";
+    aCmd += " )";
+    system(aCmd.latin1());
+  }
+
   emit stopped();
   qApp->unlock();
   QThread::exit();
 }
 
-//************************************************************************
-VISU::Result_i* VISU_TimeAnimation::createPresent(SALOMEDS::SObject_var theField) {
-  SALOMEDS::SObject_var aSObj = theField->GetFather();
+//------------------------------------------------------------------------
+VISU::Result_i* VISU_TimeAnimation::createPresent (_PTR(SObject) theField)
+{
+  _PTR(SObject) aSObj = theField->GetFather();
   aSObj = aSObj->GetFather();
   aSObj = aSObj->GetFather();
-  CORBA::Object_var anObject = VISU::SObjectToObject(aSObj);
-  if(CORBA::is_nil(anObject)) return NULL;
+  CORBA::Object_var anObject = VISU::ClientSObjectToObject(aSObj);
+  if (CORBA::is_nil(anObject)) return NULL;
   return dynamic_cast<VISU::Result_i*>(VISU::GetServant(anObject).in());
 }
 
-
-//************************************************************************
-VISU::Storable::TRestoringMap VISU_TimeAnimation::getMapOfValue(SALOMEDS::SObject_var theSObject) {
+//------------------------------------------------------------------------
+VISU::Storable::TRestoringMap VISU_TimeAnimation::getMapOfValue (_PTR(SObject) theSObject)
+{
   VISU::Storable::TRestoringMap aMap;
-  if(!theSObject->_is_nil()){
-    SALOMEDS::GenericAttribute_var anAttr;
+  if (theSObject) {
+    _PTR(GenericAttribute) anAttr;
     if (theSObject->FindAttribute(anAttr, "AttributeComment")) {
-      SALOMEDS::AttributeComment_var aComment = SALOMEDS::AttributeComment::_narrow(anAttr);
-      CORBA::String_var aString = aComment->Value();
-      QString strIn(aString.in());
-      VISU::Storable::StrToMap(strIn,aMap);
+      _PTR(AttributeComment) aComment (anAttr);
+      std::string aString = aComment->Value();
+      QString strIn (aString.c_str());
+      VISU::Storable::StrToMap(strIn, aMap);
     }
   }
   return aMap;
 }
 
-//************************************************************************
-double VISU_TimeAnimation::getTimeValue(SALOMEDS::SObject_var theTimeStamp) {
-  SALOMEDS::GenericAttribute_var anAttr;
-  if(theTimeStamp->FindAttribute(anAttr, "AttributeName")) {
-    SALOMEDS::AttributeName_var aName = SALOMEDS::AttributeName::_narrow(anAttr);
-    QString aNameString(aName->Value());
-    return aNameString.toDouble();
+//------------------------------------------------------------------------
+double VISU_TimeAnimation::getTimeValue (_PTR(SObject) theTimeStamp)
+{
+  _PTR(GenericAttribute) anAttr;
+  if (theTimeStamp->FindAttribute(anAttr, "AttributeName")) {
+    _PTR(AttributeName) aName (anAttr);
+    QString aNameString (aName->Value().c_str());
+    int time_len = aNameString.find(',');
+    if (time_len > -1)
+      return aNameString.left(time_len).toDouble();
+    else
+      return aNameString.toDouble();
   }
+  return -1.0;
 }
-  
-//************************************************************************
-void VISU_TimeAnimation::setSpeed(CORBA::Long theSpeed) { 
-  mySpeed = (theSpeed<1)? 1 : theSpeed; 
+
+//------------------------------------------------------------------------
+void VISU_TimeAnimation::setSpeed(CORBA::Long theSpeed)
+{
+  mySpeed = (theSpeed<1)? 1 : theSpeed;
 }
 
+std::string VISU_TimeAnimation::setDumpFormat(const char* theFormat)
+{
+  myDumpFormat = theFormat;
+  QStrList aDumpFormats = QImageIO::outputFormats();
+  if (myDumpFormat.isEmpty() || 
+      (aDumpFormats.find(theFormat) < 0 && myDumpFormat.compare("AVI") != 0)) {
+    if (aDumpFormats.find("JPEG"))
+      myDumpFormat = "JPEG";
+    else
+      myDumpFormat = aDumpFormats.at(0);
+  }
+  return myDumpFormat.latin1();
+}
 
-//========================================================================
-VISU_TimeAnimation_i::VISU_TimeAnimation_i(SALOMEDS::Study_ptr theStudy, VISU::View3D_ptr theView3D){
-  myAnim = new VISU_TimeAnimation(theStudy,theView3D);
+//------------------------------------------------------------------------
+bool VISU_TimeAnimation::checkAVIMaker() const
+{
+  QStrList aDumpFormats = QImageIO::outputFormats();
+  if (aDumpFormats.find("JPEG") < 0) return false;
+
+  QString aCmd("which ");
+  aCmd += myAVIMaker;
+  aCmd += " >& /dev/null";
+  int iErr = system(aCmd.latin1());
+  return (iErr == 0);
 }
 
+//************************************************************************
+int VISU_TimeAnimation::myNBAnimations = 0;
+QString VISU_TimeAnimation::GenerateName()
+{
+  return VISU::GenerateName("Animation", myNBAnimations++);
+}
 
-VISU_TimeAnimation_i::~VISU_TimeAnimation_i(){
-  delete myAnim;
+//------------------------------------------------------------------------
+std::string GetPresentationComment (VISU::VISUType thePrsType)
+{
+  std::string aPrsCmt;
+  switch (thePrsType) {
+  case VISU::TSCALARMAP:
+    aPrsCmt = VISU::ScalarMap_i::myComment;
+    break;
+  case VISU::TISOSURFACE:
+    aPrsCmt = VISU::IsoSurfaces_i::myComment;
+    break;
+  case VISU::TCUTPLANES:
+    aPrsCmt = VISU::CutPlanes_i::myComment;
+    break;
+  case VISU::TCUTLINES:
+    aPrsCmt = VISU::CutLines_i::myComment;
+    break;
+  case VISU::TPLOT3D:
+    aPrsCmt = VISU::Plot3D_i::myComment;
+    break;
+  case VISU::TDEFORMEDSHAPE:
+    aPrsCmt = VISU::DeformedShape_i::myComment;
+    break;
+  case VISU::TVECTORS:
+    aPrsCmt = VISU::Vectors_i::myComment;
+    break;
+  case VISU::TSTREAMLINES:
+    aPrsCmt = VISU::StreamLines_i::myComment;
+    break;
+  case VISU::TGAUSSPOINTS:
+    aPrsCmt = VISU::GaussPoints_i::myComment;
+    break;
+  case VISU::TSCALARMAPONDEFORMEDSHAPE:
+    aPrsCmt = VISU::ScalarMapOnDeformedShape_i::myComment;
+    break;
+  default:
+    aPrsCmt = "Unknown presentation";
+    break;
+  }
+  return aPrsCmt;
 }
 
+//------------------------------------------------------------------------
+SALOMEDS::SObject_ptr VISU_TimeAnimation::publishInStudy()
+{
+  if (myStudy->GetProperties()->IsLocked())
+    return SALOMEDS::SObject::_nil();
 
-void VISU_TimeAnimation_i::addField(SALOMEDS::SObject_ptr theField){
-  myAnim->addField(theField);
-}
+  _PTR(StudyBuilder) aStudyBuilder = myStudy->NewBuilder();
+  aStudyBuilder->NewCommand();  // There is a transaction
+  _PTR(SComponent) aSComponent = VISU::ClientFindOrCreateVisuComponent(myStudy);
+  std::string aSComponentEntry = aSComponent->GetID();
 
+  QString aComment;
+  aComment.sprintf("myComment=ANIMATION;myType=%d;myTimeMinVal=%g;myTimeMaxVal=%g",
+                   VISU::TANIMATION,myTimeMinVal,myTimeMaxVal);
 
-CORBA::Boolean VISU_TimeAnimation_i::generateFrames(){
-  return ProcessEvent(new TMemFunEvent<VISU_TimeAnimation,bool>(myAnim,&VISU_TimeAnimation::generateFrames));
-}
+  string anEntry = VISU::CreateAttributes(myStudy,aSComponentEntry.c_str(),"","",
+                                          GenerateName(),"",aComment,true);
+  myAnimEntry = anEntry.c_str();
+  _PTR(SObject) aAnimSObject = myStudy->FindObjectID(anEntry.c_str());
 
+  for (int i = 0; i < getNbFields(); i++) {
+    FieldData& aData = myFieldsLst[i];
 
-void VISU_TimeAnimation_i::generatePresentations(CORBA::Long theFieldNum){
-  myAnim->generatePresentations(theFieldNum);
+    _PTR(SObject) newObj = aStudyBuilder->NewObject(aAnimSObject);
+    aStudyBuilder->Addreference(newObj, aData.myField);
+
+    if (aData.myPrs.empty()) {
+      generatePresentations(i);
+    }
+    ostringstream strOut;
+    aData.myPrs[0]->ToStream(strOut);
+    string aPrsComment = strOut.str();
+    VISU::CreateAttributes(myStudy, newObj->GetID().c_str(),"","",
+                           aData.myPrs[0]->GetComment(),"",aPrsComment.c_str(),true);
+  }
+  aStudyBuilder->CommitCommand();
+
+  return VISU::GetSObject(aAnimSObject);
 }
 
+//------------------------------------------------------------------------
+void VISU_TimeAnimation::saveAnimation()
+{
+  if (myStudy->GetProperties()->IsLocked()) return;
+  if (myAnimEntry.isEmpty()) return;
+
+  _PTR(SObject) aAnimSObject = myStudy->FindObjectID(myAnimEntry.latin1());
+  if (!aAnimSObject) return;
+
+  _PTR(StudyBuilder) aStudyBuilder = myStudy->NewBuilder();
+  aStudyBuilder->NewCommand();  // There is a transaction
+  _PTR(SComponent) aSComponent = VISU::ClientFindOrCreateVisuComponent(myStudy);
+  std::string aSComponentEntry = aSComponent->GetID();
+
+  QString aComment;
+  aComment.sprintf("myComment=ANIMATION;myType=%d;myTimeMinVal=%g;myTimeMaxVal=%g",
+                   VISU::TANIMATION,myTimeMinVal,myTimeMaxVal);
+
+  _PTR(GenericAttribute) anAttr;
+  anAttr = aStudyBuilder->FindOrCreateAttribute(aAnimSObject, "AttributeComment");
+  _PTR(AttributeComment) aCmnt (anAttr);
+  aCmnt->SetValue(aComment.latin1());
+
+  _PTR(ChildIterator) anIter = myStudy->NewChildIterator(aAnimSObject);
+  int i = 0, nbf = getNbFields();
+  for (anIter->Init(); anIter->More(); anIter->Next(), i++) {
+    if (i >= nbf) break; // it must not be
+    FieldData& aData = myFieldsLst[i];
+
+    // Get presentation name and comment
+    if (aData.myPrs.empty()) {
+      generatePresentations(i);
+    }
+    ostringstream strOut;
+    aData.myPrs[0]->ToStream(strOut);
+    string aPrsComment = strOut.str();
+    string aPrsNameTxt = aData.myPrs[0]->GetComment();
+
+    // Save in study
+    _PTR(SObject) aRefObj = anIter->Value();
+    _PTR(ChildIterator) anPrsIter = myStudy->NewChildIterator(aRefObj);
+    anPrsIter->Init();
+
+    if (anPrsIter->More()) {
+      _PTR(SObject) aPrsObj = anPrsIter->Value();
+      anAttr = aStudyBuilder->FindOrCreateAttribute(aPrsObj, "AttributeComment");
+      aCmnt = _PTR(AttributeComment)(anAttr);
+      aCmnt->SetValue(aPrsComment.c_str());
+
+      anAttr = aStudyBuilder->FindOrCreateAttribute(aPrsObj, "AttributeName");
+      _PTR(AttributeName) aPrsName (anAttr);
+      aPrsName->SetValue(aPrsNameTxt);
 
-void VISU_TimeAnimation_i::clearView(){
-  ProcessVoidEvent(new TVoidMemFunEvent<VISU_TimeAnimation>(myAnim,&VISU_TimeAnimation::clearView));
+    } else {
+      VISU::CreateAttributes(myStudy, aRefObj->GetID().c_str(),"","",
+                             aPrsNameTxt.c_str(),"",aPrsComment.c_str(),true);
+    }
+  }
+  aStudyBuilder->CommitCommand();
 }
 
+//------------------------------------------------------------------------
+void VISU_TimeAnimation::restoreFromStudy(SALOMEDS::SObject_ptr theField)
+{
+  _PTR(SObject) aAnimSObject = VISU::GetClientSObject(theField, myStudy);
+  restoreFromStudy(aAnimSObject);
+}
+
+void VISU_TimeAnimation::restoreFromStudy(_PTR(SObject) theField)
+{
+  _PTR(SObject) aAnimSObject = theField;
 
-void VISU_TimeAnimation_i::stopAnimation(){
-  ProcessVoidEvent(new TVoidMemFunEvent<VISU_TimeAnimation>(myAnim,&VISU_TimeAnimation::stopAnimation));
+  VISU::Storable::TRestoringMap aMap;
+  _PTR(GenericAttribute) anAttr;
+  if (!aAnimSObject->FindAttribute(anAttr, "AttributeComment")) return;
+
+  _PTR(AttributeComment) aComment (anAttr);
+  string aComm = aComment->Value();
+  QString strIn (aComm.c_str());
+  VISU::Storable::StrToMap(strIn,aMap);
+  bool isExist;
+
+  myTimeMinVal = VISU::Storable::FindValue(aMap,"myTimeMinVal",&isExist).toDouble();
+  myTimeMaxVal = VISU::Storable::FindValue(aMap,"myTimeMaxVal",&isExist).toDouble();
+
+  _PTR(ChildIterator) anIter = myStudy->NewChildIterator(aAnimSObject);
+  for (anIter->Init(); anIter->More(); anIter->Next()) {
+    _PTR(SObject) aRefObj = anIter->Value();
+    _PTR(SObject) aFieldObj;
+    if (!aRefObj->ReferencedObject(aFieldObj) ) continue;
+    addField(aFieldObj);
+    FieldData& aData = getFieldData(getNbFields()-1);
+
+    // Get Presentation object
+    _PTR(ChildIterator) anPrsIter = myStudy->NewChildIterator(aRefObj);
+    anPrsIter->Init();
+    if (!anPrsIter->More()) continue;
+    _PTR(SObject) aPrsObj = anPrsIter->Value();
+    if (!aPrsObj->FindAttribute(anAttr, "AttributeName")) continue;
+    _PTR(AttributeName) aName (anAttr);
+    string aStr = aName->Value();
+    QString strName (aStr.c_str());
+
+    if (strName == VISU::ScalarMap_i::myComment.c_str())
+      aData.myPrsType = VISU::TSCALARMAP;
+    else if (strName == VISU::IsoSurfaces_i::myComment.c_str())
+      aData.myPrsType = VISU::TISOSURFACE;
+    else if (strName == VISU::CutPlanes_i::myComment.c_str())
+      aData.myPrsType = VISU::TCUTPLANES;
+    else if (strName == VISU::CutLines_i::myComment.c_str())
+      aData.myPrsType = VISU::TCUTLINES;
+    else if (strName == VISU::Plot3D_i::myComment.c_str())
+      aData.myPrsType = VISU::TPLOT3D;
+    else if (strName == VISU::DeformedShape_i::myComment.c_str())
+      aData.myPrsType = VISU::TDEFORMEDSHAPE;
+    else if (strName == VISU::Vectors_i::myComment.c_str())
+      aData.myPrsType = VISU::TVECTORS;
+    else if (strName == VISU::StreamLines_i::myComment.c_str())
+      aData.myPrsType = VISU::TSTREAMLINES;
+    else if (strName == VISU::GaussPoints_i::myComment.c_str())
+      aData.myPrsType = VISU::TGAUSSPOINTS;
+    else if (strName == VISU::ScalarMapOnDeformedShape_i::myComment.c_str())
+      aData.myPrsType = VISU::TSCALARMAPONDEFORMEDSHAPE;
+    else
+      continue;
+    generatePresentations(getNbFields()-1);
+
+    if (!aPrsObj->FindAttribute(anAttr, "AttributeComment")) continue;
+    _PTR(AttributeComment) aPrsComment (anAttr);
+    string aPrsComm = aPrsComment->Value();
+    if (aPrsComm.length() > 0) {
+      QString strPrsIn (aPrsComm.c_str());
+      VISU::Storable::TRestoringMap aPrsMap;
+      VISU::Storable::StrToMap(strPrsIn,aPrsMap);
+
+      aData.myPrs[0]->Restore(aPrsMap);
+    }
+    aData.myPrs[0]->GetOffset(aData.myOffset);
+    for (int i = 1; i < aData.myNbFrames; i++) {
+      //jfa 03.08.2005:aData.myPrs[i]->SameAs(aData.myPrs[0]);
+      aData.myPrs[i]->SameAsParams(aData.myPrs[0]);//jfa 03.08.2005
+    }
+  }
+  string aStr = aAnimSObject->GetID();
+  myAnimEntry = aStr.c_str();
 }
 
+void VISU_TimeAnimation::onViewDeleted()
+{
+  myView = 0;
+}
+
+
+//========================================================================
+//========================================================================
+//========================================================================
+struct TNewAnimationEvent: public SALOME_Event
+{
+  std::string myStudyName;
+  VISU::View3D_ptr myView3D;
+
+  typedef VISU_TimeAnimation* TResult;
+  TResult myResult;
+
+  TNewAnimationEvent (std::string theStudyName, VISU::View3D_ptr theView3D):
+    myStudyName(theStudyName),
+    myView3D(VISU::View3D::_duplicate(theView3D)),
+    myResult(NULL)
+  {}
+
+  virtual
+  void
+  Execute()
+  {
+    SUIT_Session* aSession = SUIT_Session::session();
+    QPtrList<SUIT_Application> anApplications = aSession->applications();
+    QPtrListIterator<SUIT_Application> anIter (anApplications);
+    while (SUIT_Application* anApp = anIter.current()) {
+      ++anIter;
+      if (SUIT_Study* aSStudy = anApp->activeStudy()) {
+        if (SalomeApp_Study* aStudy = dynamic_cast<SalomeApp_Study*>(aSStudy)) {
+          if (_PTR(Study) aCStudy = aStudy->studyDS()) {
+            if (myStudyName == aCStudy->Name()) {
+              myResult = new VISU_TimeAnimation (aCStudy, myView3D);
+              break;
+            }
+          }
+        }
+      }
+    }
+  }
+};
 
-void VISU_TimeAnimation_i::startAnimation(){
-  ProcessVoidEvent(new TVoidMemFunEvent<VISU_TimeAnimation>(myAnim,&VISU_TimeAnimation::startAnimation));
+VISU_TimeAnimation_i::VISU_TimeAnimation_i (SALOMEDS::Study_ptr theStudy,
+                                            VISU::View3D_ptr theView3D)
+{
+  std::string aStudyName = theStudy->Name();
+  myAnim = ProcessEvent(new TNewAnimationEvent (aStudyName, theView3D));
 }
 
+VISU_TimeAnimation_i::~VISU_TimeAnimation_i()
+{
+  delete myAnim;
+}
 
-void VISU_TimeAnimation_i::nextFrame(){
-  ProcessVoidEvent(new TVoidMemFunEvent<VISU_TimeAnimation>(myAnim,&VISU_TimeAnimation::nextFrame));
+void VISU_TimeAnimation_i::addField (SALOMEDS::SObject_ptr theField)
+{
+  myAnim->addField(theField);
 }
 
+CORBA::Boolean VISU_TimeAnimation_i::generateFrames()
+{
+  return ProcessEvent(new TMemFunEvent<VISU_TimeAnimation,bool>
+                      (myAnim,&VISU_TimeAnimation::generateFrames));
+}
 
-void VISU_TimeAnimation_i::prevFrame(){
-  ProcessVoidEvent(new TVoidMemFunEvent<VISU_TimeAnimation>(myAnim,&VISU_TimeAnimation::prevFrame));
+void VISU_TimeAnimation_i::generatePresentations (CORBA::Long theFieldNum)
+{
+  myAnim->generatePresentations(theFieldNum);
 }
 
+void VISU_TimeAnimation_i::clearView()
+{
+  ProcessVoidEvent(new TVoidMemFunEvent<VISU_TimeAnimation>
+                   (myAnim,&VISU_TimeAnimation::clearView));
+}
 
-void VISU_TimeAnimation_i::firstFrame(){
-  ProcessVoidEvent(new TVoidMemFunEvent<VISU_TimeAnimation>(myAnim,&VISU_TimeAnimation::firstFrame));
+void VISU_TimeAnimation_i::stopAnimation()
+{
+  ProcessVoidEvent(new TVoidMemFunEvent<VISU_TimeAnimation>
+                   (myAnim,&VISU_TimeAnimation::stopAnimation));
 }
 
+void VISU_TimeAnimation_i::startAnimation()
+{
+  ProcessVoidEvent(new TVoidMemFunEvent<VISU_TimeAnimation>
+                   (myAnim,&VISU_TimeAnimation::startAnimation));
+}
 
-void VISU_TimeAnimation_i::lastFrame(){
-  ProcessVoidEvent(new TVoidMemFunEvent<VISU_TimeAnimation>(myAnim,&VISU_TimeAnimation::lastFrame));
+void VISU_TimeAnimation_i::nextFrame()
+{
+  ProcessVoidEvent(new TVoidMemFunEvent<VISU_TimeAnimation>
+                   (myAnim,&VISU_TimeAnimation::nextFrame));
 }
 
+void VISU_TimeAnimation_i::prevFrame()
+{
+  ProcessVoidEvent(new TVoidMemFunEvent<VISU_TimeAnimation>
+                   (myAnim,&VISU_TimeAnimation::prevFrame));
+}
 
-void VISU_TimeAnimation_i::gotoFrame(CORBA::Long theFrame){
-  ProcessVoidEvent(new TVoidMemFun1ArgEvent<VISU_TimeAnimation,CORBA::Long>(myAnim,&VISU_TimeAnimation::gotoFrame,theFrame));
+void VISU_TimeAnimation_i::firstFrame()
+{
+  ProcessVoidEvent(new TVoidMemFunEvent<VISU_TimeAnimation>
+                   (myAnim,&VISU_TimeAnimation::firstFrame));
 }
 
+void VISU_TimeAnimation_i::lastFrame()
+{
+  ProcessVoidEvent(new TVoidMemFunEvent<VISU_TimeAnimation>
+                   (myAnim,&VISU_TimeAnimation::lastFrame));
+}
 
-CORBA::Long VISU_TimeAnimation_i::getNbFields(){
-  return myAnim->getNbFields();
+void VISU_TimeAnimation_i::gotoFrame(CORBA::Long theFrame)
+{
+  ProcessVoidEvent(new TVoidMemFun1ArgEvent<VISU_TimeAnimation,CORBA::Long>
+                   (myAnim,&VISU_TimeAnimation::gotoFrame,theFrame));
 }
 
+CORBA::Long VISU_TimeAnimation_i::getNbFields()
+{
+  return myAnim->getNbFields();
+}
 
-CORBA::Long VISU_TimeAnimation_i::getNbFrames(){
+CORBA::Long VISU_TimeAnimation_i::getNbFrames()
+{
   return myAnim->getNbFrames();
 }
 
-
-CORBA::Boolean VISU_TimeAnimation_i::isRunning(){
+CORBA::Boolean VISU_TimeAnimation_i::isRunning()
+{
   return myAnim->isRunning();
 }
 
-
-CORBA::Long VISU_TimeAnimation_i::getCurrentFrame(){
+CORBA::Long VISU_TimeAnimation_i::getCurrentFrame()
+{
   return myAnim->getCurrentFrame();
 }
 
-
-VISU::ScalarMap_ptr VISU_TimeAnimation_i::getPresentation(CORBA::Long theField, CORBA::Long theFrame){
+VISU::ColoredPrs3d_ptr VISU_TimeAnimation_i::getPresentation
+                    (CORBA::Long theField, CORBA::Long theFrame)
+{
   return myAnim->getPresentation(theField,theFrame);
 }
 
-
-void VISU_TimeAnimation_i::setPresentationType(CORBA::Long theFieldNum, VISU::VISUType theType){
+void VISU_TimeAnimation_i::setPresentationType (CORBA::Long theFieldNum,
+                                                VISU::VISUType theType)
+{
   myAnim->setPresentationType(theFieldNum,theType);
 }
 
-
-VISU::VISUType VISU_TimeAnimation_i::getPresentationType(CORBA::Long theFieldNum){
+VISU::VISUType VISU_TimeAnimation_i::getPresentationType (CORBA::Long theFieldNum)
+{
   return myAnim->getPresentationType(theFieldNum);
 }
 
-
-void VISU_TimeAnimation_i::setSpeed(CORBA::Long theSpeed){
+void VISU_TimeAnimation_i::setSpeed(CORBA::Long theSpeed)
+{
   myAnim->setSpeed(theSpeed);
 }
 
-
-CORBA::Long VISU_TimeAnimation_i::getSpeed(){
+CORBA::Long VISU_TimeAnimation_i::getSpeed()
+{
   return myAnim->getSpeed();
 }
 
-
-CORBA::Boolean VISU_TimeAnimation_i::isProportional(){
+CORBA::Boolean VISU_TimeAnimation_i::isProportional()
+{
   return myAnim->isProportional();
 }
 
-
-void VISU_TimeAnimation_i::setAnimationRange(CORBA::Double theMin, CORBA::Double theMax){
+void VISU_TimeAnimation_i::setAnimationRange (CORBA::Double theMin,
+                                              CORBA::Double theMax)
+{
   myAnim->setAnimationRange(theMin,theMax);
 }
 
-
-CORBA::Double VISU_TimeAnimation_i::getMinRange(){
+CORBA::Double VISU_TimeAnimation_i::getMinRange()
+{
   return myAnim->getMinRange();
 }
 
-
-CORBA::Double VISU_TimeAnimation_i::getMaxRange(){
+CORBA::Double VISU_TimeAnimation_i::getMaxRange()
+{
   return myAnim->getMaxRange();
 }
 
-
-CORBA::Boolean VISU_TimeAnimation_i::isRangeDefined(){
+CORBA::Boolean VISU_TimeAnimation_i::isRangeDefined()
+{
   return myAnim->isRangeDefined();
 }
 
-
-void VISU_TimeAnimation_i::dumpTo(const char* thePath){
+void VISU_TimeAnimation_i::dumpTo (const char* thePath)
+{
   myAnim->dumpTo(thePath);
 }
 
+char* VISU_TimeAnimation_i::setDumpFormat (const char* theFormat)
+{
+  string aDumpFormat = myAnim->setDumpFormat(theFormat);
+  return CORBA::string_dup(aDumpFormat.c_str());
+}
 
-CORBA::Boolean VISU_TimeAnimation_i::isCycling(){
+CORBA::Boolean VISU_TimeAnimation_i::isCycling()
+{
   return myAnim->isCycling();
 }
 
-
-CORBA::Double VISU_TimeAnimation_i::getMinTime(){
+CORBA::Double VISU_TimeAnimation_i::getMinTime()
+{
   return myAnim->getMinTime();
 }
 
-
-CORBA::Double VISU_TimeAnimation_i::getMaxTime(){
+CORBA::Double VISU_TimeAnimation_i::getMaxTime()
+{
   return myAnim->getMaxTime();
 }
 
-
-void VISU_TimeAnimation_i::setProportional(CORBA::Boolean theProp){
+void VISU_TimeAnimation_i::setProportional (CORBA::Boolean theProp)
+{
   myAnim->setProportional(theProp);
 }
 
-
-void VISU_TimeAnimation_i::setCycling(CORBA::Boolean theCycle){
+void VISU_TimeAnimation_i::setCycling (CORBA::Boolean theCycle)
+{
   myAnim->setCycling(theCycle);
 }
 
+SALOMEDS::SObject_ptr VISU_TimeAnimation_i::publishInStudy()
+{
+  return myAnim->publishInStudy();
+}
+
+void VISU_TimeAnimation_i::restoreFromStudy(SALOMEDS::SObject_ptr theObj)
+{
+  myAnim->restoreFromStudy(theObj);
+}
 
+CORBA::Boolean VISU_TimeAnimation_i::isSavedInStudy()
+{
+  return myAnim->isSavedInStudy();
+}
+
+void VISU_TimeAnimation_i::saveAnimation()
+{
+  myAnim->saveAnimation();
+}