Revision: 21267
http://sourceforge.net/p/jmol/code/21267
Author: hansonr
Date: 2016-10-15 14:57:40 +0000 (Sat, 15 Oct 2016)
Log Message:
-----------
Jmol.___JmolVersion="14.6.4_2016.10.15"
bug fix: (JSmolJavaExt.js) JSmol/HTML5 WRITE xxx.stl not working.
bug fix: STL export can place two endcaps in the same location
Modified Paths:
--------------
branches/v14_6/Jmol/src/org/jmol/export/_StlExporter.java
branches/v14_6/Jmol/src/org/jmol/export/__CartesianExporter.java
branches/v14_6/Jmol/src/org/jmol/render/SticksRenderer.java
branches/v14_6/Jmol/src/org/jmol/viewer/Jmol.properties
trunk/Jmol/src/org/jmol/export/_StlExporter.java
trunk/Jmol/src/org/jmol/export/__CartesianExporter.java
trunk/Jmol/src/org/jmol/render/SticksRenderer.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: branches/v14_6/Jmol/src/org/jmol/export/_StlExporter.java
===================================================================
--- branches/v14_6/Jmol/src/org/jmol/export/_StlExporter.java 2016-10-10
05:10:54 UTC (rev 21266)
+++ branches/v14_6/Jmol/src/org/jmol/export/_StlExporter.java 2016-10-15
14:57:40 UTC (rev 21267)
@@ -71,6 +71,7 @@
public _StlExporter() {
super();
useTable = null;
+ noColor = true;
isDebug = Logger.debugging;
if (!isDebug) {
oc = new OC();
@@ -279,5 +280,4 @@
// doc.close();
//}
-
}
Modified: branches/v14_6/Jmol/src/org/jmol/export/__CartesianExporter.java
===================================================================
--- branches/v14_6/Jmol/src/org/jmol/export/__CartesianExporter.java
2016-10-10 05:10:54 UTC (rev 21266)
+++ branches/v14_6/Jmol/src/org/jmol/export/__CartesianExporter.java
2016-10-15 14:57:40 UTC (rev 21267)
@@ -51,7 +51,7 @@
protected A4 viewpoint = new A4();
protected boolean canCapCylinders;
- protected boolean solidOnly; // _STL, VRML
+ protected boolean noColor;
public __CartesianExporter() {
exportType = GData.EXPORT_CARTESIAN;
@@ -273,7 +273,7 @@
float radius = mad / 2000f;
if (Logger.debugging)
outputComment("bond " + ptA + " " + ptB);
- if (colix1 == colix2) {
+ if (colix1 == colix2 || noColor) {
outputCylinder(null, tempP1, tempP2, colix1, endcaps, radius, null,
null, bondOrder != -1);
} else {
tempV2.ave(tempP2, tempP1);
Modified: branches/v14_6/Jmol/src/org/jmol/render/SticksRenderer.java
===================================================================
--- branches/v14_6/Jmol/src/org/jmol/render/SticksRenderer.java 2016-10-10
05:10:54 UTC (rev 21266)
+++ branches/v14_6/Jmol/src/org/jmol/render/SticksRenderer.java 2016-10-15
14:57:40 UTC (rev 21267)
@@ -394,6 +394,20 @@
int dyB = dy * dy;
mag2d = (int) Math.round(Math.sqrt(dxB + dyB));
resetAxisCoordinates();
+ if (isCartesian && bondOrder == 3) {
+ fillCylinder(colixA, colixB, endcaps, width, xAxis1, yAxis1, zA,
+ xAxis2, yAxis2, zB);
+ stepAxisCoordinates();
+ x.sub2(b, a);
+ x.scale(0.05f);
+ p1.sub2(a, x);
+ p2.add2(b, x);
+ g3d.drawBond(p1, p2, colixA, colixB, endcaps, mad, -2);
+ stepAxisCoordinates();
+ fillCylinder(colixA, colixB, endcaps, width, xAxis1, yAxis1, zA,
+ xAxis2, yAxis2, zB);
+ return;
+ }
while (true) {
if ((dottedMask & 1) != 0)
drawDashed(xAxis1, yAxis1, zA, xAxis2, yAxis2, zB, dashDots);
Modified: branches/v14_6/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v14_6/Jmol/src/org/jmol/viewer/Jmol.properties 2016-10-10
05:10:54 UTC (rev 21266)
+++ branches/v14_6/Jmol/src/org/jmol/viewer/Jmol.properties 2016-10-15
14:57:40 UTC (rev 21267)
@@ -6,8 +6,13 @@
# see also http://chemapps.stolaf.edu/jmol/zip for daily updates
-Jmol.___JmolVersion="14.6.4_2016.10.09"
+Jmol.___JmolVersion="14.6.4_2016.10.15"
+bug fix: (JSmolJavaExt.js) JSmol/HTML5 WRITE xxx.stl not working.
+bug fix: STL export can place two endcaps in the same location
+
+JmolVersion="14.6.4_2016.10.09"
+
new feature: autocalculation of MMFF94 partial charges
-- isosurface ... map MEP
-- DIPOLE MOLECULAR
Modified: trunk/Jmol/src/org/jmol/export/_StlExporter.java
===================================================================
--- trunk/Jmol/src/org/jmol/export/_StlExporter.java 2016-10-10 05:10:54 UTC
(rev 21266)
+++ trunk/Jmol/src/org/jmol/export/_StlExporter.java 2016-10-15 14:57:40 UTC
(rev 21267)
@@ -71,6 +71,7 @@
public _StlExporter() {
super();
useTable = null;
+ noColor = true;
isDebug = Logger.debugging;
if (!isDebug) {
oc = new OC();
Modified: trunk/Jmol/src/org/jmol/export/__CartesianExporter.java
===================================================================
--- trunk/Jmol/src/org/jmol/export/__CartesianExporter.java 2016-10-10
05:10:54 UTC (rev 21266)
+++ trunk/Jmol/src/org/jmol/export/__CartesianExporter.java 2016-10-15
14:57:40 UTC (rev 21267)
@@ -51,7 +51,7 @@
protected A4 viewpoint = new A4();
protected boolean canCapCylinders;
- protected boolean solidOnly; // _STL, VRML
+ protected boolean noColor;
public __CartesianExporter() {
exportType = GData.EXPORT_CARTESIAN;
@@ -273,7 +273,7 @@
float radius = mad / 2000f;
if (Logger.debugging)
outputComment("bond " + ptA + " " + ptB);
- if (colix1 == colix2) {
+ if (colix1 == colix2 || noColor) {
outputCylinder(null, tempP1, tempP2, colix1, endcaps, radius, null,
null, bondOrder != -1);
} else {
tempV2.ave(tempP2, tempP1);
Modified: trunk/Jmol/src/org/jmol/render/SticksRenderer.java
===================================================================
--- trunk/Jmol/src/org/jmol/render/SticksRenderer.java 2016-10-10 05:10:54 UTC
(rev 21266)
+++ trunk/Jmol/src/org/jmol/render/SticksRenderer.java 2016-10-15 14:57:40 UTC
(rev 21267)
@@ -394,6 +394,20 @@
int dyB = dy * dy;
mag2d = (int) Math.round(Math.sqrt(dxB + dyB));
resetAxisCoordinates();
+ if (isCartesian && bondOrder == 3) {
+ fillCylinder(colixA, colixB, endcaps, width, xAxis1, yAxis1, zA,
+ xAxis2, yAxis2, zB);
+ stepAxisCoordinates();
+ x.sub2(b, a);
+ x.scale(0.05f);
+ p1.sub2(a, x);
+ p2.add2(b, x);
+ g3d.drawBond(p1, p2, colixA, colixB, endcaps, mad, -2);
+ stepAxisCoordinates();
+ fillCylinder(colixA, colixB, endcaps, width, xAxis1, yAxis1, zA,
+ xAxis2, yAxis2, zB);
+ return;
+ }
while (true) {
if ((dottedMask & 1) != 0)
drawDashed(xAxis1, yAxis1, zA, xAxis2, yAxis2, zB, dashDots);
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2016-10-10 05:10:54 UTC
(rev 21266)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2016-10-15 14:57:40 UTC
(rev 21267)
@@ -47,8 +47,13 @@
-- sets the echo offset to a specific screen pixel offset
-- TODO not saved in state
-Jmol.___JmolVersion="14.7.4_2016.10.09"
+Jmol.___JmolVersion="14.7.4_2016.10.15"
+bug fix: (JSmolJavaExt.js) JSmol/HTML5 WRITE xxx.stl not working.
+bug fix: STL export can place two endcaps in the same location
+
+JmolVersion="14.7.4_2016.10.09"
+
new feature: autocalculation of MMFF94 partial charges
-- isosurface ... map MEP
-- DIPOLE MOLECULAR
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
