[Jmol-commits] SF.net SVN: jmol:[18595] branches/v13_2/Jmol/src/org/jmol

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

Revision: 18595
          http://sourceforge.net/p/jmol/code/18595
Author:   hansonr
Date:     2013-08-19 04:39:18 +0000 (Mon, 19 Aug 2013)
Log Message:
-----------
___JmolVersion="13.2.4_dev_2013.08.18"

bug fix: translation not read from state

Modified Paths:
--------------
    branches/v13_2/Jmol/src/org/jmol/script/ScriptEvaluator.java
    branches/v13_2/Jmol/src/org/jmol/viewer/Jmol.properties
    branches/v13_2/Jmol/src/org/jmol/viewer/TransformManager.java

Modified: branches/v13_2/Jmol/src/org/jmol/script/ScriptEvaluator.java
===================================================================
--- branches/v13_2/Jmol/src/org/jmol/script/ScriptEvaluator.java	2013-08-19 04:38:29 UTC (rev 18594)
+++ branches/v13_2/Jmol/src/org/jmol/script/ScriptEvaluator.java	2013-08-19 04:39:18 UTC (rev 18595)
@@ -2797,6 +2797,7 @@
                                     boolean isPopContext,
                                     boolean isFlowCommand, boolean statementOnly) {
 
+    executing = !chk;
     if (context == null)
       return;
     if (debugScript || isCmdLine_c_or_C_Option)

Modified: branches/v13_2/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v13_2/Jmol/src/org/jmol/viewer/Jmol.properties	2013-08-19 04:38:29 UTC (rev 18594)
+++ branches/v13_2/Jmol/src/org/jmol/viewer/Jmol.properties	2013-08-19 04:39:18 UTC (rev 18595)
@@ -9,8 +9,9 @@
 #  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.16"
+___JmolVersion="13.2.4_dev_2013.08.18"
 
+bug fix: translation not read from state
 bug fix: CIF reader does not find Hall name for space groups
 bug fix: binding names not included in SHOW MOUSE
 bug fix: "single" touch can fire double-click

Modified: branches/v13_2/Jmol/src/org/jmol/viewer/TransformManager.java
===================================================================
--- branches/v13_2/Jmol/src/org/jmol/viewer/TransformManager.java	2013-08-19 04:38:29 UTC (rev 18594)
+++ branches/v13_2/Jmol/src/org/jmol/viewer/TransformManager.java	2013-08-19 04:39:18 UTC (rev 18595)
@@ -1710,6 +1710,12 @@
         matrixEnd.setAA(aaMoveTo);
       }
     }
+    if (cameraX == cameraSetting.x)
+      cameraX = Float.NaN;
+    if (cameraY == cameraSetting.y)
+      cameraY = Float.NaN;
+    if (cameraDepth == this.cameraDepth)
+      cameraDepth = Float.NaN;
     if (!Float.isNaN(cameraX))
       xTrans = cameraX * 50 / newRotationRadius / width * screenPixelCount;
     if (!Float.isNaN(cameraY))

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