Revision: 20589
http://sourceforge.net/p/jmol/code/20589
Author: hansonr
Date: 2015-06-18 19:51:21 +0000 (Thu, 18 Jun 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.3.15_2015.06.18"
bug fix: load FILL command can fail if base unit cell is not part of the needed
set for the specified volume
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/adapter/smarter/XtalSymmetry.java
trunk/Jmol/src/org/jmol/scriptext/CmdExt.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: trunk/Jmol/src/org/jmol/adapter/smarter/XtalSymmetry.java
===================================================================
--- trunk/Jmol/src/org/jmol/adapter/smarter/XtalSymmetry.java 2015-06-18
13:58:37 UTC (rev 20588)
+++ trunk/Jmol/src/org/jmol/adapter/smarter/XtalSymmetry.java 2015-06-18
19:51:21 UTC (rev 20589)
@@ -454,10 +454,12 @@
symmetry.toFractional(pt, false);
setSymmetryMinMax(pt);
// allow for some imprecision
- minXYZ = P3i.new3((int) Math.floor(rminx + 0.001f),
- (int) Math.floor(rminy + 0.001f), (int) Math.floor(rminz + 0.001f));
- maxXYZ = P3i.new3((int) Math.ceil(rmaxx - 0.001f),
- (int) Math.ceil(rmaxy - 0.001f), (int) Math.ceil(rmaxz - 0.001f));
+ minXYZ = P3i.new3((int) Math.min(0,Math.floor(rminx + 0.001f)),
+ (int) Math.min(0, Math.floor(rminy + 0.001f)),
+ (int) Math.min(0, Math.floor(rminz + 0.001f)));
+ maxXYZ = P3i.new3((int) Math.max(1,Math.ceil(rmaxx - 0.001f)),
+ (int) Math.max(1,Math.ceil(rmaxy - 0.001f)),
+ (int) Math.max(1,Math.ceil(rmaxz - 0.001f)));
}
/**
Modified: trunk/Jmol/src/org/jmol/scriptext/CmdExt.java
===================================================================
--- trunk/Jmol/src/org/jmol/scriptext/CmdExt.java 2015-06-18 13:58:37 UTC
(rev 20588)
+++ trunk/Jmol/src/org/jmol/scriptext/CmdExt.java 2015-06-18 19:51:21 UTC
(rev 20589)
@@ -3564,7 +3564,7 @@
if (pt + 2 == argCount) {
String s = SV.sValue(tokenAt(++pt, args));
if (s.length() > 0 && s.charAt(0) != '.')
- type = val.toUpperCase();
+ type = s.toUpperCase();
}
// set the file name
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-06-18 13:58:37 UTC
(rev 20588)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-06-18 19:51:21 UTC
(rev 20589)
@@ -16,6 +16,10 @@
Jmol.___JmolVersion="14.3.15_2015.06.18"
+bug fix: load FILL command can fail if base unit cell is not part of the
needed set for the specified volume
+
+JmolVersion="14.3.15_2015.06.18"
+
new feature: polyhedra ONLY
new feature: calculate symmetry POLYHEDRA
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
