Revision: 20088
http://sourceforge.net/p/jmol/code/20088
Author: hansonr
Date: 2014-10-28 12:17:36 +0000 (Tue, 28 Oct 2014)
Log Message:
-----------
Jmol.___JmolVersion="14.2.7_2014.10.27"
bug fix: up-arrow in console may not return command if contains unicode
bug fix: antialiasing can subtly change background color
Modified Paths:
--------------
branches/v14_2/Jmol/src/javajs/util/PT.java
branches/v14_2/Jmol/src/org/jmol/console/GenericConsole.java
branches/v14_2/Jmol/src/org/jmol/g3d/Graphics3D.java
branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: branches/v14_2/Jmol/src/javajs/util/PT.java
===================================================================
--- branches/v14_2/Jmol/src/javajs/util/PT.java 2014-10-27 09:35:20 UTC (rev
20087)
+++ branches/v14_2/Jmol/src/javajs/util/PT.java 2014-10-28 12:17:36 UTC (rev
20088)
@@ -1032,14 +1032,18 @@
}
sb.append(str.substring(pt0, str.length()));
str = sb.toString();
- }
- for (i = str.length(); --i >= 0;)
+ }
+ return "\"" + escUnicode(str) + "\"";
+ }
+
+ public static String escUnicode(String str) {
+ for (int i = str.length(); --i >= 0;)
if (str.charAt(i) > 0x7F) {
String s = "0000" + Integer.toHexString(str.charAt(i));
str = str.substring(0, i) + "\\u" + s.substring(s.length() - 4)
+ str.substring(i + 1);
}
- return "\"" + str + "\"";
+ return str;
}
/**
@@ -1601,6 +1605,7 @@
/ parseFloat(s.substring(pt + 1)));
}
+
//static {
//
// double d = 790.8999998888;
Modified: branches/v14_2/Jmol/src/org/jmol/console/GenericConsole.java
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/console/GenericConsole.java
2014-10-27 09:35:20 UTC (rev 20087)
+++ branches/v14_2/Jmol/src/org/jmol/console/GenericConsole.java
2014-10-28 12:17:36 UTC (rev 20088)
@@ -387,9 +387,8 @@
protected void recallCommand(boolean up) {
String cmd = vwr.getSetHistory(up ? -1 : 1);
- if (cmd == null)
- return;
- input.setText(cmd);
+ if (cmd != null)
+ input.setText(PT.escUnicode(cmd));
}
/**
@@ -412,7 +411,7 @@
if (input.getCaretPosition() == s.length()) {
String cmd = completeCommand(s);
if (cmd != null)
- input.setText(cmd.replace('\t',' '));
+ input.setText(PT.escUnicode(cmd).replace('\t',' '));
nTab++;
return mode;
}
Modified: branches/v14_2/Jmol/src/org/jmol/g3d/Graphics3D.java
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/g3d/Graphics3D.java 2014-10-27
09:35:20 UTC (rev 20087)
+++ branches/v14_2/Jmol/src/org/jmol/g3d/Graphics3D.java 2014-10-28
12:17:36 UTC (rev 20088)
@@ -582,12 +582,17 @@
// television effect. We want to avoid that. Here we can do that
// because the colors will be blurred anyway.
- if (downsampleZBuffer)
+ if (downsampleZBuffer) {
bgcheck += ((bgcheck & 0xFF) == 0xFF ? -1 : 1);
+ } else {
+ }
+ bgcheck &= 0xFFFFFF;
for (int i = pbuf.length; --i >= 0;)
if (pbuf[i] == 0)
pbuf[i] = bgcheck;
- bgcheck &= 0xFFFFFF;
+ int bg0 = ((bgcheck >> 2) & 0x3F3F3F3F)<< 2;
+ bg0 += (bg0 & 0xC0C0C0C0) >> 6;
+
for (int i = windowHeight; --i >= 0; offset4 += width4)
for (int j = windowWidth; --j >= 0; ++offset1) {
@@ -609,6 +614,9 @@
+ ((pbuf[offset4] >> 2) & 0x3F3F3F3F)
+ ((pbuf[offset4++ + width4] >> 2) & 0x3F3F3F3F);
argb += (argb & 0xC0C0C0C0) >> 6;
+ if (argb == bg0)
+ argb = bgcheck;
+
/**
* I don't know why this is necessary.
*
Modified: branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties 2014-10-27
09:35:20 UTC (rev 20087)
+++ branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties 2014-10-28
12:17:36 UTC (rev 20088)
@@ -4,8 +4,14 @@
# THIS IS THE RELEASE BRANCH
# BUG FIXES ONLY, PLEASE
-Jmol.___JmolVersion="14.2.7_2014.10.13"
+Jmol.___JmolVersion="14.2.7_2014.10.27"
+bug fix: up-arrow in console may not return command if contains unicode
+bug fix: antialiasing can subtly change background color
+
+
+JmolVersion="14.2.7_2014.10.13"
+
new feature: modulation occupancy settable using {*}.occupancy =
{*}.modulation('O',t)
-- for example:
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
