Revision: 18328
http://sourceforge.net/p/jmol/code/18328
Author: hansonr
Date: 2013-06-14 00:18:30 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
__JmolVersion="13.1.17_dev_2013.06.13"
bug fix: animation MORPH broken for non-PyMOL files
-- load trajectory ({0 6}) 1cdr.pdb
-- animation MORPH 10
-- animation ON
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/viewer/AnimationManager.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
trunk/Jmol/src/org/jmol/viewer/Viewer.java
Modified: trunk/Jmol/src/org/jmol/viewer/AnimationManager.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/AnimationManager.java 2013-06-13
22:54:03 UTC (rev 18327)
+++ trunk/Jmol/src/org/jmol/viewer/AnimationManager.java 2013-06-14
00:18:30 UTC (rev 18328)
@@ -279,6 +279,7 @@
if (framePointer >= frameCount) framePointer = frameCount - 1;
if (framePointer2 >= frameCount) framePointer2 = frameCount - 1;
firstFrameIndex = framePointer;
+ currentMorphModel = firstFrameIndex;
lastFrameIndex = framePointer2;
frameStep = (framePointer2 < framePointer ? -1 : 1);
rewindAnimation();
@@ -396,6 +397,8 @@
int iModel = modelIndexForFrame(i);
currentAnimationFrame = i;
i = iModel;
+ } else {
+ currentAnimationFrame = i;
}
setModel(i, true);
} catch (Exception e) {
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2013-06-13 22:54:03 UTC
(rev 18327)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2013-06-14 00:18:30 UTC
(rev 18328)
@@ -11,6 +11,11 @@
___JmolVersion="13.1.17_dev_2013.06.13"
+bug fix: animation MORPH broken for non-PyMOL files
+ -- load trajectory ({0 6}) 1cdr.pdb
+ -- animation MORPH 10
+ -- animation ON
+
bug fix: draw ARROW ATOM/BOND broken
bug fix: draw ARROW with offset disallows set picking draw adjustments
bug fix: concurrrent loading of two cif files by two different applets fails
Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-06-13 22:54:03 UTC (rev
18327)
+++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-06-14 00:18:30 UTC (rev
18328)
@@ -2849,9 +2849,8 @@
}
public void startHoverWatcher(boolean tf) {
- if (!haveDisplay)
+ if (!haveDisplay || tf && (!hoverEnabled || animationManager.animationOn))
return;
- if (hoverEnabled || !tf)
actionManager.startHoverWatcher(tf);
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
