[Jmol-commits] SF.net SVN: jmol:[11598] trunk/Jmol/src/org/jmol/jvxl/readers/JvxlReader. java

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

Revision: 11598
          http://jmol.svn.sourceforge.net/jmol/?rev=11598&view=rev
Author:   hansonr
Date:     2009-10-19 12:17:22 +0000 (Mon, 19 Oct 2009)

Log Message:
-----------
version=11.9.7_dev  isosurface contours

# new feature: getproperty shapeinfo better reports contour levels
# new feature: isosurface ... map CONTOUR DISCRETE [0.5, 1.0, 1.5, 2.0]
# new feature: isosurface ... map CONTOUR INCREMENT {0.0, 1.0, 0.2}

Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/jvxl/readers/JvxlReader.java

Modified: trunk/Jmol/src/org/jmol/jvxl/readers/JvxlReader.java
===================================================================
--- trunk/Jmol/src/org/jmol/jvxl/readers/JvxlReader.java	2009-10-19 01:58:01 UTC (rev 11597)
+++ trunk/Jmol/src/org/jmol/jvxl/readers/JvxlReader.java	2009-10-19 12:17:22 UTC (rev 11598)
@@ -1426,16 +1426,14 @@
     }
 
     vContours = new Vector[vs.size()];
-    if (jvxlData.vContours != null) {
-      // 3D contour values and colors
-      int n = vs.size();
-      jvxlData.contourColixes = params.contourColixes = new short[n];
-      jvxlData.contourValues = params.contoursDiscrete = new float[n];
-      for (int i = 0; i < n; i++) {
-        vContours[i] = (Vector) vs.get(i);
-        jvxlData.contourValues[i] = ((Float) vContours[i].get(2)).floatValue();
-        jvxlData.contourColixes[i] = ((short[]) vContours[i].get(3))[0];
-      }
+    // 3D contour values and colors
+    int n = vs.size();
+    jvxlData.contourColixes = params.contourColixes = new short[n];
+    jvxlData.contourValues = params.contoursDiscrete = new float[n];
+    for (int i = 0; i < n; i++) {
+      vContours[i] = (Vector) vs.get(i);
+      jvxlData.contourValues[i] = ((Float) vContours[i].get(2)).floatValue();
+      jvxlData.contourColixes[i] = ((short[]) vContours[i].get(3))[0];
     }
   }
 


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