Revision: 20712
http://sourceforge.net/p/jmol/code/20712
Author: hansonr
Date: 2015-08-21 14:06:39 +0000 (Fri, 21 Aug 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.3.16_2015.08.21"
bug fix: hover callback is not supposed to be stopped with HOVER OFF
bug fix: atom.sx and atom.sy and atom.sz report incorrectly when antialiasing
is on
bug fix: write VAR x "test.png" creates a ZIP file instead of a PNGJ file when
x is from load("test.png",true)
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/modelset/Atom.java
trunk/Jmol/src/org/jmol/scriptext/CmdExt.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
trunk/Jmol/src/org/jmol/viewer/Viewer.java
Modified: trunk/Jmol/src/org/jmol/modelset/Atom.java
===================================================================
--- trunk/Jmol/src/org/jmol/modelset/Atom.java 2015-08-19 13:44:15 UTC (rev
20711)
+++ trunk/Jmol/src/org/jmol/modelset/Atom.java 2015-08-21 14:06:39 UTC (rev
20712)
@@ -1244,15 +1244,15 @@
case T.spacefill:
return getRadius();
case T.screenx:
- return sX;
+ return (vwr.antialiased ? sX / 2 : sX);
case T.screeny:
- return group.chain.model.ms.vwr.getScreenHeight() - sY;
+ return vwr.getScreenHeight() - (vwr.antialiased ? sY / 2 : sY);
case T.screenz:
- return sZ;
+ return (vwr.antialiased ? sZ / 2 : sZ);
case T.selected:
return (vwr.slm.isAtomSelected(i) ? 1 : 0);
case T.surfacedistance:
- group.chain.model.ms.getSurfaceDistanceMax();
+ vwr.ms.getSurfaceDistanceMax();
return getSurfaceDistance100() / 100f;
case T.temperature: // 0 - 9999
return getBfactor100() / 100f;
Modified: trunk/Jmol/src/org/jmol/scriptext/CmdExt.java
===================================================================
--- trunk/Jmol/src/org/jmol/scriptext/CmdExt.java 2015-08-19 13:44:15 UTC
(rev 20711)
+++ trunk/Jmol/src/org/jmol/scriptext/CmdExt.java 2015-08-21 14:06:39 UTC
(rev 20712)
@@ -3816,7 +3816,7 @@
} else {
if (fileName != null
&& (bytes = data = vwr.createZip(fileName,
- v.size() == 1 ? "BINARY" : "ZIPDATA", v)) == null)
+ v.size() == 1 || fileName.endsWith(".png") ? "BINARY" :
"ZIPDATA", v)) == null)
eval.evalError("#CANCELED#", null);
}
} else if (data == "SPT") {
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-08-19 13:44:15 UTC
(rev 20711)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-08-21 14:06:39 UTC
(rev 20712)
@@ -56,8 +56,14 @@
appear at a different location. An interesting challenge to figure out the
algorithm
that still places it in the "proper" place even when perspective is on.
(Daniele Tomerini)
-Jmol.___JmolVersion="14.3.16_2015.08.19"
+Jmol.___JmolVersion="14.3.16_2015.08.21"
+bug fix: hover callback is not supposed to be stopped with HOVER OFF
+bug fix: atom.sx and atom.sy and atom.sz report incorrectly when antialiasing
is on
+bug fix: write VAR x "test.png" creates a ZIP file instead of a PNGJ file when
x is from load("test.png",true)
+
+JmolVersion="14.3.16_2015.08.19"
+
bug fix: PyMOL reader does not load surface from PNGJ file
bug fix: PDB reader can skip assignments of secondary structure after first
structure loaded during session
Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2015-08-19 13:44:15 UTC (rev
20711)
+++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2015-08-21 14:06:39 UTC (rev
20712)
@@ -2547,7 +2547,7 @@
public void startHoverWatcher(boolean tf) {
if (tf && inMotion || !haveDisplay || tf
- && (!hoverEnabled || am.animationOn))
+ && (!hoverEnabled && !sm.haveHoverCallback() || am.animationOn))
return;
acm.startHoverWatcher(tf);
}
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
