X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FRotatableCanvas.java;h=f5517dc4d6c89becce10b8823f0e0b554bca681d;hb=d86deeaf2bf1128ff2d4e610c9a715c9970fb3ad;hp=92abbf67a9c9e0502f52950f624d80622d0871a4;hpb=fb1ff6c555915bb15fd546c569faf59fdc2a1ff1;p=jalview.git

diff --git a/src/jalview/gui/RotatableCanvas.java b/src/jalview/gui/RotatableCanvas.java
index 92abbf6..f5517dc 100755
--- a/src/jalview/gui/RotatableCanvas.java
+++ b/src/jalview/gui/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) 2006 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
@@ -22,8 +22,6 @@ import jalview.datamodel.*;
 
 import jalview.math.*;
 
-import jalview.util.*;
-
 import java.awt.*;
 import java.awt.event.*;
 
@@ -96,7 +94,7 @@ public class RotatableCanvas extends JPanel implements MouseListener,
         ToolTipManager.sharedInstance().registerComponent(this);
         ToolTipManager.sharedInstance().setInitialDelay(0);
         ToolTipManager.sharedInstance().setDismissDelay(10000);
-        PaintRefresher.Register(this, av.alignment);
+        PaintRefresher.Register(this, av.getSequenceSetId());
 
         prefsize = getPreferredSize();
         orig = new float[npoint][3];
@@ -303,9 +301,13 @@ public class RotatableCanvas extends JPanel implements MouseListener,
      *
      * @param g DOCUMENT ME!
      */
-    public void paintComponent(Graphics g)
+    public void paintComponent(Graphics g1)
     {
 
+      Graphics2D g = (Graphics2D) g1;
+
+      g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+                         RenderingHints.VALUE_ANTIALIAS_ON);
       if(points==null)
       {
         g.setFont(new Font("Verdana", Font.PLAIN, 18));
@@ -345,12 +347,8 @@ public class RotatableCanvas extends JPanel implements MouseListener,
      *
      * @param g DOCUMENT ME!
      */
-    public void drawAxes(Graphics g1)
+    public void drawAxes(Graphics g)
     {
-      Graphics2D g = (Graphics2D) g1;
-
-      g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-                         RenderingHints.VALUE_ANTIALIAS_ON);
 
         g.setColor(Color.yellow);
 
@@ -411,7 +409,7 @@ public class RotatableCanvas extends JPanel implements MouseListener,
 
             if (av.getSelectionGroup() != null)
             {
-                if (av.getSelectionGroup().sequences.contains(
+                if (av.getSelectionGroup().getSequences(false).contains(
                             ((SequencePoint) points.elementAt(i)).sequence))
                 {
                     g.setColor(Color.gray);
@@ -486,8 +484,6 @@ public class RotatableCanvas extends JPanel implements MouseListener,
      */
     public void keyPressed(KeyEvent evt)
     {
-        requestFocus();
-
         if (evt.getKeyCode() == KeyEvent.VK_UP)
         {
             scalefactor = (float) (scalefactor * 1.1);
@@ -511,24 +507,6 @@ public class RotatableCanvas extends JPanel implements MouseListener,
         repaint();
     }
 
-    /**
-     * DOCUMENT ME!
-     */
-    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();
-        }
-    }
 
     /**
      * DOCUMENT ME!
@@ -598,7 +576,7 @@ public class RotatableCanvas extends JPanel implements MouseListener,
             if (av.getSelectionGroup() != null)
             {
                 av.getSelectionGroup().addOrRemove(found, true);
-                PaintRefresher.Refresh(this, av.alignment);
+                PaintRefresher.Refresh(this, av.getSequenceSetId());
             }
             else
             {
@@ -689,8 +667,6 @@ public class RotatableCanvas extends JPanel implements MouseListener,
      */
     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);
@@ -703,9 +679,8 @@ public class RotatableCanvas extends JPanel implements MouseListener,
             {
                 if (av != null)
                 {
-                    if (!av.getSelectionGroup().sequences.contains(sp.sequence))
+                    if (!av.getSelectionGroup().getSequences(false).contains(sp.sequence))
                     {
-                        changedSel = true;
                         av.getSelectionGroup().addSequence(sp.sequence, true);
                     }
                 }