[Jmol-commits] SF.net SVN: jmol:[10573] trunk/Jmol/src/org/jmol/viewer/TransformManager. java

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

Revision: 10573
          http://jmol.svn.sourceforge.net/jmol/?rev=10573&view=rev
Author:   hansonr
Date:     2009-01-22 06:17:53 +0000 (Thu, 22 Jan 2009)

Log Message:
-----------
VERSION

version=11.7.22

# new feature: translate x|y|z x.x nm|angstroms

Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/viewer/TransformManager.java

Modified: trunk/Jmol/src/org/jmol/viewer/TransformManager.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/TransformManager.java	2009-01-22 00:10:16 UTC (rev 10572)
+++ trunk/Jmol/src/org/jmol/viewer/TransformManager.java	2009-01-22 06:17:53 UTC (rev 10573)
@@ -639,13 +639,14 @@
   }
 
   void translateZBy(int pixels) {
-    if (pixels >= width)
+    if (pixels >= screenPixelCount)
       return;
-    float sppa = scalePixelsPerAngstrom / (1 - pixels * 1.0f / width);
-    //System.out.println(scalePixelsPerAngstrom + " pixels:" + sppa + " w=" + (width/scalePixelsPerAngstrom) + " new w=" + (width/sppa));
-    float deltaPercent = sppa / scaleDefaultPixelsPerAngstrom * 100f - zoomPercentSetting;
-    zoomRatio = (deltaPercent + zoomPercentSetting) / zoomPercentSetting;
-    zoomPercentSetting += deltaPercent;
+    float sppa = scalePixelsPerAngstrom / (1 - pixels * 1.0f / screenPixelCount);
+    if (sppa >= screenPixelCount)
+      return;
+    float newZoomPercent = sppa / scaleDefaultPixelsPerAngstrom * 100f;
+    zoomRatio = newZoomPercent / zoomPercentSetting;
+    zoomPercentSetting = newZoomPercent;
   }
   
   void zoomByFactor(float factor) {


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