Revision: 20784
http://sourceforge.net/p/jmol/code/20784
Author: hansonr
Date: 2015-09-21 14:32:59 +0000 (Mon, 21 Sep 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.3.16_2015.09.21"
new feature: Raster3D triangle-only file reader (for DSSR cartoon-block
representation)
-- see http://skuld.bmsc.washington.edu/raster3d/html/render.html
bug fix: minor fixes for DSSR
bug fix: print within(0, "XXX", ...) ignores the "XXX" entirely. Should throw
an error (Ron Mignery)
bug fix: print within(0, "vdw", ...) ignores "vdw"; should accept that as
"vanderwaal"
bug fix: print within(-1.0, "vanderwaal", ...) ignores "vanderwaal" and does a
fractional-coordinate calculation
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/jvxl/readers/Ras3DReader.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: trunk/Jmol/src/org/jmol/jvxl/readers/Ras3DReader.java
===================================================================
--- trunk/Jmol/src/org/jmol/jvxl/readers/Ras3DReader.java 2015-09-21
12:17:42 UTC (rev 20783)
+++ trunk/Jmol/src/org/jmol/jvxl/readers/Ras3DReader.java 2015-09-21
14:32:59 UTC (rev 20784)
@@ -34,7 +34,12 @@
import org.jmol.util.Logger;
/*
- *
+ * Raster3D file reader -- see
http://skuld.bmsc.washington.edu/raster3d/html/render.html
+ *
+ * just triangles; implemented specifically for DSSR cartoon-block
representation
+ *
+ * experimental only
+ *
*/
@@ -115,7 +120,6 @@
nTriangles++;
c0 = CU.colorTriadToFFRGB(parseFloatStr(tokens[9]),
parseFloatStr(tokens[10]), parseFloatStr(tokens[11]));
- System.out.println(CU.colorPtFromInt(c0, new P3()));
if (asQuads) {
if (nTriangles % 2 == 1) {
v2 = v1;
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-09-21 12:17:42 UTC
(rev 20783)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-09-21 14:32:59 UTC
(rev 20784)
@@ -63,6 +63,9 @@
Jmol.___JmolVersion="14.3.16_2015.09.21"
+new feature: Raster3D triangle-only file reader (for DSSR cartoon-block
representation)
+ -- see http://skuld.bmsc.washington.edu/raster3d/html/render.html
+
bug fix: minor fixes for DSSR
bug fix: print within(0, "XXX", ...) ignores the "XXX" entirely. Should throw
an error (Ron Mignery)
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
