From: <ha...@us...> - 2009-06-01 14:22:17
|
Revision: 10925 http://jmol.svn.sourceforge.net/jmol/?rev=10925&view=rev Author: hansonr Date: 2009-06-01 13:30:03 +0000 (Mon, 01 Jun 2009) Log Message: ----------- version=11.6.24_dev # bug fix: isosurface cavity colorscheme not applied# bug fix: isosurface cavity colorscheme "sets" error Modified Paths: -------------- branches/v11_6/Jmol/src/org/jmol/viewer/Eval.java branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties Modified: branches/v11_6/Jmol/src/org/jmol/viewer/Eval.java =================================================================== --- branches/v11_6/Jmol/src/org/jmol/viewer/Eval.java 2009-06-01 13:29:35 UTC (rev 10924) +++ branches/v11_6/Jmol/src/org/jmol/viewer/Eval.java 2009-06-01 13:30:03 UTC (rev 10925) @@ -10585,6 +10585,7 @@ viewer.setCursor(Viewer.CURSOR_WAIT); boolean idSeen = false; String translucency = null; + String colorScheme = null; initIsosurface(iShape); for (int i = iToken; i < statementLength; ++i) { if (isColorParam(i)) { @@ -10669,9 +10670,8 @@ * */ colorRangeStage = 0; - if (getToken(i + 1).tok == Token.string) { - setShapeProperty(iShape, "setColorScheme", parameterAsString(++i)); - } + if (getToken(i + 1).tok == Token.string) + colorScheme = parameterAsString(++i); if ((theTok = tokAt(i + 1)) == Token.translucent || tokAt(i + 1) == Token.opaque) { translucency = setColorOptions(i + 1, JmolConstants.SHAPE_ISOSURFACE, @@ -10868,8 +10868,7 @@ break; } if (str.equalsIgnoreCase("COLORSCHEME")) { - propertyName = "setColorScheme"; - propertyValue = parameterAsString(++i); + colorScheme = parameterAsString(++i); break; } if (str.equalsIgnoreCase("DEBUG") || str.equalsIgnoreCase("NODEBUG")) { @@ -11204,6 +11203,8 @@ setShapeProperty(iShape, "nomap", new Float(0)); surfaceObjectSeen = true; } + if (colorScheme != null) + setShapeProperty(iShape, "setColorScheme", colorScheme); if (surfaceObjectSeen && isIsosurface && !isSyntaxCheck) { float[] dataRange = (float[]) viewer Modified: branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties 2009-06-01 13:29:35 UTC (rev 10924) +++ branches/v11_6/Jmol/src/org/jmol/viewer/Jmol.properties 2009-06-01 13:30:03 UTC (rev 10925) @@ -3,7 +3,7 @@ version=11.6.24_dev -# bug fix: isosurface cavity colorscheme "sets" error +# bug fix: isosurface cavity colorscheme not applied# bug fix: isosurface cavity colorscheme "sets" error # bug fix: selected connected(hbond) not working. # ----------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |