[Jmol-commits] CVS: Jmol/src/org/openscience/jmol/app PreferencesDialog.java,1.10,1.11 TransformDialog.java,1.5,1.6

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

Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol/app
In directory sc8-pr-cvs1:/tmp/cvs-serv20647/src/org/openscience/jmol/app

Modified Files:
	PreferencesDialog.java TransformDialog.java 
Log Message:
converted viewer to use floats instead of doubles


Index: PreferencesDialog.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/app/PreferencesDialog.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PreferencesDialog.java	18 Aug 2003 07:20:16 -0000	1.10
+++ PreferencesDialog.java	29 Aug 2003 22:00:00 -0000	1.11
@@ -98,11 +98,8 @@
   private static byte styleLabel;
   private static String AtomPropsMode;
   private static byte styleBond;
-  private static double ArrowHeadSize;
-  private static double ArrowHeadRadius;
-  private static double ArrowLengthScale;
-  private static double minBondDistance;
-  private static double bondTolerance;
+  private static float minBondDistance;
+  private static float bondTolerance;
   private static short marBond;
   private static double FieldOfView;
   private static int percentVdwAtom;
@@ -628,9 +625,9 @@
       public void stateChanged(ChangeEvent e) {
 
         JSlider source = (JSlider) e.getSource();
-        bondTolerance = source.getValue() / 100.0;
+        bondTolerance = source.getValue() / 100f;
         viewer.setBondTolerance(bondTolerance);
-        props.put("bondTolerance", Double.toString(bondTolerance));
+        props.put("bondTolerance", "" + bondTolerance);
         viewer.rebond();
       }
     });
@@ -682,9 +679,9 @@
       public void stateChanged(ChangeEvent e) {
 
         JSlider source = (JSlider) e.getSource();
-        minBondDistance = source.getValue() / 100.0;
+        minBondDistance = source.getValue() / 100f;
         viewer.setMinBondDistance(minBondDistance);
-        props.put("minBondDistance", Double.toString(minBondDistance));
+        props.put("minBondDistance", "" + minBondDistance);
         viewer.rebond();
       }
     });
@@ -1104,11 +1101,10 @@
     styleBond = (byte)Integer.getInteger("styleBond").intValue();
     VibrationFrames = Integer.getInteger("VibrationFrames").intValue();
 
-    // Doubles and Doubles are special:
     minBondDistance =
-      new Double(props.getProperty("minBondDistance")).doubleValue();
+      new Float(props.getProperty("minBondDistance")).floatValue();
     bondTolerance =
-      new Double(props.getProperty("bondTolerance")).doubleValue();
+      new Float(props.getProperty("bondTolerance")).floatValue();
     marBond = Short.parseShort(props.getProperty("marBond"));
     FieldOfView = new Double(props.getProperty("FieldOfView")).doubleValue();
     percentVdwAtom =

Index: TransformDialog.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/app/TransformDialog.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TransformDialog.java	19 Aug 2003 21:10:09 -0000	1.5
+++ TransformDialog.java	29 Aug 2003 22:00:00 -0000	1.6
@@ -49,8 +49,9 @@
 import javax.swing.border.TitledBorder;
 import javax.swing.JButton; //BUT
 import javax.vecmath.Point3d;
+import javax.vecmath.Point3f;
 import javax.vecmath.Vector3d;
-import javax.vecmath.AxisAngle4d;
+import javax.vecmath.AxisAngle4f;
 import javax.swing.table.AbstractTableModel;
 import javax.swing.JScrollPane;
 import java.awt.FlowLayout;
@@ -229,11 +230,11 @@
 
 
   void rotate() {  //TODO
-    viewer.setCenter(center);
-    viewer.rotate(new AxisAngle4d(direction.x,
-                                   direction.y,
-                                   direction.z,
-                                   (double)Math.toRadians(angle)));
+    viewer.setCenter(new Point3f(center));
+    viewer.rotate(new AxisAngle4f((float)direction.x,
+				  (float)direction.y,
+				  (float)direction.z,
+				  (float)Math.toRadians(angle)));
   }