Revision: 18556
http://sourceforge.net/p/jmol/code/18556
Author: hansonr
Date: 2013-08-12 23:46:39 +0000 (Mon, 12 Aug 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/thread/MoveToThread.java
Modified: trunk/Jmol/src/org/jmol/thread/MoveToThread.java
===================================================================
--- trunk/Jmol/src/org/jmol/thread/MoveToThread.java 2013-08-12 22:59:35 UTC
(rev 18555)
+++ trunk/Jmol/src/org/jmol/thread/MoveToThread.java 2013-08-12 23:46:39 UTC
(rev 18556)
@@ -91,7 +91,6 @@
transformManager = (TransformManager) manager;
center = (P3) options[0];
matrixEnd.setM((Matrix3f) options[1]);
- navCenter = (P3) options[2];
float[] f = (float[]) options[3];
int[] ret = (int[]) options[4];
ptMoveToCenter = (center == null ? transformManager.fixedRotationCenter
@@ -106,13 +105,14 @@
pixelScale = newSlider(transformManager.scaleDefaultPixelsPerAngstrom,
(center == null ? transformManager.scaleDefaultPixelsPerAngstrom
:
transformManager.defaultScaleToScreen(this.rotationRadius.value)));
- if (navCenter != null) {
+ if (f[7] != 0) {
+ navDepth = newSlider(transformManager.getNavigationDepthPercent(),
+ f[7]);
xNav = newSlider(transformManager.getNavigationOffsetPercent('X'),
f[5]);
yNav = newSlider(transformManager.getNavigationOffsetPercent('Y'),
f[6]);
- navDepth = newSlider(transformManager.getNavigationDepthPercent(),
- f[7]);
+ navCenter = (P3) options[2];
}
cameraDepth = newSlider(transformManager.getCameraDepth(), f[8]);
cameraX = newSlider(transformManager.camera.x, f[9]);
@@ -124,7 +124,7 @@
fps = 30;
totalSteps = (int) (floatSecondsTotal * fps);
- if (totalSteps != 0)
+ if (totalSteps == 0)
return;
frameTimeMillis = 1000 / fps;
targetTime = System.currentTimeMillis();
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
