From: <ha...@us...> - 2011-06-14 23:37:21
|
Revision: 15590 http://jmol.svn.sourceforge.net/jmol/?rev=15590&view=rev Author: hansonr Date: 2011-06-14 23:37:15 +0000 (Tue, 14 Jun 2011) Log Message: ----------- version=12.1.50_dev # bug fix: isosurface SLAB not saved in JVXL; (now as vertex data only) Modified Paths: -------------- trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java trunk/Jmol/src/org/jmol/shapesurface/Isosurface.java Modified: trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java =================================================================== --- trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java 2011-06-14 23:19:06 UTC (rev 15589) +++ trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java 2011-06-14 23:37:15 UTC (rev 15590) @@ -208,7 +208,7 @@ state = TextFormat.split(state, "** XML **")[1].trim(); XmlUtil.appendTag(data, "jvxlIsosurfaceState", "\n" + state + "\n"); } else { - XmlUtil.appendCdata(data, "jvxlIsosurfaceState", null, "\n" + state + "\n"); + XmlUtil.appendCdata(data, "jvxlIsosurfaceState", null, "\n" + state); } } } @@ -326,7 +326,9 @@ addAttrib(attribs, "\n insideOut", "true"); // rest is information only: - if (jvxlData.isXLowToHigh) + if (jvxlData.vertexDataOnly) + addAttrib(attribs, "\n note", "vertex/face data only"); + else if (jvxlData.isXLowToHigh) addAttrib(attribs, "\n note", "progressive JVXL+ -- X values read from low(0) to high(" + (jvxlData.nPointsX - 1) + ")"); addAttrib(attribs, "\n xyzMin", Escape.escape(jvxlData.boundingBox[0])); Modified: trunk/Jmol/src/org/jmol/shapesurface/Isosurface.java =================================================================== --- trunk/Jmol/src/org/jmol/shapesurface/Isosurface.java 2011-06-14 23:19:06 UTC (rev 15589) +++ trunk/Jmol/src/org/jmol/shapesurface/Isosurface.java 2011-06-14 23:37:15 UTC (rev 15590) @@ -666,8 +666,9 @@ fillMeshData(meshData, MeshData.MODE_GET_VERTICES, null); meshData.polygonColorData = getPolygonColorData(meshData.polygonCount, meshData.polygonColixes); } - return JvxlCoder.jvxlGetFile(jvxlData, meshData, title, "", true, 1, thisMesh - .getState(myType), (thisMesh.scriptCommand == null ? "" : thisMesh.scriptCommand)); + StringBuffer sb = new StringBuffer(); + getMeshCommand(sb, thisMesh.index); + return JvxlCoder.jvxlGetFile(jvxlData, meshData, title, "", true, 1, sb.toString(), null); } if (property == "jvxlFileInfo") return JvxlCoder.jvxlGetInfo(jvxlData); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |