X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FRotatableCanvas.java;h=a2463e87d7a44c80e61fb26a8f884c5f8c3cc2d1;hb=ad52f1ddcaefa09c6a3e85329b28dad155613f49;hp=82207a22a0589bfa1fdf21ac295216776e256292;hpb=ee53965807b83bf93a21cbc341cee9a9e005b2cb;p=jalview.git

diff --git a/src/jalview/appletgui/RotatableCanvas.java b/src/jalview/appletgui/RotatableCanvas.java
index 82207a2..a2463e8 100755
--- a/src/jalview/appletgui/RotatableCanvas.java
+++ b/src/jalview/appletgui/RotatableCanvas.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * 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
@@ -36,6 +36,8 @@ public class RotatableCanvas
   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;
 
@@ -97,8 +99,7 @@ public class RotatableCanvas
   {
     this.points = points;
     this.npoint = npoint;
-    this.av = av;
-    PaintRefresher.Register(this, av.alignment);
+    PaintRefresher.Register(this, av.getSequenceSetId());
 
     prefsize = getPreferredSize();
     orig = new float[npoint][3];
@@ -292,6 +293,11 @@ public class RotatableCanvas
     return getPreferredSize();
   }
 
+  public void update(Graphics g)
+  {
+    paint(g);
+  }
+
   public void paint(Graphics g)
   {
     if (points == null)
@@ -324,6 +330,12 @@ public class RotatableCanvas
         drawAxes(ig);
       }
 
+      if (tooltip != null)
+      {
+        ig.setColor(Color.red);
+        ig.drawString(tooltip, toolx, tooly);
+      }
+
       g.drawImage(img, 0, 0, this);
     }
   }
@@ -348,7 +360,7 @@ public class RotatableCanvas
 
   public void drawScene(Graphics g)
   {
-    boolean darker = false;
+    //boolean darker = false;
 
     int halfwidth = getSize().width / 2;
     int halfheight = getSize().height / 2;
@@ -360,18 +372,19 @@ public class RotatableCanvas
       int y = (int) ( (float) (sp.coord[1] - centre[1]) * scale) + halfheight;
       float z = sp.coord[1] - centre[2];
 
-      if (sp.sequence.getColor() == Color.black)
+      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.
+        if (av.getSelectionGroup().getSequences(null).contains( ( (
+            SequencePoint) points.
             elementAt(i)).sequence))
         {
           g.setColor(Color.gray);
@@ -390,14 +403,7 @@ public class RotatableCanvas
                      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()
@@ -418,7 +424,6 @@ public class RotatableCanvas
 
   public void keyPressed(KeyEvent evt)
   {
-    requestFocus();
     if (evt.getKeyCode() == KeyEvent.VK_UP)
     {
       scalefactor = (float) (scalefactor * 1.1);
@@ -494,77 +499,75 @@ public class RotatableCanvas
       if (av.getSelectionGroup() != null)
       {
         av.getSelectionGroup().addOrRemove(found, true);
-        av.getSelectionGroup().setEndRes(av.alignment.getWidth()-1);
-        PaintRefresher.Refresh(this, av.alignment);
+        av.getSelectionGroup().setEndRes(av.alignment.getWidth() - 1);
+        PaintRefresher.Refresh(this, av.getSequenceSetId());
       }
       else
       {
         av.setSelectionGroup(new SequenceGroup());
         av.getSelectionGroup().addOrRemove(found, true);
-        av.getSelectionGroup().setEndRes(av.alignment.getWidth()-1);
+        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)
   {
     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');
+    rotmat.setIdentity();
 
-      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];
-      }
+    rotmat.rotate( (float) (my - omy), 'x');
+    rotmat.rotate( (float) (mx - omx), 'y');
 
-      for (int i = 0; i < 3; i++)
-      {
-        axes[i] = rotmat.vectorMultiply(axes[i]);
-      }
-      omx = mx;
-      omy = my;
+    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);
 
-      paint(this.getGraphics());
+      //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;
+    //boolean changedSel = false;
     for (int i = 0; i < npoint; i++)
     {
       SequencePoint sp = (SequencePoint) points.elementAt(i);
@@ -577,7 +580,7 @@ public class RotatableCanvas
       {
         if (av != null)
         {
-          if (!av.getSelectionGroup().sequences.contains(sp.sequence))
+          if (!av.getSelectionGroup().getSequences(null).contains(sp.sequence))
           {
             av.getSelectionGroup().addSequence(sp.sequence, true);
           }
@@ -615,26 +618,5 @@ public class RotatableCanvas
       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;
-    }*/
 
 }