[Jmol-commits] CVS: Jmol/src/org/openscience/jmol/viewer/managers ModelManager.java,1.33,1.34

[Michael T H. <mic...@us...>]

Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/managers
In directory sc8-pr-cvs1:/tmp/cvs-serv32441/src/org/openscience/jmol/viewer/managers

Modified Files:
	ModelManager.java 
Log Message:
converted covalent table to short mar representation


Index: ModelManager.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/managers/ModelManager.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ModelManager.java	10 Jan 2004 14:36:36 -0000	1.33
+++ ModelManager.java	10 Jan 2004 15:05:49 -0000	1.34
@@ -274,27 +274,27 @@
     return getAtomicSymbol(atom);
   }
 
-  public float getVanderwaalsRadius(Atom atom) {
+  public short getVanderwaalsMar(Atom atom) {
     if (suppliesVanderwaalsRadius) {
       float vanderwaalsRadius =
         modelAdapter.getVanderwaalsRadius(atom.clientAtom);
       if (vanderwaalsRadius > 0)
-        return vanderwaalsRadius;
+        return (short)(vanderwaalsRadius * 1000);
       System.out.println("JmolClientAdapter.getVanderwaalsRadius() returned " +
                          vanderwaalsRadius);
     }
-    return JmolConstants.vanderwaalsMars[atom.atomicNumber] / 1000f;
+    return JmolConstants.vanderwaalsMars[atom.atomicNumber];
   }
 
-  public float getCovalentRadius(Atom atom) {
+  public short getCovalentMar(Atom atom) {
     if (suppliesCovalentRadius) {
       float covalentRadius = modelAdapter.getCovalentRadius(atom.clientAtom);
       if (covalentRadius > 0)
-        return covalentRadius;
+        return (short)(covalentRadius * 1000);
       System.out.println("JmolClientAdapter.getCovalentRadius() returned " +
                          covalentRadius);
     }
-    return JmolConstants.covalentMars[atom.atomicNumber] / 1000f;
+    return JmolConstants.covalentMars[atom.atomicNumber];
   }
 
   public String getPdbAtomRecord(Object clientAtom) {