Revision: 21146
http://sourceforge.net/p/jmol/code/21146
Author: hansonr
Date: 2016-06-15 04:51:50 +0000 (Wed, 15 Jun 2016)
Log Message:
-----------
Jmol.___JmolVersion="14.7.0_2016.06.14"
bug fix: reading of protein structure for a group that is not in a polymer
causes null pointer exception
new feature: set echo OFFSET {sx sy sz}
-- sets the echo offset to a specific screen pixel offset
new feature: set hiddenLinesDashed
-- when set TRUE, hidden lines in unit cells and boundbox are rendered as
dashed lines.
-- default is FALSE
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/render/UccageRenderer.java
Modified: trunk/Jmol/src/org/jmol/render/UccageRenderer.java
===================================================================
--- trunk/Jmol/src/org/jmol/render/UccageRenderer.java 2016-06-15 04:51:14 UTC
(rev 21145)
+++ trunk/Jmol/src/org/jmol/render/UccageRenderer.java 2016-06-15 04:51:50 UTC
(rev 21146)
@@ -35,6 +35,7 @@
import javajs.util.DF;
import javajs.util.Lst;
import javajs.util.P3;
+import javajs.util.P3i;
import javajs.util.PT;
import org.jmol.util.SimpleUnitCell;
@@ -120,6 +121,7 @@
boolean drawAllLines = (vwr.getObjectMad10(StateManager.OBJ_AXIS1) == 0
|| vwr.getFloat(T.axesscale) < 2 || axisPoints == null);
P3[] aPoints = axisPoints;
+ P3i[] faces = (hiddenLines ? BoxInfo.facePoints : null);
if (fset.z == 0) {
offsetT.setT(cell0);
unitcell.toCartesian(offsetT, true);
@@ -136,7 +138,7 @@
unitcell.toCartesian(v, true);
verticesT[i].add2(v, offsetT);
}
- renderCage(mad10, verticesT, (hiddenLines ? BoxInfo.facePoints : null),
aPoints, firstLine, allow0, allow1, 1);
+ renderCage(mad10, verticesT, faces, aPoints, firstLine, allow0, allow1,
1);
} else
for (int x = (int) cell0.x; x < cell1.x; x++) {
for (int y = (int) cell0.y; y < cell1.y; y++) {
@@ -156,7 +158,7 @@
allow1 = 0xFF;
for (int i = 8; --i >= 0;)
verticesT[i].add2(vertices[i], offsetT);
- renderCage(mad10, verticesT, null, aPoints, firstLine, allow0,
+ renderCage(mad10, verticesT, faces, aPoints, firstLine, allow0,
allow1, scale);
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
What NetFlow Analyzer can do for you? Monitors network bandwidth and traffic
patterns at an interface-level. Reveals which users, apps, and protocols are
consuming the most bandwidth. Provides multi-vendor support for NetFlow,
J-Flow, sFlow and other flows. Make informed decisions using capacity planning
reports. http://pubads.g.doubleclick.net/gampad/clk?id=1444514421&iu=/41014381
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
