[Jmol-commits] SF.net SVN: jmol:[10633] trunk/Jmol/src/org/openscience/jvxl/simplewriter

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

Revision: 10633
          http://jmol.svn.sourceforge.net/jmol/?rev=10633&view=rev
Author:   hansonr
Date:     2009-02-08 17:54:52 +0000 (Sun, 08 Feb 2009)

Log Message:
-----------
version=11.7.25_dev # code: rewritten code for ASimpleJvxlWriter allows streaming data

Modified Paths:
--------------
    trunk/Jmol/src/org/openscience/jvxl/simplewriter/JvxlWrite.java
    trunk/Jmol/src/org/openscience/jvxl/simplewriter/VolumeData.java

Modified: trunk/Jmol/src/org/openscience/jvxl/simplewriter/JvxlWrite.java
===================================================================
--- trunk/Jmol/src/org/openscience/jvxl/simplewriter/JvxlWrite.java	2009-02-08 17:39:33 UTC (rev 10632)
+++ trunk/Jmol/src/org/openscience/jvxl/simplewriter/JvxlWrite.java	2009-02-08 17:54:52 UTC (rev 10633)
@@ -61,13 +61,12 @@
     SimpleMarchingCubes mc = new SimpleMarchingCubes(vdc, volumeData,
         jvxlData.cutoff, jvxlData.isCutoffAbsolute, jvxlData.isXLowToHigh);
     jvxlData.jvxlEdgeData = mc.getEdgeData();
-    setSurfaceInfoFromBitSet(jvxlData, mc.getBsVoxels(), null);
+    setSurfaceInfoFromBitSet(jvxlData, mc.getBsVoxels());
     jvxlData.jvxlDefinitionLine = jvxlGetDefinitionLine(jvxlData);
     return jvxlGetFile(jvxlData);
   }
 
-  public static void setSurfaceInfoFromBitSet(JvxlData jvxlData, BitSet bs,
-                                              Point4f thePlane) {
+  public static void setSurfaceInfoFromBitSet(JvxlData jvxlData, BitSet bs) {
     boolean inside = false;
     int dataCount = 0;
     StringBuffer sb = new StringBuffer();
@@ -84,7 +83,7 @@
       }
     }
     sb.append(' ').append(dataCount).append('\n');
-    setSurfaceInfo(jvxlData, thePlane, nSurfaceInts, sb);
+    setSurfaceInfo(jvxlData, nSurfaceInts, sb);
   }
   
   static char jvxlFractionAsCharacter(float fraction) {
@@ -113,11 +112,10 @@
             }
 
 
-  protected static void setSurfaceInfo(JvxlData jvxlData, Point4f thePlane, int nSurfaceInts, StringBuffer surfaceData) {
+  protected static void setSurfaceInfo(JvxlData jvxlData, int nSurfaceInts, StringBuffer surfaceData) {
     jvxlData.jvxlSurfaceData = surfaceData.toString();
     if (jvxlData.jvxlSurfaceData.indexOf("--") == 0)
       jvxlData.jvxlSurfaceData = jvxlData.jvxlSurfaceData.substring(2);
-    jvxlData.jvxlPlane = thePlane;
     jvxlData.nSurfaceInts = nSurfaceInts;
   }
   

Modified: trunk/Jmol/src/org/openscience/jvxl/simplewriter/VolumeData.java
===================================================================
--- trunk/Jmol/src/org/openscience/jvxl/simplewriter/VolumeData.java	2009-02-08 17:39:33 UTC (rev 10632)
+++ trunk/Jmol/src/org/openscience/jvxl/simplewriter/VolumeData.java	2009-02-08 17:54:52 UTC (rev 10633)
@@ -118,10 +118,8 @@
 import javax.vecmath.Vector3f;
 import javax.vecmath.Matrix3f;
 
-import org.jmol.api.VolumeDataInterface;
+public class VolumeData {
 
-public class VolumeData implements VolumeDataInterface {
-
   public VolumeData() {
     volumetricVectors[0] = new Vector3f();
     volumetricVectors[1] = new Vector3f();


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