From: <ha...@us...> - 2010-09-19 13:31:12
|
Revision: 14339 http://jmol.svn.sourceforge.net/jmol/?rev=14339&view=rev Author: hansonr Date: 2010-09-19 13:31:06 +0000 (Sun, 19 Sep 2010) Log Message: ----------- minor tweaks Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java trunk/Jmol/src/org/jmol/script/ScriptMathProcessor.java Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-09-18 22:22:11 UTC (rev 14338) +++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-09-19 13:31:06 UTC (rev 14339) @@ -15551,20 +15551,21 @@ } break; case Token.cutoff: + sbCommand.append(" cutoff "); if (tokAt(++i) == Token.plus) { propertyName = "cutoffPositive"; propertyValue = new Float(cutoff = floatParameter(++i)); - sbCommand.append(" cutoff +").append(propertyValue); + sbCommand.append("+").append(propertyValue); } else if (isFloatParameter(i)){ propertyName = "cutoff"; propertyValue = new Float(cutoff = floatParameter(i)); - sbCommand.append(" cutoff ").append(propertyValue); + sbCommand.append(propertyValue); } else { propertyName = "cutoffRange"; propertyValue = floatParameterSet(i, 2, 2); addShapeProperty(propertyList, "cutoff", Float.valueOf(0)); - addShapeProperty(propertyList, "colorDensity", null); - sbCommand.append(" cutoff ").append(Escape.escape((float[]) propertyValue, true)); + //addShapeProperty(propertyList, "colorDensity", null); + sbCommand.append(Escape.escape((float[]) propertyValue, true)); i = iToken; } break; Modified: trunk/Jmol/src/org/jmol/script/ScriptMathProcessor.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptMathProcessor.java 2010-09-18 22:22:11 UTC (rev 14338) +++ trunk/Jmol/src/org/jmol/script/ScriptMathProcessor.java 2010-09-19 13:31:06 UTC (rev 14339) @@ -2200,6 +2200,12 @@ } private boolean evaluateColor(ScriptVariable[] args) { + // color("rwb") # "" for most recently used scheme for coloring by property + // color("rwb", min, max) # min/max default to most recent property mapping + // color("rwb", min, max, value) # returns color + // color("$isosurfaceId") # info for a given isosurface + // color("$isosurfaceId", value) # color for a given mapped isosurface value + String colorScheme = (args.length > 0 ? ScriptVariable.sValue(args[0]) : ""); boolean isIsosurface = colorScheme.startsWith("$"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |