[Jmol-commits] SF.net SVN: jmol:[14739] trunk/Jmol

[<ha...@us...>]

Revision: 14739
          http://jmol.svn.sourceforge.net/jmol/?rev=14739&view=rev
Author:   hansonr
Date:     2010-12-01 12:48:52 +0000 (Wed, 01 Dec 2010)

Log Message:
-----------


Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/shapesurface/Isosurface.java
    trunk/Jmol/test/org/jmol/adapter/smarter/TestSmarterJmolAdapter.java

Modified: trunk/Jmol/src/org/jmol/shapesurface/Isosurface.java
===================================================================
--- trunk/Jmol/src/org/jmol/shapesurface/Isosurface.java	2010-11-30 17:49:02 UTC (rev 14738)
+++ trunk/Jmol/src/org/jmol/shapesurface/Isosurface.java	2010-12-01 12:48:52 UTC (rev 14739)
@@ -1215,7 +1215,9 @@
       IsosurfaceMesh m = isomeshes[i];
       if (!isPickable(m, bsVisible))
         continue;
-      Point3f[] centers = m.getCenters();
+      Point3f[] centers = (pickFront ? m.vertices : m.getCenters());
+      if (centers == null)
+        continue;
       for (int j = centers.length; --j >= 0; ) {
           Point3f v = centers[j];
           if (v == null)
@@ -1243,7 +1245,7 @@
     setPropertySuper("thisID", pickedMesh.thisID, null);
     int iFace = pickedVertex = (pickFront ? jminz : jmaxz);
     Point3fi ptRet = new Point3fi();
-    ptRet.set(((IsosurfaceMesh)pickedMesh).centers[iFace]);
+    ptRet.set((pickFront ? pickedMesh.vertices[pickedVertex] : ((IsosurfaceMesh)pickedMesh).centers[iFace]));
     pickedModel = ptRet.modelIndex = (short) pickedMesh.modelIndex;
     ptRet.index = imesh;
     if (pickFront) {

Modified: trunk/Jmol/test/org/jmol/adapter/smarter/TestSmarterJmolAdapter.java
===================================================================
--- trunk/Jmol/test/org/jmol/adapter/smarter/TestSmarterJmolAdapter.java	2010-11-30 17:49:02 UTC (rev 14738)
+++ trunk/Jmol/test/org/jmol/adapter/smarter/TestSmarterJmolAdapter.java	2010-12-01 12:48:52 UTC (rev 14739)
@@ -113,7 +113,7 @@
     result.addDirectory(false, "v3000", "mol", "V3000");
     result.addDirectory(false, "v3000", "sdf", "V3000");
     result.addDirectory(false, "vasp", "xml", "XmlVasp");
-    result.addDirectory(false, "vasp", "dat", "Vasp");
+    result.addDirectory(false, "vasp", "dat", "VaspOutcar");
     result.addDirectory(false, "wien2k", "struct", "Wien2k");
     result.addDirectory(false, "webmo", "mo", "WebMO");
     result.addDirectory(false, "xsd", "xsd", "XmlXsd");


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