Merge remote branch 'origin/V7_dev'

[modules/paravis.git] / src / Macro / modes.py

diff --git a/src/Macro/modes.py b/src/Macro/modes.py
index 39733e7f56cab02b0ace5c3516f47fa247273d53..a0396b53b775733cbaf914fa78f8fdb478a373fc 100644 (file)
--- a/src/Macro/modes.py
+++ b/src/Macro/modes.py
@@ -1,9 +1,9 @@
-# Copyright (C) 2010-2013  CEA/DEN, EDF R&D
+# Copyright (C) 2010-2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -81,7 +81,9 @@ else :
   TimeAnimationCue1 = GetTimeTrack()
   TimeAnimationCue1.Enabled = 0
 
-  KeyFrameAnimationCue1 = GetAnimationTrack( ScaleVector1.GetProperty('ScaleFactor'))
+  KeyFrameAnimationCue1 = KeyFrameAnimationCue()
+  KeyFrameAnimationCue1.AnimatedProxy = ScaleVector1
+  KeyFrameAnimationCue1.AnimatedPropertyName = "ScaleFactor"
   KeyFrame0 = CompositeKeyFrame( KeyValues=[1.0], Interpolation='Sinusoid' )
   KeyFrame1 = CompositeKeyFrame( KeyTime=1.000000001, KeyValues=[1.0] )
 
@@ -90,6 +92,8 @@ else :
   AnimationScene1.Cues.append(KeyFrameAnimationCue1)
   AnimationScene1.Loop = 1
   AnimationScene1.PlayMode = 'Sequence'
+  AnimationScene1.StartTime = 0
+  AnimationScene1.EndTime = 1
   AnimationScene1.NumberOfFrames = 21
   
   WarpByVectorDataRepresentation = Show(WarpByVector1)
@@ -97,5 +101,6 @@ else :
     pvLookupTable = GetLookupTableForArray( rootname, 3, VectorMode='Magnitude' )
     WarpByVectorDataRepresentation.ColorArrayName = rootname
     WarpByVectorDataRepresentation.LookupTable = pvLookupTable
-  
+    WarpByVectorDataRepresentation.RescaleTransferFunctionToDataRange(True)
+
   AnimationScene1.Play()