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

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

Revision: 7473
          http://svn.sourceforge.net/jmol/?rev=7473&view=rev
Author:   hansonr
Date:     2007-04-23 13:34:41 -0700 (Mon, 23 Apr 2007)

Log Message:
-----------
jmol 11.1.29/jvxl 0.1 integration testing;

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

Modified: trunk/Jmol/src/org/jmol/jvxl/readers/SurfaceGenerator.java
===================================================================
--- trunk/Jmol/src/org/jmol/jvxl/readers/SurfaceGenerator.java	2007-04-23 20:23:41 UTC (rev 7472)
+++ trunk/Jmol/src/org/jmol/jvxl/readers/SurfaceGenerator.java	2007-04-23 20:34:41 UTC (rev 7473)
@@ -437,6 +437,8 @@
         propertyName = "mapColor";
       } else {
         colorEncoder.setColorScheme(colorScheme);
+        if(state == STATE_DATA_COLORED)
+          voxelReader.applyColorScale();
         return true;
       }
     }
@@ -729,8 +731,10 @@
     if (haveMeshDataServer)
       meshDataServer.notifySurfaceGenerationCompleted();
     
-    if (jvxlData.jvxlDataIs2dContour)
+    if (jvxlData.jvxlDataIs2dContour) {
       voxelReader.colorIsosurface();
+      state = STATE_DATA_COLORED;
+    }
     if (params.colorBySign || params.isBicolorMap) {
       state = STATE_DATA_COLORED;
       voxelReader.applyColorScale();


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