From: <ha...@us...> - 2006-09-22 03:49:22
|
Revision: 5649 http://svn.sourceforge.net/jmol/?rev=5649&view=rev Author: hansonr Date: 2006-09-21 20:49:17 -0700 (Thu, 21 Sep 2006) Log Message: ----------- 10.9.62 -- setting label and echo defaults -- polyhedra command color/transparency -- calculate structure Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Eval.java trunk/Jmol/src/org/jmol/viewer/JmolConstants.java Modified: trunk/Jmol/src/org/jmol/viewer/Eval.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Eval.java 2006-09-22 03:13:10 UTC (rev 5648) +++ trunk/Jmol/src/org/jmol/viewer/Eval.java 2006-09-22 03:49:17 UTC (rev 5649) @@ -3131,7 +3131,7 @@ void calculate() throws ScriptException { if (statementLength == 1) - evalError("Calculate what? surface? hbonds?"); + evalError("Calculate what? hbonds? surface? structure?"); switch (statement[1].tok) { case Token.surface: dots(2, Dots.DOTS_MODE_CALCONLY); @@ -3139,7 +3139,7 @@ case Token.hbond: viewer.autoHbond(); return; - case Token.structure: // NOT WORKING YET - use set forceAutoBond instead + case Token.structure: viewer.calculateStructures(); return; } @@ -4489,20 +4489,13 @@ case Token.radius: decimalPropertyName = "radius"; continue; - case Token.color: - if (++i == statementLength) - colorExpected(); - if (statement[i].tok == Token.translucent - || statement[i].tok == Token.opaque) { - translucency = (statement[i].tok == Token.opaque ? "opaque" - : "translucent"); - i++; - } - if (i == statementLength || statement[i].tok != Token.colorRGB) { - if (translucency.length() > 0) - continue; - colorExpected(); - } + case Token.translucent: + translucency = "translucent"; + continue; + case Token.opaque: + translucency = "opaque"; + continue; + case Token.colorRGB: color = getArgbParam(i); continue; case Token.identifier: @@ -4607,8 +4600,8 @@ viewer.setShapeProperty(JmolConstants.SHAPE_POLYHEDRA, "colorThis", new Integer(color)); if (translucency.length() > 0) - viewer.setShapeProperty(JmolConstants.SHAPE_POLYHEDRA, "translucencyThis", - translucency); + viewer.setShapeProperty(JmolConstants.SHAPE_POLYHEDRA, + "translucencyThis", translucency); } void lcaoCartoon() throws ScriptException { Modified: trunk/Jmol/src/org/jmol/viewer/JmolConstants.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2006-09-22 03:13:10 UTC (rev 5648) +++ trunk/Jmol/src/org/jmol/viewer/JmolConstants.java 2006-09-22 03:49:17 UTC (rev 5649) @@ -42,7 +42,7 @@ // for now, just update this by hand // perhaps use ant filter later ... but mth doesn't like it :-( public final static String copyright = "(C) 2006 Jmol Development"; - public final static String version = "10.9.61"; + public final static String version = "10.9.62"; public final static String cvsDate = "$Date$"; public final static String date = cvsDate.substring(7, 23); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |