From: <ha...@us...> - 2010-05-27 03:46:04
|
Revision: 13227 http://jmol.svn.sourceforge.net/jmol/?rev=13227&view=rev Author: hansonr Date: 2010-05-27 03:45:57 +0000 (Thu, 27 May 2010) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/jvxl/readers/SurfaceGenerator.java trunk/Jmol/src/org/jmol/viewer/Jmol.properties trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/jvxl/readers/SurfaceGenerator.java =================================================================== --- trunk/Jmol/src/org/jmol/jvxl/readers/SurfaceGenerator.java 2010-05-27 00:36:04 UTC (rev 13226) +++ trunk/Jmol/src/org/jmol/jvxl/readers/SurfaceGenerator.java 2010-05-27 03:45:57 UTC (rev 13227) @@ -1090,7 +1090,8 @@ value = new BufferedReader(new StringReader((String) value)); } BufferedReader br = (BufferedReader) value; - fileType = SurfaceFileTyper.determineSurfaceFileType(br); + if (fileType == null) + fileType = SurfaceFileTyper.determineSurfaceFileType(br); if (fileType != null && fileType.startsWith("UPPSALA")) { //"http://eds.bmc.uu.se/cgi-bin/eds/gen_maps_zip.pl?POST?pdbCode=1blu&mapformat=ccp4&maptype=2fofc&page=generate" // -- ah, but this does not work, because it is asynchronous! Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2010-05-27 00:36:04 UTC (rev 13226) +++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2010-05-27 03:45:57 UTC (rev 13227) @@ -3,6 +3,7 @@ version=12.0.RC15_dev +# bug fix: isosurace PMESH inline not working # new feature: allowModelKit # new feature: modelkitmode expanded; "all frames" icon added in application # bug fix: improper/incomplete deletion of atoms Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2010-05-27 00:36:04 UTC (rev 13226) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2010-05-27 03:45:57 UTC (rev 13227) @@ -6087,7 +6087,8 @@ // setShapeProperty(JmolConstants.SHAPE_LABELS, "color", "RED"); setAtomPickingOption("C"); setBondPickingOption("p"); - popupMenu(0, 0, 'm'); + if (isSignedApplet || !isApplet) + popupMenu(0, 0, 'm'); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |