From: <ha...@us...> - 2010-12-21 13:34:21
|
Revision: 14856 http://jmol.svn.sourceforge.net/jmol/?rev=14856&view=rev Author: hansonr Date: 2010-12-21 13:34:15 +0000 (Tue, 21 Dec 2010) Log Message: ----------- version=12.0.26_dev # bug fix: draw intersection/polygon without vertices does not clear existing object Modified Paths: -------------- branches/v12_0/Jmol/src/org/jmol/script/ScriptEvaluator.java branches/v12_0/Jmol/src/org/jmol/shapespecial/Draw.java branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties Modified: branches/v12_0/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- branches/v12_0/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-12-21 13:33:34 UTC (rev 14855) +++ branches/v12_0/Jmol/src/org/jmol/script/ScriptEvaluator.java 2010-12-21 13:34:15 UTC (rev 14856) @@ -13852,8 +13852,6 @@ Vector vp = viewer.getPlaneIntersection(theTok, null, intScale / 100f, 0); intScale = 0; - if (vp == null) - continue; propertyName = "polygon"; propertyValue = vp; havePoints = true; @@ -13890,7 +13888,10 @@ polygons[j] = new int[] { (int) f[0], (int) f[1], (int) f[2], (f.length == 3 ? 7 : (int) f[3]) }; } - v.add(polygons); + if (nVertices == 0) + v = null; + else + v.add(polygons); propertyName = "polygon"; propertyValue = v; havePoints = true; @@ -13978,8 +13979,6 @@ Vector vpc = viewer.getPlaneIntersection(tokIntersect, plane, intScale / 100f, 0); intScale = 0; - if (vpc == null) - continue; propertyName = "polygon"; propertyValue = vpc; } else { Modified: branches/v12_0/Jmol/src/org/jmol/shapespecial/Draw.java =================================================================== --- branches/v12_0/Jmol/src/org/jmol/shapespecial/Draw.java 2010-12-21 13:33:34 UTC (rev 14855) +++ branches/v12_0/Jmol/src/org/jmol/shapespecial/Draw.java 2010-12-21 13:34:15 UTC (rev 14856) @@ -326,6 +326,8 @@ if ("polygon" == propertyName) { polygon = (Vector) value; + if (polygon == null) + polygon = new Vector(); return; } @@ -510,6 +512,8 @@ thisMesh.drawTypes = null; thisMesh.drawVertexCounts = null; if (polygon != null) { + if (polygon.size() == 0) + return false; thisMesh.isPolygonSet = true; thisMesh.vertices = (Point3f[]) polygon.get(0); thisMesh.drawVertexCount = thisMesh.vertexCount = thisMesh.vertices.length; Modified: branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties 2010-12-21 13:33:34 UTC (rev 14855) +++ branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties 2010-12-21 13:34:15 UTC (rev 14856) @@ -4,6 +4,7 @@ version=12.0.26_dev +# bug fix: draw intersection/polygon without vertices does not clear existing object # bug fix: isosurface slab for plane not working # bug fix: space before [ not recognized as significant when following $xxx or {...} # new feature: isosurface/draw .length (also added to 12.1.27) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |