Revision: 20118
http://sourceforge.net/p/jmol/code/20118
Author: hansonr
Date: 2014-11-21 13:17:58 +0000 (Fri, 21 Nov 2014)
Log Message:
-----------
Jmol.___JmolVersion="14.3.9_2014.11.21"
bug fix: PNGJ writing broken
bug fix: VASP CHGCAR reader not recognized for primitive cell
bug fix: Euler ZYZ and ZXZ for quaternion({0 0 1},theta) where theta < 0 in
error
Modified Paths:
--------------
branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties
branches/v14_2/Jmol/src/org/jmol/viewer/OutputManager.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
trunk/Jmol/src/org/jmol/viewer/OutputManager.java
Modified: branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties 2014-11-21
12:44:49 UTC (rev 20117)
+++ branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties 2014-11-21
13:17:58 UTC (rev 20118)
@@ -7,6 +7,7 @@
Jmol.___JmolVersion="14.2.9_2014.11.21"
+bug fix: PNGJ writing broken
bug fix: VASP CHGCAR reader not recognized for primitive cell
bug fix: Euler ZYZ and ZXZ for quaternion({0 0 1},theta) where theta < 0 in
error
Modified: branches/v14_2/Jmol/src/org/jmol/viewer/OutputManager.java
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/viewer/OutputManager.java 2014-11-21
12:44:49 UTC (rev 20117)
+++ branches/v14_2/Jmol/src/org/jmol/viewer/OutputManager.java 2014-11-21
13:17:58 UTC (rev 20118)
@@ -107,7 +107,7 @@
/**
*
* Creates an image of params.type form -- PNG, PNGJ, PNGT, JPG, JPG64, PDF,
- * PPM.
+ * PPM, GIF, GIFT
*
* From createImage and getImageAsBytes
*
@@ -177,11 +177,11 @@
params.put("pngAppPrefix", "Jmol Type");
}
}
- if (type.equals("PNGT") || type.equals("GIFT")) {
+ if (type.equals("PNGT") || type.equals("GIFT"))
params.put("transparentColor",
Integer.valueOf(vwr.getBackgroundArgb()));
- type = type.substring(0, 3);
- }
+ if (type.length() == 4) // PNGT PNGJ GIFT
+ type = type.substring(0, 3);
if (comment != null)
params.put("comment", comment.length() == 0 ? Viewer.getJmolVersion()
: comment);
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2014-11-21 12:44:49 UTC
(rev 20117)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2014-11-21 13:17:58 UTC
(rev 20118)
@@ -17,6 +17,7 @@
Jmol.___JmolVersion="14.3.9_2014.11.21"
+bug fix: PNGJ writing broken
bug fix: VASP CHGCAR reader not recognized for primitive cell
bug fix: Euler ZYZ and ZXZ for quaternion({0 0 1},theta) where theta < 0 in
error
Modified: trunk/Jmol/src/org/jmol/viewer/OutputManager.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/OutputManager.java 2014-11-21 12:44:49 UTC
(rev 20117)
+++ trunk/Jmol/src/org/jmol/viewer/OutputManager.java 2014-11-21 13:17:58 UTC
(rev 20118)
@@ -107,7 +107,7 @@
/**
*
* Creates an image of params.type form -- PNG, PNGJ, PNGT, JPG, JPG64, PDF,
- * PPM.
+ * PPM, GIF, GIFT.
*
* From createImage and getImageAsBytes
*
@@ -177,11 +177,11 @@
params.put("pngAppPrefix", "Jmol Type");
}
}
- if (type.equals("PNGT") || type.equals("GIFT")) {
+ if (type.equals("PNGT") || type.equals("GIFT"))
params.put("transparentColor",
Integer.valueOf(vwr.getBackgroundArgb()));
- type = type.substring(0, 3);
- }
+ if (type.length() == 4) // PNGT PNGJ GIFT
+ type = type.substring(0, 3);
if (comment != null)
params.put("comment", comment.length() == 0 ? Viewer.getJmolVersion()
: comment);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=157005751&iu=/4140/ostg.clktrk
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
