Revision: 20811
http://sourceforge.net/p/jmol/code/20811
Author: hansonr
Date: 2015-10-06 14:27:29 +0000 (Tue, 06 Oct 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.3.16_2015.10.06"
bug fix: MRC surface reader: new version of EMAN2 leaves out alpha,beta,gamma;
does not load properly
bug fix: for (a in {*}) with no VAR fails
bug fix: better error reporting
new feature: load =aflow/AgAu
-- easy access to binary metal alloy CIF files
-- http://aflowlib.mems.duke.edu/users/jmolers/binary_new/%FILE.aflow_binary
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/jvxl/readers/MrcBinaryReader.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: trunk/Jmol/src/org/jmol/jvxl/readers/MrcBinaryReader.java
===================================================================
--- trunk/Jmol/src/org/jmol/jvxl/readers/MrcBinaryReader.java 2015-10-06
13:49:08 UTC (rev 20810)
+++ trunk/Jmol/src/org/jmol/jvxl/readers/MrcBinaryReader.java 2015-10-06
14:27:29 UTC (rev 20811)
@@ -170,6 +170,13 @@
alpha = binarydoc.readFloat();
beta = binarydoc.readFloat();
gamma = binarydoc.readFloat();
+ if (alpha == 0) {
+ alpha = beta = gamma = 90;
+ Logger.info("MRC header: alpha,beta,gamma 0 changed to 90,90,90");
+ Logger.info("MRC header: alpha,beta,gamma 0 reversing insideOut sense");
+ if (params.thePlane == null)
+ params.insideOut = !params.insideOut;
+ }
mapc = binarydoc.readInt(); // CCP4 "crs2xyz[0-2]
mapr = binarydoc.readInt();
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-10-06 13:49:08 UTC
(rev 20810)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-10-06 14:27:29 UTC
(rev 20811)
@@ -64,12 +64,15 @@
Jmol.___JmolVersion="14.3.16_2015.10.06"
+bug fix: MRC surface reader: new version of EMAN2 leaves out alpha,beta,gamma;
does not load properly
+
bug fix: for (a in {*}) with no VAR fails
bug fix: better error reporting
new feature: load =aflow/AgAu
-- easy access to binary metal alloy CIF files
+ -- http://aflowlib.mems.duke.edu/users/jmolers/binary_new/%FILE.aflow_binary
bug fix: braceless if/for fix from 10.04
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
