[Jmol-commits] SF.net SVN: jmol: [7645] trunk/Jmol/src/org/jmol/shape

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

Revision: 7645
          http://svn.sourceforge.net/jmol/?rev=7645&view=rev
Author:   hansonr
Date:     2007-05-08 20:07:19 -0700 (Tue, 08 May 2007)

Log Message:
-----------
11.1.36 isosurface in context of multiple models bug fix

Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/shape/MeshCollection.java
    trunk/Jmol/src/org/jmol/shapespecial/Isosurface.java

Modified: trunk/Jmol/src/org/jmol/shape/MeshCollection.java
===================================================================
--- trunk/Jmol/src/org/jmol/shape/MeshCollection.java	2007-05-09 02:28:34 UTC (rev 7644)
+++ trunk/Jmol/src/org/jmol/shape/MeshCollection.java	2007-05-09 03:07:19 UTC (rev 7645)
@@ -60,6 +60,8 @@
     } else {
       allocMesh(thisID);
     }
+    
+    //System.out.println("setMesh: " + currentMesh.thisID + " " + currentMesh);
     if (currentMesh.thisID == null)
       currentMesh.thisID = myType + (++nUnnamed);
     return currentMesh;
@@ -271,7 +273,11 @@
         if (meshes[i] == null || meshes[i].vertexCount == 0)
           continue;
         Mesh m = meshes[i];
-        sb.append((++k)).append(" id:"+m.thisID).append("; vertices:" + m.vertexCount).append("; polygons:" + m.polygonCount).append("; visible:" + m.visible); 
+        sb.append((++k)).append(" id:"+m.thisID)
+        .append("; model:" + viewer.getModelNumberDotted(m.modelIndex))
+        .append("; vertices:" + m.vertexCount)
+        .append("; polygons:" + m.polygonCount)
+        .append("; visible:" + m.visible); 
         if (m.title != null) {
           String s = "";
           for (int j = 0; j < m.title.length; j++)
@@ -319,6 +325,7 @@
   }
   
   public void setModelIndex(int atomIndex, int modelIndex) {
+    //System.out.println("setModelIndex " + atomIndex + " " + modelIndex);
     if (currentMesh == null)
       return;
     currentMesh.visible = true; 
@@ -333,6 +340,7 @@
     else
       currentMesh.modelIndex = viewer.getCurrentModelIndex();
     currentMesh.scriptCommand = script;
+    //System.out.println("setModelIndex " + atomIndex + " " + modelIndex + " " + currentMesh.modelIndex + " " + currentMesh);
   }
 
  public String getShapeState() {

Modified: trunk/Jmol/src/org/jmol/shapespecial/Isosurface.java
===================================================================
--- trunk/Jmol/src/org/jmol/shapespecial/Isosurface.java	2007-05-09 02:28:34 UTC (rev 7644)
+++ trunk/Jmol/src/org/jmol/shapespecial/Isosurface.java	2007-05-09 03:07:19 UTC (rev 7645)
@@ -127,7 +127,7 @@
     meshes = isomeshes = (IsosurfaceMesh[])ArrayUtil.ensureLength(isomeshes, meshCount + 1);
     currentMesh = thisMesh = isomeshes[meshCount++] = new IsosurfaceMesh(thisID, g3d, colix);
     sg.setJvxlData(jvxlData = thisMesh.jvxlData);
-    //System.out.println("Isosurface allocMesh thisMesh:" + thisMesh.vertexColixes);
+    //System.out.println("Isosurface allocMesh thisMesh:" + thisMesh.thisID + " " + thisMesh);
 
   }
 
@@ -273,7 +273,7 @@
       }
       initializeIsosurface();
       sg.setModelIndex(modelIndex);
-      setModelIndex();
+      //setModelIndex();
       return;
     }
 


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