X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FRotatableCanvas.java;h=a2463e87d7a44c80e61fb26a8f884c5f8c3cc2d1;hb=7bc226b58110fa26d9dbd3f0c78095d06909ffc3;hp=51b436f819422f011eba01d992b16523838e9fbb;hpb=ec955aa655d8320258b91eb079bc57f688cd0a07;p=jalview.git

diff --git a/src/jalview/appletgui/RotatableCanvas.java b/src/jalview/appletgui/RotatableCanvas.java
index 51b436f..a2463e8 100755
--- a/src/jalview/appletgui/RotatableCanvas.java
+++ b/src/jalview/appletgui/RotatableCanvas.java
@@ -1,23 +1,43 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
 package jalview.appletgui;
 
-import jalview.math.*;
-import jalview.datamodel.*;
-import jalview.util.*;
+import java.util.*;
 
 import java.awt.*;
 import java.awt.event.*;
-import java.util.*;
 
+import jalview.datamodel.*;
+import jalview.math.*;
+import jalview.util.*;
 
-public class RotatableCanvas extends Panel implements MouseListener,
-                                                       MouseMotionListener,
-                                                       KeyListener
-                                                       //RubberbandListener,
-                                                       //SequenceSelectionListener
+public class RotatableCanvas
+    extends Panel implements MouseListener,
+    MouseMotionListener,
+    KeyListener
 {
-  RotatableMatrix idmat  = new RotatableMatrix(3,3);
-  RotatableMatrix objmat = new RotatableMatrix(3,3);
-  RotatableMatrix rotmat = new RotatableMatrix(3,3);
+  RotatableMatrix idmat = new RotatableMatrix(3, 3);
+  RotatableMatrix objmat = new RotatableMatrix(3, 3);
+  RotatableMatrix rotmat = new RotatableMatrix(3, 3);
+  String tooltip;
+  int toolx, tooly;
 
   //RubberbandRectangle rubberband;
 
@@ -62,37 +82,53 @@ public class RotatableCanvas extends Panel implements MouseListener,
   float scalefactor = 1;
 
   AlignViewport av;
-//  Controller    controller;
+  boolean showLabels = false;
 
+  public RotatableCanvas(AlignViewport av)
+  {
+    this.av = av;
+  }
 
-  public RotatableCanvas(AlignViewport av,
-                          Vector points, int npoint) {
+  public void showLabels(boolean b)
+  {
+    showLabels = b;
+    repaint();
+  }
+
+  public void setPoints(Vector points, int npoint)
+  {
     this.points = points;
     this.npoint = npoint;
-    this.av = av;
-    PaintRefresher.Register(this);
-//
+    PaintRefresher.Register(this, av.getSequenceSetId());
+
     prefsize = getPreferredSize();
     orig = new float[npoint][3];
 
-    for (int i=0; i < npoint; i++) {
-      SequencePoint sp = (SequencePoint)points.elementAt(i);
-      for (int j=0; j < 3; j++) {
+    for (int i = 0; i < npoint; i++)
+    {
+      SequencePoint sp = (SequencePoint) points.elementAt(i);
+      for (int j = 0; j < 3; j++)
+      {
         orig[i][j] = sp.coord[j];
       }
     }
     //Initialize the matrices to identity
 
-    for (int i = 0; i < 3; i++) {
-      for (int j = 0; j < 3 ; j++) {
-        if (i != j) {
-          idmat.addElement(i,j,0);
-          objmat.addElement(i,j,0);
-          rotmat.addElement(i,j,0);
-        } else {
-          idmat.addElement(i,j,0);
-          objmat.addElement(i,j,0);
-          rotmat.addElement(i,j,0);
+    for (int i = 0; i < 3; i++)
+    {
+      for (int j = 0; j < 3; j++)
+      {
+        if (i != j)
+        {
+          idmat.addElement(i, j, 0);
+          objmat.addElement(i, j, 0);
+          rotmat.addElement(i, j, 0);
+        }
+        else
+        {
+          idmat.addElement(i, j, 0);
+          objmat.addElement(i, j, 0);
+          rotmat.addElement(i, j, 0);
         }
       }
     }
@@ -109,59 +145,70 @@ public class RotatableCanvas extends Panel implements MouseListener,
 
     addMouseListener(this);
     addKeyListener(this);
-   // if (getParent() != null) {
-   //   getParent().addKeyListener(this);
+    // if (getParent() != null) {
+    //   getParent().addKeyListener(this);
     //}
     addMouseMotionListener(this);
 
     // Add rubberband
- //   rubberband  = new RubberbandRectangle(this);
-  //  rubberband.setActive(true);
- //   rubberband.addListener(this);
+    //   rubberband  = new RubberbandRectangle(this);
+    //  rubberband.setActive(true);
+    //   rubberband.addListener(this);
   }
 
- /* public boolean handleSequenceSelectionEvent(SequenceSelectionEvent evt) {
-    redrawneeded = true;
-    repaint();
-    return true;
-  }
+  /* public boolean handleSequenceSelectionEvent(SequenceSelectionEvent evt) {
+     redrawneeded = true;
+     repaint();
+     return true;
+   }
 
-  public void removeNotify() {
-    controller.removeListener(this);
-    super.removeNotify();
-  }*/
+   public void removeNotify() {
+     controller.removeListener(this);
+     super.removeNotify();
+   }*/
 
-  public void initAxes() {
-    for (int i = 0; i < 3; i++) {
-      for (int j=0; j < 3; j++) {
-        if (i != j) {
+  public void initAxes()
+  {
+    for (int i = 0; i < 3; i++)
+    {
+      for (int j = 0; j < 3; j++)
+      {
+        if (i != j)
+        {
           axes[i][j] = 0;
-        } else {
+        }
+        else
+        {
           axes[i][j] = 1;
         }
       }
     }
   }
 
-  public void findWidth() {
+  public void findWidth()
+  {
     max = new float[3];
     min = new float[3];
 
-    max[0] = (float)-1e30;
-    max[1] = (float)-1e30;
-    max[2] = (float)-1e30;
+    max[0] = (float) - 1e30;
+    max[1] = (float) - 1e30;
+    max[2] = (float) - 1e30;
 
-    min[0] = (float)1e30;
-    min[1] = (float)1e30;
-    min[2] = (float)1e30;
+    min[0] = (float) 1e30;
+    min[1] = (float) 1e30;
+    min[2] = (float) 1e30;
 
-    for (int i = 0; i < 3; i++) {
-      for (int j = 0; j < npoint; j++) {
-        SequencePoint sp = (SequencePoint)points.elementAt(j);
-        if (sp.coord[i] >= max[i]) {
+    for (int i = 0; i < 3; i++)
+    {
+      for (int j = 0; j < npoint; j++)
+      {
+        SequencePoint sp = (SequencePoint) points.elementAt(j);
+        if (sp.coord[i] >= max[i])
+        {
           max[i] = sp.coord[i];
         }
-        if (sp.coord[i] <= min[i]) {
+        if (sp.coord[i] <= min[i])
+        {
           min[i] = sp.coord[i];
         }
       }
@@ -178,186 +225,255 @@ public class RotatableCanvas extends Panel implements MouseListener,
     maxwidth = width[0];
 
     if (width[1] > width[0])
+    {
       maxwidth = width[1];
+    }
     if (width[2] > width[1])
+    {
       maxwidth = width[2];
+    }
 
     //System.out.println("Maxwidth = " + maxwidth);
   }
 
-  public float findScale() {
+  public float findScale()
+  {
     int dim, width, height;
-    if (getSize().width != 0) {
+    if (getSize().width != 0)
+    {
       width = getSize().width;
       height = getSize().height;
-    } else {
+    }
+    else
+    {
       width = prefsize.width;
       height = prefsize.height;
     }
 
-    if (width < height) {
+    if (width < height)
+    {
       dim = width;
-    } else {
+    }
+    else
+    {
       dim = height;
     }
 
-    return (float)(dim*scalefactor/(2*maxwidth));
+    return (float) (dim * scalefactor / (2 * maxwidth));
   }
 
-  public void findCentre() {
+  public void findCentre()
+  {
     //Find centre coordinate
     findWidth();
 
-    centre[0] = (max[0] + min[0])/2;
-    centre[1] = (max[1] + min[1])/2;
-    centre[2] = (max[2] + min[2])/2;
+    centre[0] = (max[0] + min[0]) / 2;
+    centre[1] = (max[1] + min[1]) / 2;
+    centre[2] = (max[2] + min[2]) / 2;
 
     //    System.out.println("Centre x " + centre[0]);
     //System.out.println("Centre y " + centre[1]);
     //System.out.println("Centre z " + centre[2]);
   }
 
-  public Dimension getPreferredSize() {
-    if (prefsize != null) {
+  public Dimension getPreferredSize()
+  {
+    if (prefsize != null)
+    {
       return prefsize;
-    } else {
-      return new Dimension(400,400);
+    }
+    else
+    {
+      return new Dimension(400, 400);
     }
   }
 
-  public Dimension getMinimumSize() {
+  public Dimension getMinimumSize()
+  {
     return getPreferredSize();
   }
 
-  public void paint(Graphics g) {
-    //Only create the image at the beginning -
-    if ((img == null) || (prefsize.width != getSize().width) || (prefsize.height != getSize().height)) {
-      prefsize.width = getSize().width;
-      prefsize.height = getSize().height;
+  public void update(Graphics g)
+  {
+    paint(g);
+  }
+
+  public void paint(Graphics g)
+  {
+    if (points == null)
+    {
+      g.setFont(new Font("Verdana", Font.PLAIN, 18));
+      g.drawString("Calculating PCA....", 20, getSize().height / 2);
+    }
+    else
+    {
 
-      scale = findScale();
+      //Only create the image at the beginning -
+      if ( (img == null) || (prefsize.width != getSize().width) ||
+          (prefsize.height != getSize().height))
+      {
+        prefsize.width = getSize().width;
+        prefsize.height = getSize().height;
 
-      //      System.out.println("New scale = " + scale);
-      img = createImage(getSize().width,getSize().height);
-      ig = img.getGraphics();
+        scale = findScale();
 
-    }
+        //      System.out.println("New scale = " + scale);
+        img = createImage(getSize().width, getSize().height);
+        ig = img.getGraphics();
 
+      }
 
-      drawBackground(ig,Color.black);
+      drawBackground(ig, Color.black);
       drawScene(ig);
       if (drawAxes == true)
       {
         drawAxes(ig);
       }
 
+      if (tooltip != null)
+      {
+        ig.setColor(Color.red);
+        ig.drawString(tooltip, toolx, tooly);
+      }
 
-    g.drawImage(img,0,0,this);
+      g.drawImage(img, 0, 0, this);
+    }
   }
 
-  public void drawAxes(Graphics g) {
+  public void drawAxes(Graphics g)
+  {
 
     g.setColor(Color.yellow);
-    for (int i=0; i < 3 ; i++) {
-      g.drawLine(getSize().width/2,getSize().height/2,
-                 (int)(axes[i][0]*scale*max[0] + getSize().width/2),
-                 (int)(axes[i][1]*scale*max[1] + getSize().height/2));
+    for (int i = 0; i < 3; i++)
+    {
+      g.drawLine(getSize().width / 2, getSize().height / 2,
+                 (int) (axes[i][0] * scale * max[0] + getSize().width / 2),
+                 (int) (axes[i][1] * scale * max[1] + getSize().height / 2));
     }
   }
 
-  public void drawBackground(Graphics g, Color col) {
+  public void drawBackground(Graphics g, Color col)
+  {
     g.setColor(col);
-    g.fillRect(0,0,prefsize.width,prefsize.height);
+    g.fillRect(0, 0, prefsize.width, prefsize.height);
   }
 
+  public void drawScene(Graphics g)
+  {
+    //boolean darker = false;
 
-  public void drawScene(Graphics g) {
-    boolean darker = false;
-
-    int halfwidth = getSize().width/2;
-    int halfheight = getSize().height/2;
+    int halfwidth = getSize().width / 2;
+    int halfheight = getSize().height / 2;
 
-    for (int i = 0; i < npoint; i++) {
-      SequencePoint sp = (SequencePoint)points.elementAt(i);
-      int x = (int)((float)(sp.coord[0] - centre[0])*scale) + halfwidth;
-      int y = (int)((float)(sp.coord[1] - centre[1])*scale) + halfheight;
+    for (int i = 0; i < npoint; i++)
+    {
+      SequencePoint sp = (SequencePoint) points.elementAt(i);
+      int x = (int) ( (float) (sp.coord[0] - centre[0]) * scale) + halfwidth;
+      int y = (int) ( (float) (sp.coord[1] - centre[1]) * scale) + halfheight;
       float z = sp.coord[1] - centre[2];
 
-
-
-
-      if (sp.sequence.getColor() == Color.black)
-          g.setColor(Color.white);
+      if (av.getSequenceColour(sp.sequence) == Color.black)
+      {
+        g.setColor(Color.white);
+      }
       else
-          g.setColor(sp.sequence.getColor());
-
+      {
+        g.setColor(av.getSequenceColour(sp.sequence));
+      }
 
       if (av.getSelectionGroup() != null)
       {
-        if (av.getSelectionGroup().sequences.contains(((SequencePoint)points.elementAt(i)).sequence))
+        if (av.getSelectionGroup().getSequences(null).contains( ( (
+            SequencePoint) points.
+            elementAt(i)).sequence))
+        {
           g.setColor(Color.gray);
+        }
       }
       if (z < 0)
+      {
         g.setColor(g.getColor().darker());
+      }
 
-
-      g.fillRect(x-3,y-3,6,6);
-      g.setColor(Color.red);
+      g.fillRect(x - 3, y - 3, 6, 6);
+      if (showLabels)
+      {
+        g.setColor(Color.red);
+        g.drawString( ( (SequencePoint) points.elementAt(i)).sequence.
+                     getName(),
+                     x - 3, y - 4);
+      }
     }
-//    //Now the rectangle
-//    if (rectx2 != -1 && recty2 != -1) {
-//      g.setColor(Color.white);
-//
-//      g.drawRect(rectx1,recty1,rectx2-rectx1,recty2-recty1);
-//    }
   }
 
-  public Dimension minimumsize() {
+  public Dimension minimumsize()
+  {
     return prefsize;
   }
 
-  public Dimension preferredsize() {
+  public Dimension preferredsize()
+  {
     return prefsize;
   }
 
-  public void keyTyped(KeyEvent evt) { }
-  public void keyReleased(KeyEvent evt) { }
+  public void keyTyped(KeyEvent evt)
+  {}
 
-  public void keyPressed(KeyEvent evt) {
-    requestFocus();
-    if (evt.getKeyCode() == KeyEvent.VK_UP) {
-      scalefactor = (float)(scalefactor * 1.1);
+  public void keyReleased(KeyEvent evt)
+  {}
+
+  public void keyPressed(KeyEvent evt)
+  {
+    if (evt.getKeyCode() == KeyEvent.VK_UP)
+    {
+      scalefactor = (float) (scalefactor * 1.1);
       scale = findScale();
-    } else if (evt.getKeyCode() == KeyEvent.VK_DOWN) {
-      scalefactor = (float)(scalefactor * 0.9);
+    }
+    else if (evt.getKeyCode() == KeyEvent.VK_DOWN)
+    {
+      scalefactor = (float) (scalefactor * 0.9);
       scale = findScale();
-    } else if (evt.getKeyChar() == 's') {
-      System.out.println("Rectangle selection");
-      if (rectx2 != -1 && recty2 != -1) {
-        rectSelect(rectx1,recty1,rectx2,recty2);
+    }
+    else if (evt.getKeyChar() == 's')
+    {
+      System.err.println("DEBUG: Rectangle selection"); // log.debug
+      if (rectx2 != -1 && recty2 != -1)
+      {
+        rectSelect(rectx1, recty1, rectx2, recty2);
 
       }
     }
     repaint();
   }
 
-  public void printPoints() {
-    for (int i=0; i < npoint; i++) {
-      SequencePoint sp = (SequencePoint)points.elementAt(i);
-      Format.print(System.out,"%5d ", i);
-      for (int j=0; j < 3;j++) {
-        Format.print(System.out,"%13.3f  ",sp.coord[j]);
+  public void printPoints()
+  {
+    for (int i = 0; i < npoint; i++)
+    {
+      SequencePoint sp = (SequencePoint) points.elementAt(i);
+      Format.print(System.out, "%5d ", i);
+      for (int j = 0; j < 3; j++)
+      {
+        Format.print(System.out, "%13.3f  ", sp.coord[j]);
       }
       System.out.println();
     }
   }
 
-  public void mouseClicked(MouseEvent evt) { }
-  public void mouseEntered(MouseEvent evt) { }
-  public void mouseExited(MouseEvent evt) { }
-  public void mouseReleased(MouseEvent evt) { }
+  public void mouseClicked(MouseEvent evt)
+  {}
+
+  public void mouseEntered(MouseEvent evt)
+  {}
+
+  public void mouseExited(MouseEvent evt)
+  {}
 
-  public void mousePressed(MouseEvent evt) {
+  public void mouseReleased(MouseEvent evt)
+  {}
+
+  public void mousePressed(MouseEvent evt)
+  {
     int x = evt.getX();
     int y = evt.getY();
 
@@ -376,139 +492,131 @@ public class RotatableCanvas extends Panel implements MouseListener,
     rectx2 = -1;
     recty2 = -1;
 
-    SequenceI found = findPoint(x,y);
+    SequenceI found = findPoint(x, y);
 
     if (found != null)
     {
       if (av.getSelectionGroup() != null)
       {
-        av.getSelectionGroup().addOrRemove(found);
-        PaintRefresher.Refresh(this);
+        av.getSelectionGroup().addOrRemove(found, true);
+        av.getSelectionGroup().setEndRes(av.alignment.getWidth() - 1);
+        PaintRefresher.Refresh(this, av.getSequenceSetId());
       }
       else
       {
-          av.setSelectionGroup(new SequenceGroup());
-          av.getSelectionGroup().addOrRemove(found);
-          av.getSelectionGroup().setEndRes(av.alignment.getWidth());
+        av.setSelectionGroup(new SequenceGroup());
+        av.getSelectionGroup().addOrRemove(found, true);
+        av.getSelectionGroup().setEndRes(av.alignment.getWidth() - 1);
 
       }
     }
     repaint();
   }
 
- // private void fireSequenceSelectionEvent(Selection sel) {
- //   controller.handleSequenceSelectionEvent(new SequenceSelectionEvent(this,sel));
-  //}
-
   public void mouseMoved(MouseEvent evt)
   {
-  // SequenceI found = findPoint(evt.getX(), evt.getY());
+    SequenceI found = findPoint(evt.getX(), evt.getY());
+    if (found == null)
+    {
+      tooltip = null;
+    }
+    else
+    {
+      tooltip = found.getName();
+      toolx = evt.getX();
+      tooly = evt.getY();
+    }
+    repaint();
   }
 
-  public void mouseDragged(MouseEvent evt) {
+  public void mouseDragged(MouseEvent evt)
+  {
     mx = evt.getX();
     my = evt.getY();
-    //Check if this is a rectangle drawing drag
-    if ((evt.getModifiers() & InputEvent.BUTTON2_MASK) != 0) {
-//      rectx2 = evt.getX();
-//      recty2 = evt.getY();
-    } else {
-      rotmat.setIdentity();
-
-      rotmat.rotate((float)(my-omy),'x');
-      rotmat.rotate((float)(mx-omx),'y');
-
-      for (int i = 0; i < npoint; i++) {
-        SequencePoint sp = (SequencePoint)points.elementAt(i);
-        sp.coord[0] -= centre[0];
-        sp.coord[1] -= centre[1];
-        sp.coord[2] -= centre[2];
-
-        //Now apply the rotation matrix
-        sp.coord= rotmat.vectorMultiply(sp.coord);
-
-        //Now translate back again
-        sp.coord[0] += centre[0];
-        sp.coord[1] += centre[1];
-        sp.coord[2] += centre[2];
-      }
 
-      for (int i=0; i < 3; i++) {
-        axes[i] = rotmat.vectorMultiply(axes[i]);
-      }
-      omx = mx;
-      omy = my;
+    rotmat.setIdentity();
 
-      paint(this.getGraphics());
+    rotmat.rotate( (float) (my - omy), 'x');
+    rotmat.rotate( (float) (mx - omx), 'y');
+
+    for (int i = 0; i < npoint; i++)
+    {
+      SequencePoint sp = (SequencePoint) points.elementAt(i);
+      sp.coord[0] -= centre[0];
+      sp.coord[1] -= centre[1];
+      sp.coord[2] -= centre[2];
+
+      //Now apply the rotation matrix
+      sp.coord = rotmat.vectorMultiply(sp.coord);
+
+      //Now translate back again
+      sp.coord[0] += centre[0];
+      sp.coord[1] += centre[1];
+      sp.coord[2] += centre[2];
     }
 
+    for (int i = 0; i < 3; i++)
+    {
+      axes[i] = rotmat.vectorMultiply(axes[i]);
+    }
+    omx = mx;
+    omy = my;
+
+    paint(this.getGraphics());
   }
 
-  public void rectSelect(int x1, int y1, int x2, int y2) {
-    boolean changedSel = false;
-    for (int i=0; i < npoint; i++) {
-      SequencePoint sp = (SequencePoint)points.elementAt(i);
-      int tmp1 = (int)((sp.coord[0] - centre[0])*scale + (float)getSize().width/2.0);
-      int tmp2 = (int)((sp.coord[1] - centre[1])*scale + (float)getSize().height/2.0);
+  public void rectSelect(int x1, int y1, int x2, int y2)
+  {
+    //boolean changedSel = false;
+    for (int i = 0; i < npoint; i++)
+    {
+      SequencePoint sp = (SequencePoint) points.elementAt(i);
+      int tmp1 = (int) ( (sp.coord[0] - centre[0]) * scale +
+                        (float) getSize().width / 2.0);
+      int tmp2 = (int) ( (sp.coord[1] - centre[1]) * scale +
+                        (float) getSize().height / 2.0);
 
-      if (tmp1 > x1 && tmp1 < x2 && tmp2 > y1 && tmp2 < y2) {
-        if (av != null) {
-          if (!av.getSelectionGroup().sequences.contains(sp.sequence))
+      if (tmp1 > x1 && tmp1 < x2 && tmp2 > y1 && tmp2 < y2)
+      {
+        if (av != null)
+        {
+          if (!av.getSelectionGroup().getSequences(null).contains(sp.sequence))
           {
-            changedSel = true;
-            av.getSelectionGroup().addSequence(sp.sequence);
+            av.getSelectionGroup().addSequence(sp.sequence, true);
           }
         }
       }
     }
-   // if (changedSel) {
-   //    fireSequenceSelectionEvent(av.getSelection());
-   // }
   }
-  public SequenceI findPoint(int x, int y) {
 
-    int halfwidth = getSize().width/2;
-    int halfheight = getSize().height/2;
+  public SequenceI findPoint(int x, int y)
+  {
 
-    int found = -1;
+    int halfwidth = getSize().width / 2;
+    int halfheight = getSize().height / 2;
 
-    for (int i=0; i < npoint; i++) {
+    int found = -1;
 
-      SequencePoint sp = (SequencePoint)points.elementAt(i);
-      int px = (int)((float)(sp.coord[0] - centre[0])*scale) + halfwidth;
-      int py = (int)((float)(sp.coord[1] - centre[1])*scale) + halfheight;
+    for (int i = 0; i < npoint; i++)
+    {
 
+      SequencePoint sp = (SequencePoint) points.elementAt(i);
+      int px = (int) ( (float) (sp.coord[0] - centre[0]) * scale) + halfwidth;
+      int py = (int) ( (float) (sp.coord[1] - centre[1]) * scale) + halfheight;
 
-      if (Math.abs(px-x)<3 && Math.abs(py - y) < 3 ) {
+      if (Math.abs(px - x) < 3 && Math.abs(py - y) < 3)
+      {
         found = i;
       }
     }
-    if (found != -1) {
-      return ((SequencePoint)points.elementAt(found)).sequence;
-    } else {
+    if (found != -1)
+    {
+      return ( (SequencePoint) points.elementAt(found)).sequence;
+    }
+    else
+    {
       return null;
     }
   }
-/*  public boolean handleRubberbandEvent(RubberbandEvent evt) {
-    System.out.println("Rubberband handler called in RotatableCanvas with " +
-                       evt.getBounds());
-
-    Rubberband rb = (Rubberband)evt.getSource();
-
-    // Clear the current selection (instance variable)
-    //if ((rb.getModifiers() & Event.SHIFT_MASK) == 0) {
-    //   clearSelection();
-    //}
-
-    if (rb.getComponent() == this) {
-      Rectangle bounds = evt.getBounds();
-      rectSelect(bounds.x,bounds.y,bounds.x+bounds.width,bounds.y+bounds.height);
-    }
-
-    redrawneeded = true;
-    paint(this.getGraphics());
-
-    return true;
-  }*/
 
 }