[Jmol-commits] CVS: Jmol/src/org/openscience/jmol/render AtomShape.java,1.58,1.59 AtomVectorShape.java,1.14,1.15 Axes.java,1.4,1.5 BoundingBox.java,1.4,1.5 LineShape.java,1.18,1.19 VectorShape.java,1.15,1.16

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

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

Modified Files:
	AtomShape.java AtomVectorShape.java Axes.java BoundingBox.java 
	LineShape.java VectorShape.java 
Log Message:
changed transform so that positive screen coordinate extends away from user


Index: AtomShape.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/render/AtomShape.java,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- AtomShape.java	2 Jun 2003 17:28:45 -0000	1.58
+++ AtomShape.java	5 Jun 2003 12:48:39 -0000	1.59
@@ -33,6 +33,7 @@
 import java.awt.Color;
 
 import javax.vecmath.Point3d;
+import javax.vecmath.Point3i;
 
 public class AtomShape extends Shape {
 
@@ -181,10 +182,10 @@
   }
 
   public void transform(DisplayControl control) {
-    Point3d screen = control.transformPoint(atom.getPoint3D());
-    x = (int)screen.x;
-    y = (int)screen.y;
-    z = (int)screen.z;
+    Point3i screen = control.transformPoint(atom.getPoint3D());
+    x = screen.x;
+    y = screen.y;
+    z = screen.z;
     diameter = control.scaleToScreen(z, marAtom * 2);
     for (int i = numBonds; --i >= 0; )
       bondWidths[i] = control.scaleToScreen(z, marBonds[i] * 2);

Index: AtomVectorShape.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/render/AtomVectorShape.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AtomVectorShape.java	2 Jun 2003 17:28:45 -0000	1.14
+++ AtomVectorShape.java	5 Jun 2003 12:48:39 -0000	1.15
@@ -27,8 +27,8 @@
 import org.openscience.jmol.*;
 import org.openscience.jmol.g25d.Graphics25D;
 
-//import java.awt.Graphics;
 import javax.vecmath.Point3d;
+import javax.vecmath.Point3i;
 
 public class AtomVectorShape extends Shape {
 
@@ -64,12 +64,12 @@
   }
 
   public void transform(DisplayControl control) {
-    Point3d screen = control.transformPoint(atom.getPoint3D());
-    int zAtom = (int)screen.z;
+    Point3i screen = control.transformPoint(atom.getPoint3D());
+    int zAtom = screen.z;
     screen = control.transformPoint(atom.getScaledVector());
-    x = (int)screen.x;
-    y = (int)screen.y;
-    z = (zAtom + (int)screen.z) / 2;
+    x = screen.x;
+    y = screen.y;
+    z = (zAtom + screen.z) / 2;
   }
   
   /**

Index: Axes.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/render/Axes.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Axes.java	2 Jun 2003 17:28:45 -0000	1.4
+++ Axes.java	5 Jun 2003 12:48:39 -0000	1.5
@@ -32,6 +32,7 @@
 import java.awt.Font;
 import java.awt.FontMetrics;
 import javax.vecmath.Point3d;
+import javax.vecmath.Point3i;
 
 public class Axes {
 
@@ -99,10 +100,10 @@
 
   class OriginShape extends Shape {
     public void transform(DisplayControl control) {
-      Point3d screen = control.transformPoint(pointOrigin);
-      x = (int)screen.x;
-      y = (int)screen.y;
-      z = (int)screen.z;
+      Point3i screen = control.transformPoint(pointOrigin);
+      x = screen.x;
+      y = screen.y;
+      z = screen.z;
     }
 
     public void render(Graphics25D g25d, DisplayControl control) {
@@ -131,10 +132,10 @@
     }
 
     public void transform(DisplayControl control) {
-      Point3d screen = control.transformPoint(pointAxisEnd);
-      x = (int)screen.x;
-      y = (int)screen.y;
-      z = (int)screen.z;
+      Point3i screen = control.transformPoint(pointAxisEnd);
+      x = screen.x;
+      y = screen.y;
+      z = screen.z;
     }
   
     public void render(Graphics25D g25d, DisplayControl control) {

Index: BoundingBox.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/render/BoundingBox.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BoundingBox.java	2 Jun 2003 17:28:45 -0000	1.4
+++ BoundingBox.java	5 Jun 2003 12:48:40 -0000	1.5
@@ -32,6 +32,7 @@
 import java.awt.Font;
 import java.awt.FontMetrics;
 import javax.vecmath.Point3d;
+import javax.vecmath.Point3i;
 
 public class BoundingBox {
 
@@ -93,10 +94,10 @@
     }
 
     public void transform(DisplayControl control) {
-      Point3d screen = control.transformPoint(point);
-      x = (int)screen.x;
-      y = (int)screen.y;
-      z = (int)screen.z;
+      Point3i screen = control.transformPoint(point);
+      x = screen.x;
+      y = screen.y;
+      z = screen.z;
     }
   
     public void render(Graphics25D g25d, DisplayControl control) {

Index: LineShape.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/render/LineShape.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- LineShape.java	2 Jun 2003 17:28:46 -0000	1.18
+++ LineShape.java	5 Jun 2003 12:48:40 -0000	1.19
@@ -30,6 +30,7 @@
 //import java.awt.Graphics;
 import java.awt.Rectangle;
 import javax.vecmath.Point3d;
+import javax.vecmath.Point3i;
 
 class LineShape extends Shape {
 
@@ -47,14 +48,14 @@
   }
 
   public void transform(DisplayControl control) {
-    Point3d screen = control.transformPoint(pointOrigin);
-    x = (int)screen.x;
-    y = (int)screen.y;
-    z = (int)screen.z;
+    Point3i screen = control.transformPoint(pointOrigin);
+    x = screen.x;
+    y = screen.y;
+    z = screen.z;
     screen = control.transformPoint(pointEnd);
-    xEnd = (int)screen.x;
-    yEnd = (int)screen.y;
-    zEnd = (int)screen.z;
+    xEnd = screen.x;
+    yEnd = screen.y;
+    zEnd = screen.z;
     // z = (z + zEnd) / 2;
     if (zEnd > z)
       z = zEnd;

Index: VectorShape.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/render/VectorShape.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- VectorShape.java	2 Jun 2003 17:28:47 -0000	1.15
+++ VectorShape.java	5 Jun 2003 12:48:40 -0000	1.16
@@ -27,8 +27,8 @@
 import org.openscience.jmol.*;
 import org.openscience.jmol.g25d.Graphics25D;
 
-//import java.awt.Graphics;
 import javax.vecmath.Point3d;
+import javax.vecmath.Point3i;
 
 public class VectorShape extends LineShape {
 
@@ -60,14 +60,14 @@
   }
 
   public void transform(DisplayControl control) {
-    Point3d screen = control.transformPoint(pointOrigin);
-    x = (int)screen.x;
-    y = (int)screen.y;
-    z = (int)screen.z;
+    Point3i screen = control.transformPoint(pointOrigin);
+    x = screen.x;
+    y = screen.y;
+    z = screen.z;
     screen = control.transformPoint(pointEnd);
-    xEnd = (int)screen.x;
-    yEnd = (int)screen.y;
-    zEnd = (int)screen.z;
+    xEnd = screen.x;
+    yEnd = screen.y;
+    zEnd = screen.z;
 
     if (arrowEnd)
       z = zEnd;