From: <ha...@us...> - 2007-10-25 23:51:17
|
Revision: 8518 http://jmol.svn.sourceforge.net/jmol/?rev=8518&view=rev Author: hansonr Date: 2007-10-25 16:51:06 -0700 (Thu, 25 Oct 2007) Log Message: ----------- version=11.3.39 VERSION # bug fix: antialias adjustments for hover text and background box # bug fix: antialias fix for text color same as background and in front of translucent surface appearing transparent # bug fix: antialias fix for applet # webexport instruction updates. # bug fix: webexport scriptbutton template had erroneous script names. Modified Paths: -------------- trunk/Jmol/src/org/jmol/g3d/Graphics3D.java trunk/Jmol/src/org/jmol/viewer/Eval.java trunk/Jmol/src/org/jmol/viewer/Jmol.properties trunk/Jmol/src/org/jmol/viewer/StateManager.java trunk/Jmol/src/org/jmol/viewer/TransformManager.java trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/g3d/Graphics3D.java =================================================================== --- trunk/Jmol/src/org/jmol/g3d/Graphics3D.java 2007-10-25 21:44:39 UTC (rev 8517) +++ trunk/Jmol/src/org/jmol/g3d/Graphics3D.java 2007-10-25 23:51:06 UTC (rev 8518) @@ -200,6 +200,7 @@ public void setWindowParameters(int width, int height, boolean antialias) { windowWidth = width; windowHeight = height; + //System.out.println("Graphics3D setWindowParameters width=" + width + " height=" + height + " antialias=" + antialias); antialiasThisFrame = isFullSceneAntialiasingEnabled = antialias; setWidthHeight(antialiasThisFrame); } @@ -249,6 +250,7 @@ pbuf = platform.pBuffer; zbuf = platform.zBuffer; } + //System.out.println("Graphics3D beginRendering width=" + width + " height=" + height + " antialiasThisFrame=" + antialiasThisFrame); setWidthHeight(antialiasThisFrame); //setRectClip(clipX, clipY, clipWidth, clipHeight); platform.obtainScreenBuffer(); @@ -270,6 +272,7 @@ zbufT = platform.zBufferT; } this.antialiasTranslucent = antialiasTranslucent; + //System.out.println("Graphics3D setPass2 width=" + width + " height=" + height + " antialiasTranslucent=" + antialiasTranslucent); platform.clearTBuffer(); return true; } Modified: trunk/Jmol/src/org/jmol/viewer/Eval.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Eval.java 2007-10-25 21:44:39 UTC (rev 8517) +++ trunk/Jmol/src/org/jmol/viewer/Eval.java 2007-10-25 23:51:06 UTC (rev 8518) @@ -7852,6 +7852,10 @@ pt += 2; type = "VAR"; break; + case Token.file: + type = "FILE"; + pt++; + break; case Token.identifier: type = parameterAsString(1).toLowerCase(); if (type.equals("image")) { @@ -7948,9 +7952,9 @@ if (!isImage && !isExport && !Parser.isOneOf(type, - "SPT;HIS;MO;ISO;VAR;XYZ;MOL;PDB;QUAT;RAMA;FUNCS;")) + "SPT;HIS;MO;ISO;VAR;FILE;XYZ;MOL;PDB;QUAT;RAMA;FUNCS;")) evalError(GT._("write what? {0} or {1} \"filename\"", new Object[] { - "COORDS|FUNCTIONS|HISTORY|IMAGE|ISOSURFACE|MO|QUATERNION [w,x,y,z] [derivative]" + "COORDS|FILE|FUNCTIONS|HISTORY|IMAGE|ISOSURFACE|MO|QUATERNION [w,x,y,z] [derivative]" + "|RAMACHANDRAN|STATE|VAR x CLIPBOARD", "JPG|JPG64|PNG|PPM|SPT|JVXL|XYZ|MOL|PDB|" + driverList.toUpperCase().replace(';', '|') })); @@ -7975,6 +7979,8 @@ data = viewer.getPdbData(type2); } else if (data == "FUNCS") { data = getFunctionCalls(""); + } else if (data == "FILE") { + data = viewer.getCurrentFileAsString(); } else if (data == "VAR") { data = "" + getParameter(parameterAsString(2), false); } else if (data == "SPT") { Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2007-10-25 21:44:39 UTC (rev 8517) +++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2007-10-25 23:51:06 UTC (rev 8518) @@ -1,11 +1,12 @@ -version=11.3.39_dev +version=11.3.39 +# bug fix: antialias adjustments for hover text and background box +# bug fix: antialias fix for text color same as background and in front of translucent surface appearing transparent +# bug fix: antialias fix for applet + # webexport instruction updates. # bug fix: webexport scriptbutton template had erroneous script names. -# bug fix: antialias adjustments for hover text and background box -# bug fix: antialias fix for text color same as background and in front of translucent surface appearing transparent - # ----------------------------------------------------------------------------- #version=11.3.38 Modified: trunk/Jmol/src/org/jmol/viewer/StateManager.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/StateManager.java 2007-10-25 21:44:39 UTC (rev 8517) +++ trunk/Jmol/src/org/jmol/viewer/StateManager.java 2007-10-25 23:51:06 UTC (rev 8518) @@ -670,6 +670,7 @@ + ";cameradepth;navigationmode;rotationradius;" + ";zerobasedxyzrasmol;axesorientationrasmol;" + ";exportdrivers;stateversion;" + + ";antialiasdisplay;antialiastranslucent;antialiasimages;" + ";language;_spinning;_animating;_modelnumber;_modelname;_currentmodelnumberinfile;" + ";_currentfilenumber;_modelfile;_modeltitle;_version;_memory;" + ";_width;_height;_atompicked;_atomhovered;"; Modified: trunk/Jmol/src/org/jmol/viewer/TransformManager.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/TransformManager.java 2007-10-25 21:44:39 UTC (rev 8517) +++ trunk/Jmol/src/org/jmol/viewer/TransformManager.java 2007-10-25 23:51:06 UTC (rev 8518) @@ -1108,6 +1108,7 @@ this.width = (antialias ? width * 2 : width); this.height = (antialias ? height * 2 : height); this.useZoomLarge = useZoomLarge; + //System.out.println("TransformManager setScreenParameters width=" + width + " height=" + height + " antialias=" + antialias + " resetZoom=" + resetZoom); scaleFitToScreen(false, useZoomLarge, resetSlab, resetZoom); } Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2007-10-25 21:44:39 UTC (rev 8517) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2007-10-25 23:51:06 UTC (rev 8518) @@ -2255,7 +2255,8 @@ public String getStateInfo(String type) { boolean isAll = (type == null || type.equalsIgnoreCase("all")); StringBuffer s = new StringBuffer(""); - StringBuffer sfunc = (isAll ? new StringBuffer("function _setState();\n") : null); + StringBuffer sfunc = (isAll ? new StringBuffer("function _setState();\n") + : null); if (isAll) s.append("# Jmol state version " + getJmolVersion() + ";\n"); if (isApplet && isAll) { @@ -2293,8 +2294,16 @@ // display and selections if (isAll || type.equalsIgnoreCase("selectionState")) s.append(selectionManager.getState(sfunc)); - if (sfunc != null) - sfunc.append(" refreshing = true;\nend function;\n\n_setState;\n"); + if (sfunc != null) { + StateManager.appendCmd(sfunc, "refreshing = true"); + StateManager.appendCmd(sfunc, "antialiasDisplay = " + + global.antialiasDisplay); + StateManager.appendCmd(sfunc, "antialiasTranslucent = " + + global.antialiasTranslucent); + StateManager.appendCmd(sfunc, "antialiasImages = " + + global.antialiasImages); + sfunc.append("end function;\n\n_setState;\n"); + } if (isAll) s.append(sfunc); return s.toString(); @@ -2532,7 +2541,7 @@ void repaint() { //from RepaintManager - if (display == null) + if (display == null) return; display.repaint(); } @@ -5284,7 +5293,9 @@ return; } resizeImage(0, 0, false, false, true); - refresh(0, "setAntialias()"); + //if (!refreshing) + // return; + //refresh(0, "setAntialias()"); } // ////////////////////////////////////////////////////////////// This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |