[Jmol-commits] SF.net SVN: jmol:[15254] branches/v12_0/Jmol/src/org/jmol/viewer

[<ha...@us...>]

Revision: 15254
          http://jmol.svn.sourceforge.net/jmol/?rev=15254&view=rev
Author:   hansonr
Date:     2011-03-08 19:39:18 +0000 (Tue, 08 Mar 2011)

Log Message:
-----------
version=12.0.35

# bug fix: load of model when animation is on may cause animation NEXT to fail

Modified Paths:
--------------
    branches/v12_0/Jmol/src/org/jmol/viewer/AnimationManager.java
    branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties

Modified: branches/v12_0/Jmol/src/org/jmol/viewer/AnimationManager.java
===================================================================
--- branches/v12_0/Jmol/src/org/jmol/viewer/AnimationManager.java	2011-03-08 19:38:17 UTC (rev 15253)
+++ branches/v12_0/Jmol/src/org/jmol/viewer/AnimationManager.java	2011-03-08 19:39:18 UTC (rev 15254)
@@ -175,18 +175,15 @@
   }
 
   void clear() {
-    clearAnimation();
-  }
-  
-  void clearAnimation() {
     setAnimationOn(false);
     setCurrentModelIndex(0);
+    currentDirection = 1;
     setAnimationDirection(1);
     setAnimationFps(10);
     setAnimationReplayMode(0, 0, 0);
     initializePointers(0);
   }
-
+  
   Hashtable getAnimationInfo(){
     Hashtable info = new Hashtable();
     info.put("firstModelIndex", new Integer(firstModelIndex));

Modified: branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties	2011-03-08 19:38:17 UTC (rev 15253)
+++ branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties	2011-03-08 19:39:18 UTC (rev 15254)
@@ -4,6 +4,7 @@
 
 version=12.0.35
 
+# bug fix: load of model when animation is on may cause animation NEXT to fail
 # new feature: (fixing property smoothing) isosurface... map property x WITHIN x.y
 #  -- allows a maximum distance to be defined; speeds up calculation
 #  -- defaults to 5.0 when set isosurfacePropertySmoothing FALSE


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.