Revision: 20859
http://sourceforge.net/p/jmol/code/20859
Author: hansonr
Date: 2015-11-06 04:48:47 +0000 (Fri, 06 Nov 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.4.0_2015.11.05"
bug fix: mCIF does not read incommensurately modulated mCIF files
bug fix: WRITE xxx.ZIP crashes Jmol
Modified Paths:
--------------
branches/v14_4/Jmol/src/org/jmol/scriptext/CmdExt.java
branches/v14_4/Jmol/src/org/jmol/util/ModulationSet.java
branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: branches/v14_4/Jmol/src/org/jmol/scriptext/CmdExt.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/scriptext/CmdExt.java 2015-11-03
13:43:26 UTC (rev 20858)
+++ branches/v14_4/Jmol/src/org/jmol/scriptext/CmdExt.java 2015-11-06
04:48:47 UTC (rev 20859)
@@ -3862,7 +3862,8 @@
} else if (data == "ZIP" || data == "ZIPALL") {
if (fileName != null) {
params = new Hashtable<String, Object>();
- params.put("data", scripts);
+ if (scripts != null)
+ params.put("data", scripts);
if ((bytes = data = (String) vwr.createZip(fileName, type, params))
== null)
eval.evalError("#CANCELED#", null);
}
Modified: branches/v14_4/Jmol/src/org/jmol/util/ModulationSet.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/util/ModulationSet.java 2015-11-03
13:43:26 UTC (rev 20858)
+++ branches/v14_4/Jmol/src/org/jmol/util/ModulationSet.java 2015-11-06
04:48:47 UTC (rev 20859)
@@ -575,24 +575,25 @@
private ModulationSet getModCalc() {
if (modCalc == null) {
modCalc = new ModulationSet();
+ modCalc.axesLengths = axesLengths;
+ modCalc.enabled = true;
+ modCalc.fileOcc = fileOcc;
+ modCalc.gammaE = gammaE;
+ modCalc.gammaIinv = gammaIinv;
modCalc.id = id;
- modCalc.tau = tau;
- modCalc.spinOp = spinOp;
+ modCalc.modDim = modDim;
modCalc.mods = mods;
- modCalc.gammaE = gammaE;
- modCalc.modDim = modDim;
- modCalc.gammaIinv = gammaIinv;
+ modCalc.nOps = nOps;
+ modCalc.occParams = occParams;
+ modCalc.occSiteMultiplicity = occSiteMultiplicity;
+ modCalc.r0 = r0;
+ modCalc.rI = rI;
modCalc.sigma = sigma;
- modCalc.r0 = r0;
+ modCalc.spinOp = spinOp;
+ modCalc.symmetry = symmetry;
+ modCalc.tau = tau;
modCalc.v0 = v0;
modCalc.vib = vib;
- modCalc.symmetry = symmetry;
- modCalc.rI = rI;
- modCalc.fileOcc = fileOcc;
- modCalc.occParams = occParams;
- modCalc.occSiteMultiplicity = occSiteMultiplicity;
- modCalc.nOps = nOps;
- modCalc.enabled = true;
if (mxyz != null)
modCalc.mxyz = new V3();
}
Modified: branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties 2015-11-03
13:43:26 UTC (rev 20858)
+++ branches/v14_4/Jmol/src/org/jmol/viewer/Jmol.properties 2015-11-06
04:48:47 UTC (rev 20859)
@@ -7,8 +7,14 @@
# see also http://chemapps.stolaf.edu/jmol/zip for daily updates
-Jmol.___JmolVersion="14.4.0_2015.11.03"
+Jmol.___JmolVersion="14.4.0_2015.11.05"
+
+bug fix: mCIF does not read incommensurately modulated mCIF files
+bug fix: WRITE xxx.ZIP crashes Jmol
+
+JmolVersion="14.4.0_2015.11.03"
+
bug fix: FOR without {} but with ";" after sole statement
followed immediately by second FOR improperly loops
for (var i from [1,5])
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
