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

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

Revision: 6220
          http://svn.sourceforge.net/jmol/?rev=6220&view=rev
Author:   hansonr
Date:     2006-11-15 14:58:47 -0800 (Wed, 15 Nov 2006)

Log Message:
-----------
ugly bug -- when this setting is true, then the moveto command gets the
wrong value for its setting, since that setting is BEFORE rendering. 
Basically this violates the tenet that renders should not be 
setting permanent display values.

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	2006-11-15 22:06:23 UTC (rev 6219)
+++ trunk/Jmol/src/org/jmol/viewer/TransformManager.java	2006-11-15 22:58:47 UTC (rev 6220)
@@ -523,7 +523,9 @@
   private void calcScale(String from) {
     setZoomParameters();
     scalePixelsPerAngstrom = scaleDefaultPixelsPerAngstrom * zoomPercent / 100;
+    System.out.println(from + " " + scalePixelsPerAngstrom + " " + rotationRadius);
   }
+  
 
   void setZoomEnabled(boolean zoomEnabled) {
     if (this.zoomEnabled != zoomEnabled) {
@@ -662,6 +664,7 @@
       return;
     float backupDistance = cameraDistance - minimumZ + 1f;
     rotationRadius += backupDistance / scalePixelsPerAngstrom;
+    System.out.println("checkcameraldistance"+rotationRadius);
   }
 
   /* ***************************************************************
@@ -728,6 +731,8 @@
      * of any calculation that would change the rotation radius.  hansonr
      * 
      */
+    System.out.println("defaultscale "+radius + (screenPixelCount / 2f / radius
+        * cameraScaleFactor()));
     return screenPixelCount / 2f / radius
         * cameraScaleFactor();
   }
@@ -976,7 +981,9 @@
               + " -> z=" + z);
           haveNotifiedCamera = true;
         }
-        increaseRotationRadius = true;
+        //increaseRotationRadius = true;
+        //the above removed because it messes up state restoration of isosurfaces
+        //-- just let it be! 
         if (z < minimumZ)
           minimumZ = z;
         if (z <= 0) {
@@ -1286,9 +1293,9 @@
     }
     float tX = getTranslationXPercent();
     float tY = getTranslationYPercent();
-    if (zoomPercent != 100 || tX != 0 || tY != 0) {
+    if (true || zoomPercent != 100 || tX != 0 || tY != 0) {
       truncate1(sb, zoomPercent);
-      if (tX != 0 || tY != 0) {
+      if (true || tX != 0 || tY != 0) {
         truncate1(sb, tX);
         truncate1(sb, tY);
       }


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