From: <ha...@us...> - 2009-08-29 13:29:23
|
Revision: 11388 http://jmol.svn.sourceforge.net/jmol/?rev=11388&view=rev Author: hansonr Date: 2009-08-29 13:29:15 +0000 (Sat, 29 Aug 2009) Log Message: ----------- version=11.8.2_dev # bug fix: acos, to be consistent, needs to deliver degrees, not radians Modified Paths: -------------- branches/v11_8/Jmol/src/org/jmol/viewer/Jmol.properties branches/v11_8/Jmol/src/org/jmol/viewer/ScriptMathProcessor.java Modified: branches/v11_8/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- branches/v11_8/Jmol/src/org/jmol/viewer/Jmol.properties 2009-08-29 13:09:58 UTC (rev 11387) +++ branches/v11_8/Jmol/src/org/jmol/viewer/Jmol.properties 2009-08-29 13:29:15 UTC (rev 11388) @@ -4,6 +4,7 @@ version=11.8.2_dev +# bug fix: acos, to be consistent, needs to deliver degrees, not radians # bug fix for MOReaders * NBO: --- note, "-" can be in column with " " causing tokenization failure # ----------------------------------------------------------------------------- Modified: branches/v11_8/Jmol/src/org/jmol/viewer/ScriptMathProcessor.java =================================================================== --- branches/v11_8/Jmol/src/org/jmol/viewer/ScriptMathProcessor.java 2009-08-29 13:09:58 UTC (rev 11387) +++ branches/v11_8/Jmol/src/org/jmol/viewer/ScriptMathProcessor.java 2009-08-29 13:29:15 UTC (rev 11388) @@ -1373,7 +1373,7 @@ double x = ScriptVariable.fValue(args[0]); switch (tok) { case Token.acos: - return addX((float) Math.acos(x)); + return addX((float) (Math.acos(x) * 180 / Math.PI)); case Token.cos: return addX((float) Math.cos(x * Math.PI / 180)); case Token.sin: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |