From: <ha...@us...> - 2012-10-28 03:24:13
|
Revision: 17688 http://jmol.svn.sourceforge.net/jmol/?rev=17688&view=rev Author: hansonr Date: 2012-10-28 03:24:04 +0000 (Sun, 28 Oct 2012) Log Message: ----------- ___version=13.0.8 FOR RELEASE code: clearing font cache upon zap. bug fix: boundbox $pmeshID, center $pmeshID, and zoomto $pmeshID not implemented bug fix: try/catch not working when embedded in another context bug fix: JmolData not producing output for PRINT commands bug fix: JmolData setting haveDisplay true, then failing to get mouse manager bug fix: MRC file reader not setting default cutoff correctly bug fix: MRC surface file reader with symmetry error Modified Paths: -------------- branches/v13_0/Jmol/src/org/jmol/g3d/Graphics3D.java branches/v13_0/Jmol/src/org/jmol/script/ScriptContext.java branches/v13_0/Jmol/src/org/jmol/script/ScriptEvaluator.java branches/v13_0/Jmol/src/org/jmol/viewer/Jmol.properties branches/v13_0/Jmol/src/org/jmol/viewer/TransformManager.java branches/v13_0/Jmol/src/org/jmol/viewer/Viewer.java Modified: branches/v13_0/Jmol/src/org/jmol/g3d/Graphics3D.java =================================================================== --- branches/v13_0/Jmol/src/org/jmol/g3d/Graphics3D.java 2012-10-28 03:13:01 UTC (rev 17687) +++ branches/v13_0/Jmol/src/org/jmol/g3d/Graphics3D.java 2012-10-28 03:24:04 UTC (rev 17688) @@ -829,7 +829,7 @@ boolean isClipped = x < r || x + r >= width || y < r || y + r >= height; if (isClipped && isClippedXY(diameter, x, y)) return; - if (colixRing != 0 && setColix(colixRing)) { + if (colixRing != 0) { if (isClipped) circle3d.plotCircleCenteredClipped(x, y, z, diameter); else Modified: branches/v13_0/Jmol/src/org/jmol/script/ScriptContext.java =================================================================== --- branches/v13_0/Jmol/src/org/jmol/script/ScriptContext.java 2012-10-28 03:13:01 UTC (rev 17687) +++ branches/v13_0/Jmol/src/org/jmol/script/ScriptContext.java 2012-10-28 03:24:04 UTC (rev 17688) @@ -48,6 +48,7 @@ public StringBuffer outputBuffer; public Map<String, ScriptVariable> contextVariables; public boolean isFunction; + public boolean isTryCatch; public boolean isStateScript; public String errorMessage; public String errorMessageUntranslated; Modified: branches/v13_0/Jmol/src/org/jmol/script/ScriptEvaluator.java =================================================================== --- branches/v13_0/Jmol/src/org/jmol/script/ScriptEvaluator.java 2012-10-28 03:13:01 UTC (rev 17687) +++ branches/v13_0/Jmol/src/org/jmol/script/ScriptEvaluator.java 2012-10-28 03:24:04 UTC (rev 17688) @@ -547,8 +547,10 @@ e.instructionDispatchLoop(false); } catch (Exception ex) { viewer.setStringProperty("_errormessage", "" + ex); - Logger.error("Error evaluating context"); - ex.printStackTrace(); + if (e.thisContext == null) { + Logger.error("Error evaluating context"); + ex.printStackTrace(); + } return false; } return true; @@ -2057,6 +2059,7 @@ pushContext(null); boolean isTry = (function.tok == Token.trycmd); thisContext.isFunction = !isTry; + thisContext.isTryCatch = isTry; functionName = name; if (function instanceof ParallelProcessor) { @@ -3050,11 +3053,11 @@ return; } String s = getScriptContext().getContextTrace(null, true).toString(); - while (thisContext != null) + while (thisContext != null && !thisContext.isTryCatch) popContext(false, false); message += s; this.untranslated += s; - if (isSyntaxCheck + if (thisContext != null || isSyntaxCheck || msg.indexOf("file recognized as a script file:") >= 0) return; Logger.error("eval ERROR: " + toString()); @@ -10345,6 +10348,7 @@ Integer.valueOf(modelIndex) }; return (getShapeProperty(JmolConstants.SHAPE_DRAW, "getCenter", data) || getShapeProperty(JmolConstants.SHAPE_ISOSURFACE, "getCenter", data) + || getShapeProperty(JmolConstants.SHAPE_PMESH, "getCenter", data) || getShapeProperty(JmolConstants.SHAPE_CONTACT, "getCenter", data) || getShapeProperty(JmolConstants.SHAPE_MO, "getCenter", data) ? (Point3f) data[2] : null); @@ -10354,6 +10358,7 @@ Object[] data = new Object[] { id, null, null }; return (getShapeProperty(JmolConstants.SHAPE_ISOSURFACE, "getBoundingBox", data) + || getShapeProperty(JmolConstants.SHAPE_PMESH, "getBoundingBox", data) || getShapeProperty(JmolConstants.SHAPE_CONTACT, "getBoundingBox", data) || getShapeProperty(JmolConstants.SHAPE_MO, "getBoundingBox", data) ? (Point3f[]) data[2] : null); Modified: branches/v13_0/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- branches/v13_0/Jmol/src/org/jmol/viewer/Jmol.properties 2012-10-28 03:13:01 UTC (rev 17687) +++ branches/v13_0/Jmol/src/org/jmol/viewer/Jmol.properties 2012-10-28 03:24:04 UTC (rev 17688) @@ -9,8 +9,13 @@ # Don't use ___ in your text, as that is the key for stripping out # the information saved in the JAR version of this file. -___version=13.0.8_dev +___version=13.0.8 +code: clearing font cache upon zap. +bug fix: boundbox $pmeshID, center $pmeshID, and zoomto $pmeshID not implemented +bug fix: try/catch not working when embedded in another context +bug fix: JmolData not producing output for PRINT commands +bug fix: JmolData setting haveDisplay true, then failing to get mouse manager bug fix: MRC file reader not setting default cutoff correctly bug fix: MRC surface file reader with symmetry error Modified: branches/v13_0/Jmol/src/org/jmol/viewer/TransformManager.java =================================================================== --- branches/v13_0/Jmol/src/org/jmol/viewer/TransformManager.java 2012-10-28 03:13:01 UTC (rev 17687) +++ branches/v13_0/Jmol/src/org/jmol/viewer/TransformManager.java 2012-10-28 03:24:04 UTC (rev 17688) @@ -162,6 +162,7 @@ depthPlane = null; zSlabPoint = null; resetNavigationPoint(true); + Text3D.clearFontCache(); } String getState(StringBuffer sfunc) { Modified: branches/v13_0/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- branches/v13_0/Jmol/src/org/jmol/viewer/Viewer.java 2012-10-28 03:13:01 UTC (rev 17687) +++ branches/v13_0/Jmol/src/org/jmol/viewer/Viewer.java 2012-10-28 03:24:04 UTC (rev 17688) @@ -353,7 +353,7 @@ apiPlatform.setViewer(this, display); g3d = new Graphics3D(apiPlatform); haveDisplay = (display != null && !isHeadless() && commandOptions - .indexOf("-n") < 0); + .indexOf("-n") < 0 && !commandOptions.startsWith("JmolData")); mustRender = haveDisplay; if (!haveDisplay) display = null; @@ -7031,7 +7031,7 @@ public void showString(String str, boolean isPrint) { if (isScriptQueued && (!isSilent || isPrint)) - Logger.info(str); + Logger.warn(str); scriptEcho(str); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |