Revision: 20472
          http://sourceforge.net/p/jmol/code/20472
Author:   hansonr
Date:     2015-04-30 20:24:49 +0000 (Thu, 30 Apr 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.2.13_2015.04.30d"

bug fix: reading Molden file with no MOs crashes Jmol

Modified Paths:
--------------
    branches/v14_2/Jmol/src/org/jmol/render/FontLineShapeRenderer.java
    branches/v14_2/Jmol/src/org/jmol/script/ScriptEval.java
    branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties

Modified: branches/v14_2/Jmol/src/org/jmol/render/FontLineShapeRenderer.java
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/render/FontLineShapeRenderer.java  
2015-04-30 18:24:08 UTC (rev 20471)
+++ branches/v14_2/Jmol/src/org/jmol/render/FontLineShapeRenderer.java  
2015-04-30 20:24:49 UTC (rev 20472)
@@ -100,7 +100,7 @@
     if (diameter < 0)
       g3d.drawDottedLine(pt0, pt1);
     else
-      g3d.fillCylinder(endcap, diameter, pt0, pt1);
+      g3d.fillCylinderBits(endcap, diameter, p0, p1);
     if (!drawTicks || tickInfo == null)
       return;
     // AtomA and AtomB molecular coordinates must be set previously

Modified: branches/v14_2/Jmol/src/org/jmol/script/ScriptEval.java
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/script/ScriptEval.java     2015-04-30 
18:24:08 UTC (rev 20471)
+++ branches/v14_2/Jmol/src/org/jmol/script/ScriptEval.java     2015-04-30 
20:24:49 UTC (rev 20472)
@@ -2002,7 +2002,7 @@
     for (int i = 0; i < modelCount; i++) {
       Map<String, Object> moData = (Map<String, Object>) vwr
           .ms.getInfo(i, "moData");
-      if (moData == null)
+      if (moData == null || !moData.containsKey("mos"))
         continue;
       sb.appendI(((Lst<Map<String, Object>>) moData.get("mos")).size())
           .append(" molecular orbitals in model ")

Modified: branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties     2015-04-30 
18:24:08 UTC (rev 20471)
+++ branches/v14_2/Jmol/src/org/jmol/viewer/Jmol.properties     2015-04-30 
20:24:49 UTC (rev 20472)
@@ -4,8 +4,12 @@
 # THIS IS THE RELEASE BRANCH 
 # BUG FIXES ONLY, PLEASE
 
-Jmol.___JmolVersion="14.2.13_2015.04.27"
+Jmol.___JmolVersion="14.2.13_2015.04.30d"
 
+bug fix: reading Molden file with no MOs crashes Jmol
+
+JmolVersion="14.2.13_2015.04.27"
+
 bug fix: with set dragSelected, highlight does not recognize whole molecule
 
 JmolVersion="14.2.13_2015.04.22"

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
One dashboard for servers and applications across Physical-Virtual-Cloud 
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits

Reply via email to