[Jmol-commits] SF.net SVN: jmol:[13326] trunk/Jmol/src/org/jmol/shapesurface/Isosurface. java

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

Revision: 13326
          http://jmol.svn.sourceforge.net/jmol/?rev=13326&view=rev
Author:   hansonr
Date:     2010-06-10 17:15:11 +0000 (Thu, 10 Jun 2010)

Log Message:
-----------
version=12.0.RC18

# bug fix: set drawPicking/drawHover inconsistent regarding isosurfaces 
# bug fix: exiting modelkitmode does not reset picking/hover settings
# new feature: SMILES/SMARTS C^C and C^^C or C!^C (SMARTS) -- atropisomer (dihedral angle) check
# new feature; SMILES and/or BIOSMILES with /double bond/ stereochemistry 
# new feature: {*}.find("SMILES", asBioSmiles), with asBioSmiles default FAlSE
#    so simply {*}.find("SMILES") gives STANDARD SMILES (noncanonical)
# bug fix: WebExport now defaults to loading split applet
#          when pages are running from server.
# new feature: SMILES reading proposed [C@]=C
# bug fix: SmilesGenerator double bonds
# new feature: Widgets in WebExport
#		Spin on/off checkbox
#		Open Console button
#		Background Color Picker
#		Stereo Viewing Mode Control
#		Animation Control

Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/shapesurface/Isosurface.java

Modified: trunk/Jmol/src/org/jmol/shapesurface/Isosurface.java
===================================================================
--- trunk/Jmol/src/org/jmol/shapesurface/Isosurface.java	2010-06-10 17:11:04 UTC (rev 13325)
+++ trunk/Jmol/src/org/jmol/shapesurface/Isosurface.java	2010-06-10 17:15:11 UTC (rev 13326)
@@ -1207,18 +1207,18 @@
       return null;
     pickedMesh = isomeshes[imesh];
     setPropertySuper("thisID", pickedMesh.thisID, null);
-    pickedVertex = (pickFront ? jminz : jmaxz);
+    int iFace = pickedVertex = (pickFront ? jminz : jmaxz);
     Point3fi ptRet = new Point3fi();
-    ptRet.set(((IsosurfaceMesh)pickedMesh).centers[pickedVertex]);
+    ptRet.set(((IsosurfaceMesh)pickedMesh).centers[iFace]);
     pickedModel = ptRet.modelIndex = (short) pickedMesh.modelIndex;
     ptRet.index = imesh;
-    Vector3f vNorm = new Vector3f();
-    ((IsosurfaceMesh)pickedMesh).getFacePlane(pickedVertex, vNorm);
-    // get normal to surface
-    vNorm.scale(-1);
     if (pickFront) {
       setStatusPicked(-4, ptRet);
     } else {
+      Vector3f vNorm = new Vector3f();
+      ((IsosurfaceMesh)pickedMesh).getFacePlane(iFace, vNorm);
+      // get normal to surface
+      vNorm.scale(-1);
       setHeading(ptRet, vNorm, 2);
     }
     return ptRet;


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