From: <ha...@us...> - 2010-12-19 20:48:16
|
Revision: 14838 http://jmol.svn.sourceforge.net/jmol/?rev=14838&view=rev Author: hansonr Date: 2010-12-19 20:48:07 +0000 (Sun, 19 Dec 2010) Log Message: ----------- version=12.1.27_dev # bug fix: isosurface set 0 does not display all sets Modified Paths: -------------- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java trunk/Jmol/src/org/jmol/shapesurface/Isosurface.java trunk/Jmol/src/org/jmol/viewer/Jmol.properties Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-12-19 12:18:49 UTC (rev 14837) +++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-12-19 20:48:07 UTC (rev 14838) @@ -15081,7 +15081,7 @@ boolean isFxy = false; float[] nlmZ = new float[5]; float[] data = null; - int thisSetNumber = 0; + int thisSetNumber = -1; int nFiles = 0; int nX, nY, nZ, ptX, ptY; float sigma = Float.NaN; @@ -16205,7 +16205,7 @@ addShapeProperty(propertyList, "nomap", new Float(0)); surfaceObjectSeen = true; } - if (thisSetNumber > 0) + if (thisSetNumber >= 0) addShapeProperty(propertyList, "getSurfaceSets", Integer .valueOf(thisSetNumber - 1)); if (discreteColixes != null) { Modified: trunk/Jmol/src/org/jmol/shapesurface/Isosurface.java =================================================================== --- trunk/Jmol/src/org/jmol/shapesurface/Isosurface.java 2010-12-19 12:18:49 UTC (rev 14837) +++ trunk/Jmol/src/org/jmol/shapesurface/Isosurface.java 2010-12-19 20:48:07 UTC (rev 14838) @@ -378,8 +378,11 @@ } else if ("init" == propertyName) { newSg(); } else if ("getSurfaceSets" == propertyName) { - if (thisMesh != null) + if (thisMesh != null) { thisMesh.thisSet = ((Integer) value).intValue(); + thisMesh.calculatedVolume = null; + thisMesh.calculatedArea = null; + } } else if ("localName" == propertyName) { value = viewer.getOutputStream((String) value, null); propertyName = "outputStream"; Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2010-12-19 12:18:49 UTC (rev 14837) +++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2010-12-19 20:48:07 UTC (rev 14838) @@ -3,6 +3,8 @@ version=12.1.27_dev +# bug fix: isosurface set 0 does not display all sets + # -------------------------------------------------------------- #version=12.1.26 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |