Revision: 20291
http://sourceforge.net/p/jmol/code/20291
Author: hansonr
Date: 2015-02-14 19:44:27 +0000 (Sat, 14 Feb 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.2.12_2015.02.14"
bug fix: compare({atomA},{atomsB}) should return standard 4x4 matrix, not one
involving a rotation
about an atom center (follow-up ROTATESELECTED was broken in
14.2.11_2014.12.17)
Modified Paths:
--------------
branches/v14_2/Jmol/build.README.txt
branches/v14_2/Jmol/src/javajs/util/Measure.java
branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: branches/v14_2/Jmol/build.README.txt
===================================================================
--- branches/v14_2/Jmol/build.README.txt 2015-02-14 19:42:33 UTC (rev
20290)
+++ branches/v14_2/Jmol/build.README.txt 2015-02-14 19:44:27 UTC (rev
20291)
@@ -16,27 +16,11 @@
build_01_fromjmol.xml
build_02_fromjspecview.xml
- build_03a_tojstest.xml
+ build_03_tojs_stable.xml
- This is a fast build because it does not create the
minified versions.
- Test files are in site/jsmol.
-
-
- Test test test! (test2.htm, testjsv.htm, etc)
-
-- JSmol: run:
-
- build_01_fromjmol.xml
- build_02_fromjspecview.xml
- build_03b_tojs.xml
-
This produces the minified files. Test files are in site/jsmol.
- Test test test! (jsmol.htm, simple2.htm, supersimple.htm)
- JSmol: Update and check in jsmol files
-- Jmol: run buildjsmolzip.xml
-
-- Jmol: Update and check in jmol files
-
+buildzip.xml can also be used to just create the ZIP file.
Modified: branches/v14_2/Jmol/src/javajs/util/Measure.java
===================================================================
--- branches/v14_2/Jmol/src/javajs/util/Measure.java 2015-02-14 19:42:33 UTC
(rev 20290)
+++ branches/v14_2/Jmol/src/javajs/util/Measure.java 2015-02-14 19:44:27 UTC
(rev 20291)
@@ -686,15 +686,16 @@
P3 centerA) {
P3[] cptsA = getCenterAndPoints(ptsA);
P3[] cptsB = getCenterAndPoints(ptsB);
- //System.out.println("draw d1 " + cptsA[0]);
- //System.out.println("draw d2 " + cptsB[0]);
float[] retStddev = new float[2];
Quat q = calculateQuaternionRotation(new P3[][] { cptsA, cptsB },
- retStddev); // was false
- V3 v = V3.newVsub(cptsB[0], cptsA[0]);
- m.setMV(q.getMatrix(), v);
- if (centerA != null)
+ retStddev);
+ M3 r = q.getMatrix();
+ if (centerA == null)
+ r.rotate(cptsA[0]);
+ else
centerA.setT(cptsA[0]);
+ V3 t = V3.newVsub(cptsB[0], cptsA[0]);
+ m.setMV(r, t);
return retStddev[1];
}
Modified: branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties 2015-02-14
19:42:33 UTC (rev 20290)
+++ branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties 2015-02-14
19:44:27 UTC (rev 20291)
@@ -5,7 +5,12 @@
# THIS IS THE RELEASE BRANCH
# BUG FIXES ONLY, PLEASE
-Jmol.___JmolVersion="14.2.12_2015.02.11"
+Jmol.___JmolVersion="14.2.12_2015.02.14"
+
+bug fix: compare({atomA},{atomsB}) should return standard 4x4 matrix, not one
involving a rotation
+ about an atom center (follow-up ROTATESELECTED was broken in
14.2.11_2014.12.17)
+
+JmolVersion="14.2.12_2015.02.11"
released
bug fix: 02.10 may break loading ligand files
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
