[Jmol-commits] CVS: Jmol/src/org/jmol/adapter/smarter AtomSetCollection.java,1.28,1.29 CubeReader.java,1.6,1.7 SmarterJmolAdapter.java,1.16,1.17

[Miguel <mig...@us...>]

Update of /cvsroot/jmol/Jmol/src/org/jmol/adapter/smarter
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11281/src/org/jmol/adapter/smarter

Modified Files:
	AtomSetCollection.java CubeReader.java SmarterJmolAdapter.java 
Log Message:
removed automatic reading of volumetric data


Index: AtomSetCollection.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/jmol/adapter/smarter/AtomSetCollection.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- AtomSetCollection.java	7 Jul 2005 00:51:35 -0000	1.28
+++ AtomSetCollection.java	16 Jul 2005 00:39:33 -0000	1.29
@@ -65,10 +65,6 @@
 
   String[] pdbStructureRecords;
 
-  float[] volumetricOrigin;
-  float[][] volumetricSurfaceVectors;
-  float[][][] volumetricSurfaceData;
-
   AtomSetCollection(String fileTypeName) {
     this.fileTypeName = fileTypeName;
     // set the default PATH properties as defined in the SmarterJmolAdapter

Index: CubeReader.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/jmol/adapter/smarter/CubeReader.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CubeReader.java	7 Jul 2005 21:03:42 -0000	1.6
+++ CubeReader.java	16 Jul 2005 00:39:33 -0000	1.7
@@ -63,11 +63,14 @@
       readAtomCountAndOrigin();
       readVoxelVectors();
       readAtoms();
+      /*
+        volumetric data is no longer read here
       readExtraLine();
       readVoxelData();
       atomSetCollection.volumetricOrigin = origin;
       atomSetCollection.volumetricSurfaceVectors = voxelVectors;
       atomSetCollection.volumetricSurfaceData = voxelData;
+      */
     } catch (Exception ex) {
       atomSetCollection.errorMessage = "Could not read file:" + ex;
     }
@@ -126,6 +129,7 @@
       br.readLine();
   }
 
+  /*
   void readVoxelData() throws Exception {
     System.out.println("entering readVoxelData");
     String line = "";
@@ -157,4 +161,5 @@
                        " x " + voxelCountY +
                        " x " + voxelCountZ + " voxels");
   }
+  */
 }

Index: SmarterJmolAdapter.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/jmol/adapter/smarter/SmarterJmolAdapter.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- SmarterJmolAdapter.java	7 Jul 2005 00:51:35 -0000	1.16
+++ SmarterJmolAdapter.java	16 Jul 2005 00:39:33 -0000	1.17
@@ -139,22 +139,6 @@
   }
 */
 
-  public boolean hasVolumetricSurfaceData(Object clientFile) {
-    return ((AtomSetCollection)clientFile).volumetricSurfaceData != null;
-  }
-
-  public float[] getVolumetricOrigin(Object clientFile) {
-    return ((AtomSetCollection)clientFile).volumetricOrigin;
-  }
-
-  public float[][] getVolumetricSurfaceVectors(Object clientFile) {
-    return ((AtomSetCollection)clientFile).volumetricSurfaceVectors;
-  }
-
-  public float[][][] getVolumetricSurfaceData(Object clientFile) {
-    return ((AtomSetCollection)clientFile).volumetricSurfaceData;
-  }
-
   ////////////////////////////////////////////////////////////////
 
   public JmolAdapter.AtomIterator