From: <ha...@us...> - 2007-04-11 19:14:36
|
Revision: 7379 http://svn.sourceforge.net/jmol/?rev=7379&view=rev Author: hansonr Date: 2007-04-11 12:14:34 -0700 (Wed, 11 Apr 2007) Log Message: ----------- 11.1.28 select */2.0 bug fix Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/Eval.java Modified: trunk/Jmol/src/org/jmol/viewer/Eval.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Eval.java 2007-04-11 19:02:06 UTC (rev 7378) +++ trunk/Jmol/src/org/jmol/viewer/Eval.java 2007-04-11 19:14:34 UTC (rev 7379) @@ -1333,11 +1333,14 @@ + comparisonValue % 1000; tokWhat = -tokWhat; } - + if (comparisonValue >= 1000000 && comparisonValue % 1000000 == 0) + tokWhat--; } } else if (val instanceof Float) { if (isModel) { tokWhat = -tokWhat; + if (comparisonValue % 1000000 == 0) + tokWhat--; } else { comparisonFloat =((Float) val).floatValue() ; comparisonValue = (int) (comparisonFloat * (isRadius ? 250f @@ -1699,6 +1702,9 @@ case -Token.model: //float is handled differently return atom.getModelFileNumber(); + case -Token.model - 1: + //float is handled differently + return (atom.getModelFileNumber() / 1000000) * 1000000; case Token.atomX: propertyValue = atom.x; return asInt ? propertyValue * 100 : propertyValue; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |