From: <ha...@us...> - 2006-05-06 14:13:40
|
Revision: 5071 Author: hansonr Date: 2006-05-06 07:13:33 -0700 (Sat, 06 May 2006) ViewCVS: http://svn.sourceforge.net/jmol/?rev=5071&view=rev Log Message: ----------- bob200603 adds/fixes numberOutOfRange messages Modified Paths: -------------- branches/bob200603/Jmol/src/org/jmol/viewer/Eval.java Modified: branches/bob200603/Jmol/src/org/jmol/viewer/Eval.java =================================================================== --- branches/bob200603/Jmol/src/org/jmol/viewer/Eval.java 2006-05-05 23:26:56 UTC (rev 5070) +++ branches/bob200603/Jmol/src/org/jmol/viewer/Eval.java 2006-05-06 14:13:33 UTC (rev 5071) @@ -926,7 +926,7 @@ case Token.decimal: float angstroms = floatParameter(2); if (angstroms < 0 || angstroms >= 2) - numberOutOfRange(0f,2f); + numberOutOfRange(0f,1.99999f); mad = (short) (angstroms * 1000 * 2); break; case Token.dotted: @@ -2130,19 +2130,16 @@ break; case Token.integer: int radiusRasMol = statement[1].intValue; - System.out.println("Eval star "+radiusRasMol); if (statementLength == 2) { - // this next is faulty -- you can't get a negative integer here - if (radiusRasMol > 750 || radiusRasMol < -100) - numberOutOfRange(-100, 750); - mad = (short) radiusRasMol; + if (radiusRasMol >= 750 || radiusRasMol < -100) + numberOutOfRange(-100, 749); + mad = (short)radiusRasMol; if (radiusRasMol > 0) mad *= 4 * 2; } else { - // this needs fixing: - if (radiusRasMol > 100) - numberOutOfRange(-100, 750); - mad = (short) -radiusRasMol; // use a negative number to specify %vdw + if (radiusRasMol < 0 || radiusRasMol > 100) + numberOutOfRange(0, 100); + mad = (short)-radiusRasMol; // use a negative number to specify %vdw } break; case Token.decimal: @@ -2183,18 +2180,16 @@ break; case Token.integer: int radiusRasMol = statement[1].intValue; - //this needs fixing - System.out.println("Eval cpk"+ radiusRasMol); if (statementLength == 2) { - if (radiusRasMol > 750 || radiusRasMol < -200) - numberOutOfRange(-200, 750); - mad = (short) radiusRasMol; + if (radiusRasMol >= 750 || radiusRasMol < -200) + numberOutOfRange(-200, 749); + mad = (short)radiusRasMol; if (radiusRasMol > 0) mad *= 4 * 2; } else { - if (radiusRasMol > 200) - numberOutOfRange(-200, 750); - mad = (short) -radiusRasMol; // use a negative number to specify %vdw + if (radiusRasMol < 0 || radiusRasMol > 200) + numberOutOfRange(0, 200); + mad = (short)-radiusRasMol; // use a negative number to specify %vdw } break; case Token.decimal: @@ -2282,7 +2277,7 @@ case Token.integer: int diameterPixels = statement[1].intValue; if (diameterPixels < 0 || diameterPixels >= 20) - numberOutOfRange(0,20); + numberOutOfRange(0, 19); mad = (short) diameterPixels; break; case Token.decimal: @@ -2525,7 +2520,7 @@ case Token.integer: int dotsParam = statement[1].intValue; if (dotsParam < 0 || dotsParam > 1000) - numberOutOfRange(); + numberOutOfRange(0, 1000); // I don't know what to do with this thing yet mad = (short) dotsParam; break; @@ -2560,13 +2555,13 @@ case Token.integer: int radiusRasMol = statement[1].intValue; if (radiusRasMol >= 500) - numberOutOfRange(); + numberOutOfRange(0, 499); mad = (short) (radiusRasMol * 4 * 2); break; case Token.decimal: float angstroms = ((Float) statement[1].value).floatValue(); if (angstroms > 4) - numberOutOfRange(); + numberOutOfRange(0f, 4f); mad = (short) (angstroms * 1000 * 2); break; default: @@ -3010,7 +3005,8 @@ if (rasmolSize < JmolConstants.LABEL_MINIMUM_FONTSIZE || rasmolSize > JmolConstants.LABEL_MAXIMUM_FONTSIZE) - numberOutOfRange(); + numberOutOfRange(JmolConstants.LABEL_MINIMUM_FONTSIZE, + JmolConstants.LABEL_MINIMUM_FONTSIZE); } viewer.loadShape(JmolConstants.SHAPE_LABELS); viewer.setShapeProperty(JmolConstants.SHAPE_LABELS, "fontsize", @@ -3094,7 +3090,7 @@ integerExpected(); strandCount = statement[2].intValue; if (strandCount < 0 || strandCount > 20) - numberOutOfRange(); + numberOutOfRange(0, 20); } viewer.setShapeProperty(JmolConstants.SHAPE_STRANDS, "strandCount", new Integer(strandCount)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |