From: <ha...@us...> - 2009-10-27 03:53:55
|
Revision: 11633 http://jmol.svn.sourceforge.net/jmol/?rev=11633&view=rev Author: hansonr Date: 2009-10-27 03:53:49 +0000 (Tue, 27 Oct 2009) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java Modified: trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java =================================================================== --- trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java 2009-10-27 02:26:05 UTC (rev 11632) +++ trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java 2009-10-27 03:53:49 UTC (rev 11633) @@ -285,7 +285,6 @@ + "\""); sb.append(" color=\"" + Escape.escapeColor(((int[]) contours[i] .get(CONTOUR_COLOR))[0]) + "\""); - sb.append(" npolygons=\"" + nPolygons + "\""); StringBuffer sb1 = new StringBuffer(); jvxlEncodeBitSet((BitSet) contours[i].get(CONTOUR_BITSET), nPolygons, sb1); @@ -623,7 +622,7 @@ list2); } String s = jvxlCompressString(list1.append(list2).toString()); - return list.append(" <jvxlColorData precision=\"true\" data=\"").append(s) + return list.append(" <jvxlColorData data=\"").append(s) .append("\"></jvxlColorData>\n").toString(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2009-10-28 18:37:48
|
Revision: 11639 http://jmol.svn.sourceforge.net/jmol/?rev=11639&view=rev Author: hansonr Date: 2009-10-28 18:37:38 +0000 (Wed, 28 Oct 2009) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java Modified: trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java =================================================================== --- trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java 2009-10-28 16:43:37 UTC (rev 11638) +++ trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java 2009-10-28 18:37:38 UTC (rev 11639) @@ -88,7 +88,7 @@ jvxlData.jvxlInfoLine = TextFormat.simpleReplace(jvxlData.jvxlInfoLine, "asXML=\"false", "asXML=\"true"); StringBuffer data = new StringBuffer(); data.append("<?xml version=\"1.0\"?>\n").append("<jvxl version=\"").append( - JVXL_VERSION_XML).append("\" Jmol version=\"").append(jvxlData.version) + JVXL_VERSION_XML).append("\" JmolVersion=\"").append(jvxlData.version) .append("\">\n"); if (jvxlData.jvxlFileTitle != null) data.append("<jvxlFileTitle>\n") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2009-10-28 18:38:58
|
Revision: 11640 http://jmol.svn.sourceforge.net/jmol/?rev=11640&view=rev Author: hansonr Date: 2009-10-28 18:38:52 +0000 (Wed, 28 Oct 2009) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java Modified: trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java =================================================================== --- trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java 2009-10-28 18:37:38 UTC (rev 11639) +++ trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java 2009-10-28 18:38:52 UTC (rev 11640) @@ -88,7 +88,7 @@ jvxlData.jvxlInfoLine = TextFormat.simpleReplace(jvxlData.jvxlInfoLine, "asXML=\"false", "asXML=\"true"); StringBuffer data = new StringBuffer(); data.append("<?xml version=\"1.0\"?>\n").append("<jvxl version=\"").append( - JVXL_VERSION_XML).append("\" JmolVersion=\"").append(jvxlData.version) + JVXL_VERSION_XML).append("\" jmolVersion=\"").append(jvxlData.version) .append("\">\n"); if (jvxlData.jvxlFileTitle != null) data.append("<jvxlFileTitle>\n") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2009-10-29 13:22:57
|
Revision: 11647 http://jmol.svn.sourceforge.net/jmol/?rev=11647&view=rev Author: hansonr Date: 2009-10-29 13:22:45 +0000 (Thu, 29 Oct 2009) Log Message: ----------- version=11.9.7_dev jvxl-XML Modified Paths: -------------- trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java Modified: trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java =================================================================== --- trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java 2009-10-29 13:18:30 UTC (rev 11646) +++ trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java 2009-10-29 13:22:45 UTC (rev 11647) @@ -963,7 +963,8 @@ return dataOut.toString(); } - // // VERSION 1 methods -- deprecated but still used -- + // VERSION 1 methods -- deprecated but still available in + // case original jvxl needs to be written. public static void jvxlCreateHeaderWithoutTitleOrAtoms(VolumeData v, StringBuffer bs) { jvxlCreateHeader(v, Integer.MAX_VALUE, null, null, bs); @@ -1004,7 +1005,62 @@ .append(pt.z).append(" //BOGUS He ATOM ADDED FOR JVXL FORMAT\n"); } - public static String jvxlGetDefinitionLineVersion1(JvxlData jvxlData) { + private static String jvxlGetFileVersion1(JvxlData jvxlData, + MeshData meshData, String[] title, + String msg, boolean includeHeader, + int nSurfaces, String state, + String comment) { + // pre-XML + StringBuffer data = new StringBuffer(); + if (includeHeader) { + String s = jvxlData.jvxlFileHeader + + (nSurfaces > 0 ? -nSurfaces : -1) +" " + jvxlData.edgeFractionBase + " " + + jvxlData.edgeFractionRange + " " + jvxlData.colorFractionBase + " " + + jvxlData.colorFractionRange + " Jmol voxel format version " + JVXL_VERSION1 + "\n"; + if (s.indexOf("#JVXL") != 0) + data.append("#JVXL").append(jvxlData.isXLowToHigh ? "+" : "").append( + " VERSION ").append(JVXL_VERSION1).append("\n"); + data.append(s); + } + if ("HEADERONLY".equals(msg)) + return data.toString(); + data.append("# ").append(msg).append('\n'); + if (title != null) + for (int i = 0; i < title.length; i++) + data.append("# ").append(title[i]).append('\n'); + state = (state == null ? "" : " rendering:" + state); + String definitionLine = jvxlGetDefinitionLineVersion1(jvxlData); + data.append(definitionLine).append(state).append('\n'); + StringBuffer sb = new StringBuffer(); + String colorData = (jvxlData.jvxlColorData == null ? "" : jvxlData.jvxlColorData); + if (jvxlData.vertexDataOnly) { + sb.append("<jvxlSurfaceData>\n"); + jvxlAppendMeshXml(sb, jvxlData, meshData, false); + sb.append("</jvxlSurfaceData>\n"); + } else if (jvxlData.jvxlPlane == null) { + //no real point in compressing this unless it's a sign-based coloring + sb.append(jvxlData.jvxlSurfaceData); + sb.append(jvxlCompressString(jvxlData.jvxlEdgeData, false)).append('\n').append( + jvxlCompressString(colorData, false)).append('\n'); + } else if (colorData != null) { + sb.append(jvxlCompressString(colorData, false)).append('\n'); + } + int len = sb.length(); + data.append(sb); + if (includeHeader) { + if (msg != null && !jvxlData.vertexDataOnly) + data.append("#-------end of jvxl file data-------\n"); + String infoLine = TextFormat.simpleReplace(jvxlGetInfo(jvxlData), "asXML=\"true", "asXML=\"false"); + data.append(infoLine).append('\n'); + jvxlAppendCommandState(data, comment, state); + if (includeHeader) + data.append("<jvxlFileTitle>\n").append(jvxlData.jvxlFileTitle).append( + "</jvxlFileTitle>\n"); + } + return jvxlSetCompressionRatio(data, jvxlData, len); + } + + private static String jvxlGetDefinitionLineVersion1(JvxlData jvxlData) { String definitionLine = (jvxlData.vContours == null ? "" : "#+contourlines\n") + jvxlData.cutoff + " "; @@ -1067,60 +1123,5 @@ return definitionLine; } - private static String jvxlGetFileVersion1(JvxlData jvxlData, - MeshData meshData, String[] title, - String msg, boolean includeHeader, - int nSurfaces, String state, - String comment) { - // pre-XML - StringBuffer data = new StringBuffer(); - if (includeHeader) { - String s = jvxlData.jvxlFileHeader - + (nSurfaces > 0 ? -nSurfaces : -1) +" " + jvxlData.edgeFractionBase + " " - + jvxlData.edgeFractionRange + " " + jvxlData.colorFractionBase + " " - + jvxlData.colorFractionRange + " Jmol voxel format version " + JVXL_VERSION1 + "\n"; - if (s.indexOf("#JVXL") != 0) - data.append("#JVXL").append(jvxlData.isXLowToHigh ? "+" : "").append( - " VERSION ").append(JVXL_VERSION1).append("\n"); - data.append(s); - } - if ("HEADERONLY".equals(msg)) - return data.toString(); - data.append("# ").append(msg).append('\n'); - if (title != null) - for (int i = 0; i < title.length; i++) - data.append("# ").append(title[i]).append('\n'); - state = (state == null ? "" : " rendering:" + state); - String definitionLine = jvxlGetDefinitionLineVersion1(jvxlData); - data.append(definitionLine).append(state).append('\n'); - StringBuffer sb = new StringBuffer(); - String colorData = (jvxlData.jvxlColorData == null ? "" : jvxlData.jvxlColorData); - if (jvxlData.vertexDataOnly) { - sb.append("<jvxlSurfaceData>\n"); - jvxlAppendMeshXml(sb, jvxlData, meshData, false); - sb.append("</jvxlSurfaceData>\n"); - } else if (jvxlData.jvxlPlane == null) { - //no real point in compressing this unless it's a sign-based coloring - sb.append(jvxlData.jvxlSurfaceData); - sb.append(jvxlCompressString(jvxlData.jvxlEdgeData, false)).append('\n').append( - jvxlCompressString(colorData, false)).append('\n'); - } else if (colorData != null) { - sb.append(jvxlCompressString(colorData, false)).append('\n'); - } - int len = sb.length(); - data.append(sb); - if (includeHeader) { - if (msg != null && !jvxlData.vertexDataOnly) - data.append("#-------end of jvxl file data-------\n"); - String infoLine = TextFormat.simpleReplace(jvxlGetInfo(jvxlData), "asXML=\"true", "asXML=\"false"); - data.append(infoLine).append('\n'); - jvxlAppendCommandState(data, comment, state); - if (includeHeader) - data.append("<jvxlFileTitle>\n").append(jvxlData.jvxlFileTitle).append( - "</jvxlFileTitle>\n"); - } - return jvxlSetCompressionRatio(data, jvxlData, len); - } - } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2009-10-29 15:03:01
|
Revision: 11649 http://jmol.svn.sourceforge.net/jmol/?rev=11649&view=rev Author: hansonr Date: 2009-10-29 15:02:52 +0000 (Thu, 29 Oct 2009) Log Message: ----------- version=11.9.7_dev jvxl-XML Modified Paths: -------------- trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java Modified: trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java =================================================================== --- trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java 2009-10-29 14:58:32 UTC (rev 11648) +++ trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java 2009-10-29 15:02:52 UTC (rev 11649) @@ -106,7 +106,7 @@ data.append("<jvxlSurface type=\"").append(type).append("\">\n"); data.append(jvxlGetInfo(jvxlData)); data.append("\n"); - jvxlAppendCommandState(data, comment, state); + jvxlAppendCommandState(data, comment, state, true); if (title != null || msg != null && msg.length() > 0) { sb = new StringBuffer(); if (msg != null && msg.length() > 0) @@ -192,12 +192,12 @@ } private static void jvxlAppendCommandState(StringBuffer data, String cmd, - String state) { + String state, boolean asXml) { if (cmd != null) appendTag(data, "jvxlIsosurfaceCommand", null, null, - (cmd.indexOf("#") < 0 ? cmd : cmd.substring(0, cmd.indexOf("#"))) + "\n", "<![CDATA[\n"); + (cmd.indexOf("#") < 0 ? cmd : cmd.substring(0, cmd.indexOf("#"))) + "\n", (asXml ? "<![CDATA[\n" : "")); if (state != null) - appendTag(data, "jvxlIsosurfaceState", null, null, state + "\n", "<![CDATA[\n"); + appendTag(data, "jvxlIsosurfaceState", null, null, state + "\n", (asXml ? "<![CDATA[\n" : "")); } private static void appendXmlColorData(StringBuffer sb, String key, @@ -1057,7 +1057,7 @@ data.append("#-------end of jvxl file data-------\n"); String infoLine = TextFormat.simpleReplace(jvxlGetInfo(jvxlData), "asXML=\"true", "asXML=\"false"); data.append(infoLine).append('\n'); - jvxlAppendCommandState(data, comment, state); + jvxlAppendCommandState(data, comment, state, false); if (includeHeader) data.append("<jvxlFileTitle>\n").append(jvxlData.jvxlFileTitle).append( "</jvxlFileTitle>\n"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2009-10-29 15:15:41
|
Revision: 11650 http://jmol.svn.sourceforge.net/jmol/?rev=11650&view=rev Author: hansonr Date: 2009-10-29 15:15:30 +0000 (Thu, 29 Oct 2009) Log Message: ----------- version=11.9.7_dev jvxl-XML Modified Paths: -------------- trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java Modified: trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java =================================================================== --- trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java 2009-10-29 15:02:52 UTC (rev 11649) +++ trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java 2009-10-29 15:15:30 UTC (rev 11650) @@ -1059,8 +1059,7 @@ data.append(infoLine).append('\n'); jvxlAppendCommandState(data, comment, state, false); if (includeHeader) - data.append("<jvxlFileTitle>\n").append(jvxlData.jvxlFileTitle).append( - "</jvxlFileTitle>\n"); + appendTag(data, "jvxlFileTitle", null, null, jvxlData.jvxlFileTitle, ""); } return jvxlSetCompressionRatio(data, jvxlData, len); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2009-10-29 15:45:47
|
Revision: 11652 http://jmol.svn.sourceforge.net/jmol/?rev=11652&view=rev Author: hansonr Date: 2009-10-29 15:45:41 +0000 (Thu, 29 Oct 2009) Log Message: ----------- version=11.9.7_dev jvxl-XML Modified Paths: -------------- trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java Modified: trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java =================================================================== --- trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java 2009-10-29 15:22:00 UTC (rev 11651) +++ trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java 2009-10-29 15:45:41 UTC (rev 11652) @@ -101,6 +101,7 @@ jvxlData.vertexDataOnly ? "pmesh" : jvxlData.jvxlPlane == null ? "isosurface" : "plane"); + //TODO: contours mentioned here? when discrete? if (jvxlData.jvxlColorData != null && jvxlData.jvxlColorData.length() > 0) type = "mapped " + type; data.append("<jvxlSurface type=\"").append(type).append("\">\n"); @@ -226,26 +227,31 @@ int bytesUncompressedEdgeData = (jvxlData.vertexDataOnly ? 0 : jvxlData.jvxlEdgeData.length() - 1); int nColorData = (jvxlData.jvxlColorData == null ? -1 : (jvxlData.jvxlColorData.length() - 1)); + // informational only: appendAttrib(info, "\n ", "axXML", "" + (jvxlData.asXml && notVersion1)); if (!jvxlData.vertexDataOnly) { + // informational only: appendAttrib(info, "\n ", "cutoff", "" + jvxlData.cutoff); appendAttrib(info, "\n ", "isCutoffAbsolute", "" + jvxlData.isCutoffAbsolute); appendAttrib(info, "\n ", "pointsPerAngstrom", "" + jvxlData.pointsPerAngstrom); + int n = jvxlData.jvxlSurfaceData.length() + + bytesUncompressedEdgeData + nColorData + 1; + if (n > 0) + appendAttrib(info, "\n ", "nBytesData", "" + n); + + //TODO: these should only be for information purposes, but are not: appendAttrib(info, "\n ", "isXLowToHigh", "" + jvxlData.isXLowToHigh); if (jvxlData.jvxlPlane == null) { appendAttrib(info, "\n ", "nSurfaceInts", "" + nSurfaceInts); appendAttrib(info, "\n ", "nBytesUncompressedEdgeData", "" + bytesUncompressedEdgeData); } if (nColorData > 0) - appendAttrib(info, "\n ", "nBytesUncompressedColorData", "" + nColorData); - int n = jvxlData.jvxlSurfaceData.length() - + bytesUncompressedEdgeData + nColorData + 1; - if (n > 0) - appendAttrib(info, "\n ", "nBytesData", "" + n); + appendAttrib(info, "\n ", "nBytesUncompressedColorData", "" + nColorData); // TODO: later? } + //TODO: which are required? if (jvxlData.jvxlPlane == null) { if (jvxlData.isContoured) { - appendAttrib(info, "\n ", "contoured", "true"); + appendAttrib(info, "\n ", "contoured", "true"); appendAttrib(info, "\n ", "colorMapped", "true"); } else if (jvxlData.isBicolorMap) { appendAttrib(info, "\n ", "biolorMap", "true"); @@ -259,6 +265,7 @@ appendAttrib(info, "\n ", "colorMapped", "true"); appendAttrib(info, "\n ", "plane", Escape.escape(jvxlData.jvxlPlane)); } + // should not be becessary: if (jvxlData.isJvxlPrecisionColor) appendAttrib(info, "\n ", "precisionColor", "true"); if (jvxlData.isContoured) { @@ -274,6 +281,7 @@ } } // ... mappedDataMin mappedDataMax valueMappedToRed valueMappedToBlue ... + //TODO: again, these really should not be necessary here float min = (jvxlData.mappedDataMin == Float.MAX_VALUE ? 0f : jvxlData.mappedDataMin); if (jvxlData.jvxlColorData != null && jvxlData.jvxlColorData.length() > 0 && !jvxlData.isBicolorMap) { @@ -282,8 +290,11 @@ appendAttrib(info, "\n ", "valueMappedToRed", "" + jvxlData.valueMappedToRed); appendAttrib(info, "\n ", "valueMappedToBlue", "" + jvxlData.valueMappedToBlue); } + //TODO: confusing flag insideOut: if (jvxlData.insideOut) appendAttrib(info, "\n ", "insideOut", "true"); + + // rest is information only: if (jvxlData.isXLowToHigh) appendAttrib(info, "\n ", "note", "progressive JVXL+ -- X values read from low(0) to high(" + (jvxlData.nPointsX - 1) + ")"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2010-09-18 18:53:43
|
Revision: 14335 http://jmol.svn.sourceforge.net/jmol/?rev=14335&view=rev Author: hansonr Date: 2010-09-18 18:53:36 +0000 (Sat, 18 Sep 2010) Log Message: ----------- version=12.1.13_dev # bug fix: error writing isosurface color density JVXL file # code: deprecated "commandOption" shape property removed Modified Paths: -------------- trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java Modified: trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java =================================================================== --- trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java 2010-09-18 18:45:34 UTC (rev 14334) +++ trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java 2010-09-18 18:53:36 UTC (rev 14335) @@ -42,13 +42,14 @@ //TODO -- need to escapeXml for text data final public static String JVXL_VERSION1 = "2.0"; - final public static String JVXL_VERSION_XML = "2.1"; + final public static String JVXL_VERSION_XML = "2.2"; // 1.4 adds -nContours to indicate contourFromZero for MEP data mapped onto planes // 2.0 adds vertex/triangle compression when no grid is present // Jmol 11.7.25 -- recoded so that we do not create voxelData[nx][ny][nz] and instead // simply create a BitSet of length nx * ny * nz. This saves memory hugely. // 2.1 adds JvxlXmlReader + // 2.2 adds color density Jmol 12.0.15/12.1.13 public static String jvxlGetFile(VolumeData volumeData, JvxlData jvxlData, String[] title) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2011-06-18 16:55:11
|
Revision: 15617 http://jmol.svn.sourceforge.net/jmol/?rev=15617&view=rev Author: hansonr Date: 2011-06-18 16:55:04 +0000 (Sat, 18 Jun 2011) Log Message: ----------- version=12.1.50 # new feature: JVXL files now save and return color and colorscheme information # as well as rending (mesh, fill, front/back/fullylit) Modified Paths: -------------- trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java Modified: trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java =================================================================== --- trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java 2011-06-18 16:52:12 UTC (rev 15616) +++ trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java 2011-06-18 16:55:04 UTC (rev 15617) @@ -308,12 +308,12 @@ addAttrib(attribs, "\n color", jvxlData.color); if (jvxlData.meshColor != null) addAttrib(attribs, "\n meshColor", jvxlData.meshColor); - if (jvxlData.rendering != null) - addAttrib(attribs, "\n rendering", jvxlData.rendering); - addAttrib(attribs, "\n translucency", "" + jvxlData.translucency); if (jvxlData.colorScheme != null) addAttrib(attribs, "\n colorScheme", jvxlData.colorScheme); + if (jvxlData.rendering != null) + addAttrib(attribs, "\n rendering", jvxlData.rendering); + if (jvxlData.nVertexColors > 0) addAttrib(attribs, "\n nVertexColors", "" + jvxlData.nVertexColors); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2011-06-18 20:57:56
|
Revision: 15621 http://jmol.svn.sourceforge.net/jmol/?rev=15621&view=rev Author: hansonr Date: 2011-06-18 20:57:50 +0000 (Sat, 18 Jun 2011) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java Modified: trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java =================================================================== --- trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java 2011-06-18 20:54:10 UTC (rev 15620) +++ trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java 2011-06-18 20:57:50 UTC (rev 15621) @@ -194,7 +194,7 @@ int r = (int) (jvxlData.nBytes > 0 ? ((float) jvxlData.nBytes) / len : ((float) (jvxlData.nPointsX * jvxlData.nPointsY * jvxlData.nPointsZ * 13)) / len); - return TextFormat.simpleReplace(s, "\"not Caculated\"", (r > 0 ? "\"" + r +":1\"": "\"?\"")); + return TextFormat.simpleReplace(s, "\"not calculated\"", (r > 0 ? "\"" + r +":1\"": "\"?\"")); } private static void appendXmlEdgeData(StringBuffer sb, JvxlData jvxlData) { @@ -355,7 +355,7 @@ + (jvxlData.nPointsX - 1) + ")"); addAttrib(attribs, "\n xyzMin", Escape.escape(jvxlData.boundingBox[0])); addAttrib(attribs, "\n xyzMax", Escape.escape(jvxlData.boundingBox[1])); - addAttrib(attribs, "\n approximateCompressionRatio", "not Calculated"); + addAttrib(attribs, "\n approximateCompressionRatio", "not calculated"); addAttrib(attribs, "\n jmolVersion", jvxlData.version); StringBuffer info = new StringBuffer(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2011-07-23 10:32:11
|
Revision: 15818 http://jmol.svn.sourceforge.net/jmol/?rev=15818&view=rev Author: nicove Date: 2011-07-23 10:32:04 +0000 (Sat, 23 Jul 2011) Log Message: ----------- Javadoc Modified Paths: -------------- trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java Modified: trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java =================================================================== --- trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java 2011-07-22 23:27:13 UTC (rev 15817) +++ trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java 2011-07-23 10:32:04 UTC (rev 15818) @@ -649,11 +649,6 @@ * @param triangles * @param nData * @param bsSlabDisplay - * @param bsSlabDisplayEncoded - * @param bsSlabGhostEncoded - * @param slabColor - * @param slabTranslucency - * @param slabType * @param vertexIdNew * @param escapeXml * @return (triangles are present) @@ -758,11 +753,6 @@ * @param polygonColorData * @param polygonCount * @param bsSlabDisplay - * @param bsSlabDisplayEncoded - * @param bsSlabGhostEncoded - * @param slabColor - * @param slabTranslucency - * @param slabType * @param addColorData * @param escapeXml */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2012-10-11 15:45:23
|
Revision: 17652 http://jmol.svn.sourceforge.net/jmol/?rev=17652&view=rev Author: hansonr Date: 2012-10-11 15:45:12 +0000 (Thu, 11 Oct 2012) Log Message: ----------- JavaScript refactoring char f() { return 33 } does not convert 33 to a string. Modified Paths: -------------- trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java Modified: trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java =================================================================== --- trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java 2012-10-11 15:07:56 UTC (rev 17651) +++ trunk/Jmol/src/org/jmol/jvxl/data/JvxlCoder.java 2012-10-11 15:45:12 UTC (rev 17652) @@ -866,7 +866,7 @@ if (ich < base) return (char) base; if (ich == 92) - return 33; // \ --> ! + return '!'; // \ --> ! //if (logCompression) //Logger.info("fac: " + fraction + " --> " + ich + " " + (char) ich); return (char) ich; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |