Revision: 20382
http://sourceforge.net/p/jmol/code/20382
Author: hansonr
Date: 2015-03-14 14:37:58 +0000 (Sat, 14 Mar 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.2.13_2015.03.13"
bug fix: fonts too small with antialiasDisplay (14.2.12)
bug fix: PNG generation uses iTXt instead of tEXt; problems with diacritical
marks (German translation of "March" month in creation time)
Modified Paths:
--------------
branches/v14_2/Jmol/src/javajs/img/PngEncoder.java
branches/v14_2/Jmol/src/org/jmol/awtjs2d/Platform.java
branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties
branches/v14_2/Jmol/src/org/jmol/viewer/OutputManager.java
branches/v14_2/Jmol/src/org/jmol/viewer/Viewer.java
Modified: branches/v14_2/Jmol/src/javajs/img/PngEncoder.java
===================================================================
--- branches/v14_2/Jmol/src/javajs/img/PngEncoder.java 2015-03-14 14:36:13 UTC
(rev 20381)
+++ branches/v14_2/Jmol/src/javajs/img/PngEncoder.java 2015-03-14 14:37:58 UTC
(rev 20382)
@@ -48,11 +48,11 @@
*
* // IHDR chunk
*
- * // iTXt chunk "Jmol type - <PNG0|PNGJ><0000000pt>+<000000len>"
+ * // tEXt chunk "Jmol type - <PNG0|PNGJ><0000000pt>+<000000len>"
*
- * // iTXt chunk "Software - Jmol <version>"
+ * // tEXt chunk "Software - Jmol <version>"
*
- * // iTXt chunk "Creation Time - <date>"
+ * // tEXt chunk "Creation Time - <date>"
*
* // tRNS chunk transparent color, if desired
*
@@ -194,12 +194,12 @@
* @param type
*/
private static void setJmolTypeText(String prefix, byte[] b, int nPNG, int
nState, String type) {
- String s = "iTXt" + getApplicationText(prefix, type, nPNG, nState);
+ String s = "tEXt" + getApplicationText(prefix, type, nPNG, nState);
CRCEncoder encoder = new PngEncoder();
byte[] test = s.substring(0, 4 + prefix.length()).getBytes();
for (int i = test.length; -- i >= 0;)
if (b[i + PT_FIRST_TAG] != test[i]) {
- System.out.println("i mage is not of the right form; appending data,
but not adding iTXt tag.");
+ System.out.println("image is not of the right form; appending data,
but not adding tEXt tag.");
return;
}
encoder.setData(b, PT_FIRST_TAG);
@@ -275,7 +275,7 @@
private void writeText(String msg) {
writeInt4(msg.length());
startPos = bytePos;
- writeString("iTXt" + msg);
+ writeString("tEXt" + msg);
writeCRC();
}
Modified: branches/v14_2/Jmol/src/org/jmol/awtjs2d/Platform.java
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/awtjs2d/Platform.java 2015-03-14
14:36:13 UTC (rev 20381)
+++ branches/v14_2/Jmol/src/org/jmol/awtjs2d/Platform.java 2015-03-14
14:37:58 UTC (rev 20382)
@@ -382,6 +382,7 @@
// return null;
// }
// }
+
@Override
public String getDateFormat(String isoType) {
/**
@@ -395,15 +396,15 @@
* } else if (isoType.indexOf("8824") >= 0) {
* var d = new Date();
* var x = d.toString().split(" ");
- * var MM = "0" + d.getMonth(); MM = MM.substring(MM.length - 2);
+ * var MM = "0" + (1 + d.getMonth()); MM = MM.substring(MM.length - 2);
* var dd = "0" + d.getDate(); dd = dd.substring(dd.length - 2);
* return x[3] + MM + dd + x[4].replace(/\:/g,"") + x[5].substring(3,6)
+ "'" + x[5].substring(6,8) + "'"
- * } else if (isoType.indexOf("8601") >= 0){
+ * } else if (isoType.indexOf("") >= 0){
* var d = new Date();
* var x = d.toString().split(" ");
- * var MM = "0" + d.getMonth(); MM = MM.substring(MM.length - 2);
+ * var MM = "0" + (1 + d.getMonth()); MM = MM.substring(MM.length - 2);
* var dd = "0" + d.getDate(); dd = dd.substring(dd.length - 2);
- * return x[3] + MM + dd + x[4].replace(/\:/g,"") + x[5].substring(3,6)
+ "'" + x[5].substring(6,8) + "'"
+ * return x[3] + '-' + MM + '-' + dd + 'T' + x[4]
* }
* return ("" + (new Date())).split(" (")[0];
*/
Modified: branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties 2015-03-14
14:36:13 UTC (rev 20381)
+++ branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties 2015-03-14
14:37:58 UTC (rev 20382)
@@ -4,14 +4,18 @@
# THIS IS THE RELEASE BRANCH
# BUG FIXES ONLY, PLEASE
-Jmol.___JmolVersion="14.2.13_2015.03.11"
+Jmol.___JmolVersion="14.2.13_2015.03.13"
+bug fix: fonts too small with antialiasDisplay (14.2.12)
+bug fix: PNG generation uses iTXt instead of tEXt; problems with diacritical
marks (German translation of "March" month in creation time)
+
+JmolVersion="14.2.13_2015.03.11"
+
bug fix; pdb and mmcif readers not doing biomolecule 2 properly
bug fix: load filter "bychain" broken
bug fix: (x.a).push(3) does not work
bug fix: (x.a)[3] = 5 does not work
-
JmolVersion="14.2.13_2015.03.09"
bug fix: show state/xxxx does not work
Modified: branches/v14_2/Jmol/src/org/jmol/viewer/OutputManager.java
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/viewer/OutputManager.java 2015-03-14
14:36:13 UTC (rev 20381)
+++ branches/v14_2/Jmol/src/org/jmol/viewer/OutputManager.java 2015-03-14
14:37:58 UTC (rev 20382)
@@ -156,7 +156,7 @@
fileName = out.getFileName();
String comment = null;
Object stateData = null;
- params.put("date", vwr.apiPlatform.getDateFormat(null));
+ params.put("date", vwr.apiPlatform.getDateFormat("8601"));
if (type.startsWith("JP")) {
type = PT.rep(type, "E", "");
if (type.equals("JPG64")) {
Modified: branches/v14_2/Jmol/src/org/jmol/viewer/Viewer.java
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/viewer/Viewer.java 2015-03-14 14:36:13 UTC
(rev 20381)
+++ branches/v14_2/Jmol/src/org/jmol/viewer/Viewer.java 2015-03-14 14:37:58 UTC
(rev 20382)
@@ -3332,8 +3332,8 @@
antialiased = (isReset ? g.antialiasDisplay
&& checkMotionRendering(T.antialiasdisplay)
: isImageWrite && !isExport ? g.antialiasImages : false);
- imageFontScaling = (isReset || width <= 0 ? 1
- : (antialiased ? 2f : 1f) * (g.zoomLarge == (height > width) ? height
: width) / getScreenDim());
+ imageFontScaling = (antialiased ? 2f : 1f) * (isReset || width <= 0 ? 1
+ : (g.zoomLarge == (height > width) ? height : width) / getScreenDim());
if (width > 0) {
dimScreen.width = width;
dimScreen.height = height;
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
