From: <ha...@us...> - 2008-11-02 04:16:47
|
Revision: 10205 http://jmol.svn.sourceforge.net/jmol/?rev=10205&view=rev Author: hansonr Date: 2008-11-02 04:16:40 +0000 (Sun, 02 Nov 2008) Log Message: ----------- 11.7.7 version Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/StateManager.java Modified: trunk/Jmol/src/org/jmol/viewer/StateManager.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/StateManager.java 2008-11-02 03:58:14 UTC (rev 10204) +++ trunk/Jmol/src/org/jmol/viewer/StateManager.java 2008-11-02 04:16:40 UTC (rev 10205) @@ -743,7 +743,7 @@ //this is a final static String. MAKE SURE ALL ENTRIES ARE LOWERCASE! // ";ambientpercent;animationfps" - + ";antialiasdisplay;antialiasimages;antialiastranslucent;appendnew;atomtypes;axescolor" + + ";antialiasdisplay;antialiasimages;antialiastranslucent;appendnew;axescolor" + ";axesposition;axesmolecular;axesorientationrasmol;axesunitcell;axeswindow;axis1color;axis2color" + ";axis3color;backgroundcolor;backgroundmodel;bondsymmetryatoms;boundboxcolor;cameradepth" + ";debugscript;defaultlatttice;defaults;diffusepercent;exportdrivers" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2009-12-23 01:20:29
|
Revision: 11981 http://jmol.svn.sourceforge.net/jmol/?rev=11981&view=rev Author: hansonr Date: 2009-12-23 00:33:25 +0000 (Wed, 23 Dec 2009) Log Message: ----------- version=11.9.13_dev # bug fix: "color background xxxx" clears background image as well Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/StateManager.java Modified: trunk/Jmol/src/org/jmol/viewer/StateManager.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/StateManager.java 2009-12-23 00:28:34 UTC (rev 11980) +++ trunk/Jmol/src/org/jmol/viewer/StateManager.java 2009-12-23 00:33:25 UTC (rev 11981) @@ -851,7 +851,8 @@ str.append("# height " + viewer.getScreenHeight() + ";\n# width " + viewer.getScreenWidth() + ";\n"); appendCmd(str, "stateVersion = " + getParameter("_version")); - for (int i = 0; i < OBJ_MAX; i++) + appendCmd(str, "background " + Escape.escapeColor(objColors[0])); + for (int i = 1; i < OBJ_MAX; i++) if (objColors[i] != 0) appendCmd(str, getObjectNameFromId(i) + "Color = \"" + Escape.escapeColor(objColors[i]) + '"'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2010-01-27 21:22:16
|
Revision: 12249 http://jmol.svn.sourceforge.net/jmol/?rev=12249&view=rev Author: hansonr Date: 2010-01-27 21:22:05 +0000 (Wed, 27 Jan 2010) Log Message: ----------- version=11.9.23_dev # new feature: all saved orientations now saved in state Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/StateManager.java Modified: trunk/Jmol/src/org/jmol/viewer/StateManager.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/StateManager.java 2010-01-27 21:20:53 UTC (rev 12248) +++ trunk/Jmol/src/org/jmol/viewer/StateManager.java 2010-01-27 21:22:05 UTC (rev 12249) @@ -385,7 +385,7 @@ } public String getMoveToText(boolean asCommand) { - return (asCommand ? " " + moveToText + "\n save orientation \"" + return (asCommand ? " " + moveToText + "\n save orientation \"" + saveName.substring(12) + "\"\n" : moveToText); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ni...@us...> - 2010-08-04 20:01:24
|
Revision: 13829 http://jmol.svn.sourceforge.net/jmol/?rev=13829&view=rev Author: nicove Date: 2010-08-04 20:01:18 +0000 (Wed, 04 Aug 2010) Log Message: ----------- Java 1.5 : Generics Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/StateManager.java Modified: trunk/Jmol/src/org/jmol/viewer/StateManager.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/StateManager.java 2010-08-04 19:49:35 UTC (rev 13828) +++ trunk/Jmol/src/org/jmol/viewer/StateManager.java 2010-08-04 20:01:18 UTC (rev 13829) @@ -71,17 +71,17 @@ public final static int OBJ_MAX = 8; private final static String objectNameList = "background axis1 axis2 axis3 boundbox unitcell frank "; - public static String getVariableList(Hashtable htVariables, int nMax, + public static String getVariableList(Hashtable<String, ScriptVariable> htVariables, int nMax, boolean withSites) { StringBuffer sb = new StringBuffer(); // user variables only: int n = 0; - Enumeration e = htVariables.keys(); + Enumeration<String> e = htVariables.keys(); String[] list = new String[htVariables.size()]; while (e.hasMoreElements()) { - String key = (String) e.nextElement(); - ScriptVariable var = (ScriptVariable) htVariables.get(key); + String key = e.nextElement(); + ScriptVariable var = htVariables.get(key); if (withSites || (!key.startsWith("@site_") && !key.startsWith("site_"))) list[n++] = key + (key.charAt(0) == '@' ? " " + ScriptVariable.sValue(var) : " = " @@ -110,7 +110,7 @@ } Viewer viewer; - Hashtable saved = new Hashtable(); + Hashtable<String, Object> saved = new Hashtable<String, Object>(); String lastOrientation = ""; String lastConnections = ""; String lastSelected = ""; @@ -198,16 +198,16 @@ String listSavedStates() { String names = ""; - Enumeration e = saved.keys(); + Enumeration<String> e = saved.keys(); while (e.hasMoreElements()) names += "\n" + e.nextElement(); return names; } private void deleteSavedType(String type) { - Enumeration e = saved.keys(); + Enumeration<String> e = saved.keys(); while (e.hasMoreElements()) { - String name = (String) e.nextElement(); + String name = e.nextElement(); if (name.startsWith(type)) { saved.remove(name); Logger.debug("deleted " + name); @@ -309,11 +309,12 @@ return (o == null ? "" : o.getMoveToText(true)); } StringBuffer sb = new StringBuffer(); - Enumeration e = saved.keys(); + Enumeration<String> e = saved.keys(); while (e.hasMoreElements()) { - String name = (String) e.nextElement(); - if (!name.startsWith("Orientation_")) + String name = e.nextElement(); + if (!name.startsWith("Orientation_")) { continue; + } sb.append(((Orientation) saved.get(name)).getMoveToText(true)); } return sb.toString(); @@ -497,10 +498,10 @@ "angstroms;au;bohr;nanometers;nm;picometers;pm"); } - private final static Hashtable staticFunctions = new Hashtable(); - private Hashtable localFunctions = new Hashtable(); + private final static Hashtable<String, ScriptFunction> staticFunctions = new Hashtable<String, ScriptFunction>(); + private Hashtable<String, ScriptFunction> localFunctions = new Hashtable<String, ScriptFunction>(); - Hashtable getFunctions(boolean isStatic) { + Hashtable<String, ScriptFunction> getFunctions(boolean isStatic) { return (isStatic ? staticFunctions : localFunctions); } @@ -517,12 +518,12 @@ if (isGeneric) selectedFunction = selectedFunction.substring(0, pt); selectedFunction = selectedFunction.toLowerCase(); - Hashtable ht = getFunctions(isStatic); + Hashtable<String, ScriptFunction> ht = getFunctions(isStatic); String[] names = new String[ht.size()]; - Enumeration e = ht.keys(); + Enumeration<String> e = ht.keys(); int n = 0; while (e.hasMoreElements()) { - String name = (String) e.nextElement(); + String name = e.nextElement(); if (selectedFunction.length() == 0 && !name.startsWith("_") || name.equalsIgnoreCase(selectedFunction) || isGeneric && name.toLowerCase().indexOf(selectedFunction) == 0) @@ -530,7 +531,7 @@ } Arrays.sort(names, 0, n); for (int i = 0; i < n; i++) { - ScriptFunction f = (ScriptFunction) ht.get(names[i]); + ScriptFunction f = ht.get(names[i]); s.append(namesOnly ? f.getSignature() : f.toString()); s.append('\n'); } @@ -558,7 +559,7 @@ ScriptFunction getFunction(String name) { if (name == null) return null; - ScriptFunction function = (ScriptFunction) (isStaticFunction(name) ? staticFunctions + ScriptFunction function = (isStaticFunction(name) ? staticFunctions : localFunctions).get(name); return (function == null || function.aatoken == null ? null : function); } @@ -639,10 +640,10 @@ class GlobalSettings { - Hashtable htNonbooleanParameterValues; - Hashtable htBooleanParameterFlags; - Hashtable htPropertyFlagsRemoved; - Hashtable htUserVariables = new Hashtable(); + Hashtable<String, Object> htNonbooleanParameterValues; + Hashtable<String, Boolean> htBooleanParameterFlags; + Hashtable<String, Boolean> htPropertyFlagsRemoved; + Hashtable<String, ScriptVariable> htUserVariables = new Hashtable<String, ScriptVariable>(); /* * Mostly these are just saved and restored directly from Viewer. @@ -660,9 +661,9 @@ } void clear() { - Enumeration e = htUserVariables.keys(); + Enumeration<String> e = htUserVariables.keys(); while (e.hasMoreElements()) { - String key = (String) e.nextElement(); + String key = e.nextElement(); if (key.charAt(0) == '@' || key.startsWith("site_")) htUserVariables.remove(key); } @@ -680,9 +681,9 @@ } void registerAllValues(GlobalSettings g) { - htNonbooleanParameterValues = new Hashtable(); - htBooleanParameterFlags = new Hashtable(); - htPropertyFlagsRemoved = new Hashtable(); + htNonbooleanParameterValues = new Hashtable<String, Object>(); + htBooleanParameterFlags = new Hashtable<String, Boolean>(); + htPropertyFlagsRemoved = new Hashtable<String, Boolean>(); if (g != null) { //persistent values not reset with the "initialize" command @@ -1392,7 +1393,7 @@ if (name == null) return null; name = name.toLowerCase(); - return (ScriptVariable) htUserVariables.get(name); + return htUserVariables.get(name); } String getParameterEscaped(String name, int nMax) { @@ -1404,7 +1405,7 @@ if (htBooleanParameterFlags.containsKey(name)) return htBooleanParameterFlags.get(name).toString(); if (htUserVariables.containsKey(name)) - return ((ScriptVariable) htUserVariables.get(name)).escape(); + return htUserVariables.get(name).escape(); if (htPropertyFlagsRemoved.containsKey(name)) return "false"; return "<not defined>"; @@ -1456,7 +1457,7 @@ if (htPropertyFlagsRemoved.containsKey(name)) return Boolean.FALSE; if (htUserVariables.containsKey(name)) { - ScriptVariable v = (ScriptVariable) htUserVariables.get(name); + ScriptVariable v = htUserVariables.get(name); return (asVariable ? v : ScriptVariable.oValue(v)); } return null; @@ -1464,7 +1465,7 @@ String getAllSettings(String prefix) { StringBuffer commands = new StringBuffer(""); - Enumeration e; + Enumeration<String> e; String key; String[] list = new String[htBooleanParameterFlags.size() + htNonbooleanParameterValues.size()]; @@ -1473,7 +1474,7 @@ String _prefix = "_" + prefix; e = htBooleanParameterFlags.keys(); while (e.hasMoreElements()) { - key = (String) e.nextElement(); + key = e.nextElement(); if (prefix == null || key.indexOf(prefix) == 0 || key.indexOf(_prefix) == 0) list[n++] = (key.indexOf("_") == 0 ? key + " = " : "set " + key + " ") @@ -1482,7 +1483,7 @@ //save as _xxxx if you don't want "set" to be there first e = htNonbooleanParameterValues.keys(); while (e.hasMoreElements()) { - key = (String) e.nextElement(); + key = e.nextElement(); if (key.charAt(0) != '@' && (prefix == null || key.indexOf(prefix) == 0 || key .indexOf(_prefix) == 0)) { @@ -1511,18 +1512,18 @@ commands.append("function _setVariableState() {\n\n"); } int n = 0; - Enumeration e; + Enumeration<String> e; String key; //booleans e = htBooleanParameterFlags.keys(); while (e.hasMoreElements()) { - key = (String) e.nextElement(); + key = e.nextElement(); if (doReportProperty(key)) list[n++] = "set " + key + " " + htBooleanParameterFlags.get(key); } e = htNonbooleanParameterValues.keys(); while (e.hasMoreElements()) { - key = (String) e.nextElement(); + key = e.nextElement(); if (key.charAt(0) != '@' && doReportProperty(key)) { Object value = htNonbooleanParameterValues.get(key); if (key.charAt(0) == '=') { @@ -1553,7 +1554,7 @@ //nonboolean variables: e = htNonbooleanParameterValues.keys(); while (e.hasMoreElements()) { - key = (String) e.nextElement(); + key = e.nextElement(); if (key.charAt(0) == '@') list[n++] = key + " " + htNonbooleanParameterValues.get(key); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2010-08-07 15:45:04
|
Revision: 13900 http://jmol.svn.sourceforge.net/jmol/?rev=13900&view=rev Author: hansonr Date: 2010-08-07 15:44:58 +0000 (Sat, 07 Aug 2010) Log Message: ----------- iterator cannot be used with remove Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/StateManager.java Modified: trunk/Jmol/src/org/jmol/viewer/StateManager.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/StateManager.java 2010-08-07 13:58:03 UTC (rev 13899) +++ trunk/Jmol/src/org/jmol/viewer/StateManager.java 2010-08-07 15:44:58 UTC (rev 13900) @@ -26,6 +26,7 @@ import javax.vecmath.Point3f; import javax.vecmath.Matrix3f; +import java.util.Enumeration; import java.util.Hashtable; import java.util.BitSet; import java.util.Iterator; @@ -110,7 +111,7 @@ } Viewer viewer; - Map<String, Object> saved = new Hashtable<String, Object>(); + Hashtable<String, Object> saved = new Hashtable<String, Object>(); String lastOrientation = ""; String lastConnections = ""; String lastSelected = ""; @@ -205,9 +206,10 @@ } private void deleteSavedType(String type) { - Iterator<String> e = saved.keySet().iterator(); - while (e.hasNext()) { - String name = e.next(); + + Enumeration<String> e = saved.keys(); + while (e.hasMoreElements()) { + String name = e.nextElement(); if (name.startsWith(type)) { saved.remove(name); Logger.debug("deleted " + name); @@ -643,7 +645,7 @@ Map<String, Object> htNonbooleanParameterValues; Map<String, Boolean> htBooleanParameterFlags; Map<String, Boolean> htPropertyFlagsRemoved; - Map<String, ScriptVariable> htUserVariables = new Hashtable<String, ScriptVariable>(); + Hashtable<String, ScriptVariable> htUserVariables = new Hashtable<String, ScriptVariable>(); /* * Mostly these are just saved and restored directly from Viewer. @@ -661,9 +663,9 @@ } void clear() { - Iterator<String> e = htUserVariables.keySet().iterator(); - while (e.hasNext()) { - String key = e.next(); + Enumeration<String> e = htUserVariables.keys(); + while (e.hasMoreElements()) { + String key = e.nextElement(); if (key.charAt(0) == '@' || key.startsWith("site_")) htUserVariables.remove(key); } @@ -1655,4 +1657,5 @@ return; s.append(" ").append(cmd).append(";\n"); } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2010-08-07 16:03:26
|
Revision: 13902 http://jmol.svn.sourceforge.net/jmol/?rev=13902&view=rev Author: hansonr Date: 2010-08-07 16:03:20 +0000 (Sat, 07 Aug 2010) Log Message: ----------- e.remove() Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/StateManager.java Modified: trunk/Jmol/src/org/jmol/viewer/StateManager.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/StateManager.java 2010-08-07 15:45:23 UTC (rev 13901) +++ trunk/Jmol/src/org/jmol/viewer/StateManager.java 2010-08-07 16:03:20 UTC (rev 13902) @@ -26,7 +26,6 @@ import javax.vecmath.Point3f; import javax.vecmath.Matrix3f; -import java.util.Enumeration; import java.util.Hashtable; import java.util.BitSet; import java.util.Iterator; @@ -111,7 +110,7 @@ } Viewer viewer; - Hashtable<String, Object> saved = new Hashtable<String, Object>(); + Map<String, Object> saved = new Hashtable<String, Object>(); String lastOrientation = ""; String lastConnections = ""; String lastSelected = ""; @@ -206,12 +205,11 @@ } private void deleteSavedType(String type) { - - Enumeration<String> e = saved.keys(); - while (e.hasMoreElements()) { - String name = e.nextElement(); + Iterator<String> e = saved.keySet().iterator(); + while (e.hasNext()) { + String name = e.next(); if (name.startsWith(type)) { - saved.remove(name); + e.remove(); Logger.debug("deleted " + name); } } @@ -645,7 +643,7 @@ Map<String, Object> htNonbooleanParameterValues; Map<String, Boolean> htBooleanParameterFlags; Map<String, Boolean> htPropertyFlagsRemoved; - Hashtable<String, ScriptVariable> htUserVariables = new Hashtable<String, ScriptVariable>(); + Map<String, ScriptVariable> htUserVariables = new Hashtable<String, ScriptVariable>(); /* * Mostly these are just saved and restored directly from Viewer. @@ -663,11 +661,11 @@ } void clear() { - Enumeration<String> e = htUserVariables.keys(); - while (e.hasMoreElements()) { - String key = e.nextElement(); + Iterator<String> e = htUserVariables.keySet().iterator(); + while (e.hasNext()) { + String key = e.next(); if (key.charAt(0) == '@' || key.startsWith("site_")) - htUserVariables.remove(key); + e.remove(); } // PER-zap settings made This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2011-01-23 19:11:17
|
Revision: 15026 http://jmol.svn.sourceforge.net/jmol/?rev=15026&view=rev Author: hansonr Date: 2011-01-23 19:11:11 +0000 (Sun, 23 Jan 2011) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/StateManager.java Modified: trunk/Jmol/src/org/jmol/viewer/StateManager.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/StateManager.java 2011-01-23 07:42:27 UTC (rev 15025) +++ trunk/Jmol/src/org/jmol/viewer/StateManager.java 2011-01-23 19:11:11 UTC (rev 15026) @@ -394,7 +394,7 @@ public String getMoveToText(boolean asCommand) { return (asCommand ? " " + moveToText + "\n save orientation \"" - + saveName.substring(12) + "\"\n" : moveToText); + + saveName.substring(12) + "\";\n" : moveToText); } public void restore(float timeSeconds, boolean isAll) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2011-07-07 03:10:50
|
Revision: 15734 http://jmol.svn.sourceforge.net/jmol/?rev=15734&view=rev Author: hansonr Date: 2011-07-07 03:10:44 +0000 (Thu, 07 Jul 2011) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/StateManager.java Modified: trunk/Jmol/src/org/jmol/viewer/StateManager.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/StateManager.java 2011-07-07 02:52:35 UTC (rev 15733) +++ trunk/Jmol/src/org/jmol/viewer/StateManager.java 2011-07-07 03:10:44 UTC (rev 15734) @@ -41,7 +41,6 @@ import org.jmol.util.BitSetUtil; import org.jmol.util.Logger; -import org.jmol.util.Parser; import org.jmol.util.TextFormat; import java.util.Arrays; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2011-11-14 04:44:45
|
Revision: 16467 http://jmol.svn.sourceforge.net/jmol/?rev=16467&view=rev Author: hansonr Date: 2011-11-14 04:44:38 +0000 (Mon, 14 Nov 2011) Log Message: ----------- version=12.3.5 # new feature: color isosurface PHASE color1 color2 # -- allows post-isosurface creation coloring by phase (atomicOrbitals) # bug fix: isosurface scale 0.5 plane... broken if no atoms present # bug fix: isosurface color density broken # bug fix: set PdbAddHydrogens does not transfer C atomSymmetry to H atoms # bug fix: contact() function not working when typed from console # bug fix: set axesOrientationRasmol not working properly (since 11.5.51) # code: org.jmol.modelsetbio.BioModel localizes more bio-only code into modelsetbio package # code: removal of org.jmol.modelset.Polymer # code: refactoring and organizing RepaintManager and ShapeManager Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/StateManager.java Modified: trunk/Jmol/src/org/jmol/viewer/StateManager.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/StateManager.java 2011-11-14 04:38:04 UTC (rev 16466) +++ trunk/Jmol/src/org/jmol/viewer/StateManager.java 2011-11-14 04:44:38 UTC (rev 16467) @@ -947,6 +947,7 @@ setParameterValue("vibrationPeriod", vibrationPeriod); setParameterValue("vibrationScale", vibrationScale); setParameterValue("visualRange", visualRange); + setParameterValue("waitForMoveTo", waitForMoveTo); setParameterValue("wireframeRotation", wireframeRotation); setParameterValue("zDepth", zDepth); setParameterValue("zeroBasedXyzRasmol", zeroBasedXyzRasmol); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2012-04-23 00:02:40
|
Revision: 17030 http://jmol.svn.sourceforge.net/jmol/?rev=17030&view=rev Author: hansonr Date: 2012-04-23 00:02:34 +0000 (Mon, 23 Apr 2012) Log Message: ----------- syncMouse, syncScript, syncStereo not reported until used. Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/StateManager.java Modified: trunk/Jmol/src/org/jmol/viewer/StateManager.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/StateManager.java 2012-04-23 00:01:51 UTC (rev 17029) +++ trunk/Jmol/src/org/jmol/viewer/StateManager.java 2012-04-23 00:02:34 UTC (rev 17030) @@ -761,6 +761,9 @@ setParameterValue("propertyAtomNumberField", 0); setParameterValue("propertyDataColumnCount", 0); setParameterValue("propertyDataField", 0); + setParameterValue("syncScript", false); + setParameterValue("syncMouse", false); + setParameterValue("syncStereo", false); setParameterValue("undo", true); // OK, all of the rest of these are maintained here as global values (below) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ha...@us...> - 2012-08-30 11:52:49
|
Revision: 17492 http://jmol.svn.sourceforge.net/jmol/?rev=17492&view=rev Author: hansonr Date: 2012-08-30 11:52:38 +0000 (Thu, 30 Aug 2012) Log Message: ----------- ___version=13.1.2_dev new feature: set defaultDropScript for drag-drop and File|Open bug fix: PDB polymers of length 1 allow size to be set and appear {visible} but are not Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/StateManager.java Modified: trunk/Jmol/src/org/jmol/viewer/StateManager.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/StateManager.java 2012-08-30 11:48:10 UTC (rev 17491) +++ trunk/Jmol/src/org/jmol/viewer/StateManager.java 2012-08-30 11:52:38 UTC (rev 17492) @@ -1011,7 +1011,7 @@ final Point3f ptDefaultLattice = new Point3f(); String defaultLoadScript = ""; String defaultLoadFilter = ""; - String defaultDropScript = "zap; load %FILE;if (%ALLOWCARTOONS && _loadScript = '' && defaultLoadScript == '' && _filetype == 'Pdb' && {(protein or nucleic)&*/1.1} && {*/1.1}[1].groupindex != {*/1.1}[0].groupindex) { select protein or nucleic;cartoons Only;if ({visible}){color structure}else{wireframe -0.1};if (!{visible}){spacefill 23%}; select * }"; + String defaultDropScript = "zap; load %FILE;if (%ALLOWCARTOONS && _loadScript == '' && defaultLoadScript == '' && _filetype == 'Pdb' && {(protein or nucleic)&*/1.1} && {*/1.1}[1].groupindex != {*/1.1}[0].groupindex) { select protein or nucleic;cartoons Only;if ({visible}){color structure}else{wireframe -0.1};if (!{visible}){spacefill 23%}; select * }"; // boolean _fileCaching = false; // String _fileCache = ""; boolean forceAutoBond = false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |