Revision: 18565
http://sourceforge.net/p/jmol/code/18565
Author: hansonr
Date: 2013-08-14 11:45:59 +0000 (Wed, 14 Aug 2013)
Log Message:
-----------
___JmolVersion="13.2.4_dev_2013.08.14"
bug fix: set wireframeRotation not working ("inMotion" flag not properly read
in Viewer).
Modified Paths:
--------------
branches/v13_2/Jmol/src/org/jmol/viewer/Jmol.properties
branches/v13_2/Jmol/src/org/jmol/viewer/Viewer.java
Modified: branches/v13_2/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v13_2/Jmol/src/org/jmol/viewer/Jmol.properties 2013-08-14
10:38:00 UTC (rev 18564)
+++ branches/v13_2/Jmol/src/org/jmol/viewer/Jmol.properties 2013-08-14
11:45:59 UTC (rev 18565)
@@ -9,8 +9,10 @@
# Don't use ___ in your text, as that is the key for stripping out
# the information saved in the JAR version of this file.
-___JmolVersion="13.2.4_dev_2013.08.13"
+___JmolVersion="13.2.4_dev_2013.08.14"
+bug fix: set wireframeRotation not working ("inMotion" flag not properly read
in Viewer).
+
bug fix: screen repaints were being requested far too frequently
Modified: branches/v13_2/Jmol/src/org/jmol/viewer/Viewer.java
===================================================================
--- branches/v13_2/Jmol/src/org/jmol/viewer/Viewer.java 2013-08-14 10:38:00 UTC
(rev 18564)
+++ branches/v13_2/Jmol/src/org/jmol/viewer/Viewer.java 2013-08-14 11:45:59 UTC
(rev 18565)
@@ -3875,19 +3875,24 @@
global.setB("_animMovie", animationManager.isMovie);
}
- boolean wasInMotion = false;
- int motionEventNumber;
+ private boolean inMotion;
+ private boolean wasInMotion;
+ private int motionEventNumber;
@Override
public int getMotionEventNumber() {
return motionEventNumber;
}
+ public boolean getInMotion(boolean includeAnim) {
+ return (inMotion || includeAnim && animationManager.animationOn);
+ }
+
@Override
public void setInMotion(boolean inMotion) {
// MouseManager, TransformManager
if (wasInMotion ^ inMotion) {
- animationManager.inMotion = inMotion;
+ this.inMotion = inMotion;
if (inMotion) {
startHoverWatcher(false);
++motionEventNumber;
@@ -3899,11 +3904,6 @@
}
}
- public boolean getInMotion(boolean includeAnim) {
- return animationManager.inMotion
- && (!includeAnim || animationManager.animationOn);
- }
-
private boolean refreshing = true;
private void setRefreshing(boolean TF) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
