X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FRotatableCanvas.java;h=4ef18d49014a8ea40f5c54a6468a19d824cc8365;hb=3d0101179759ef157b088ea135423cd909512d9f;hp=b8de5fbb4d26212ff0ce2d63f3ad734fb6d6e76b;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git

diff --git a/src/jalview/gui/RotatableCanvas.java b/src/jalview/gui/RotatableCanvas.java
index b8de5fb..4ef18d4 100755
--- a/src/jalview/gui/RotatableCanvas.java
+++ b/src/jalview/gui/RotatableCanvas.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -20,16 +20,33 @@
  */
 package jalview.gui;
 
-import java.util.*;
-import java.awt.*;
-import java.awt.event.*;
-
-import javax.swing.*;
-
 import jalview.api.RotatableCanvasI;
-import jalview.datamodel.*;
-import jalview.math.*;
+import jalview.datamodel.SequenceGroup;
+import jalview.datamodel.SequenceI;
+import jalview.datamodel.SequencePoint;
+import jalview.math.RotatableMatrix;
 import jalview.util.MessageManager;
+import jalview.viewmodel.AlignmentViewport;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.RenderingHints;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+import java.awt.event.MouseWheelEvent;
+import java.awt.event.MouseWheelListener;
+import java.util.Vector;
+
+import javax.swing.JPanel;
+import javax.swing.ToolTipManager;
 
 /**
  * DOCUMENT ME!
@@ -101,7 +118,7 @@ public class RotatableCanvas extends JPanel implements MouseListener,
 
   float scalefactor = 1;
 
-  AlignViewport av;
+  AlignmentViewport av;
 
   AlignmentPanel ap;
 
@@ -373,7 +390,9 @@ public class RotatableCanvas extends JPanel implements MouseListener,
     if (points == null)
     {
       g.setFont(new Font("Verdana", Font.PLAIN, 18));
-      g.drawString(MessageManager.getString("label.calculating_pca")+ "....", 20, getHeight() / 2);
+      g.drawString(
+              MessageManager.getString("label.calculating_pca") + "....",
+              20, getHeight() / 2);
     }
     else
     {
@@ -416,9 +435,9 @@ public class RotatableCanvas extends JPanel implements MouseListener,
 
     for (int i = 0; i < 3; i++)
     {
-      g.drawLine(getWidth() / 2, getHeight() / 2, (int) ((axes[i][0]
-              * scale * max[0]) + (getWidth() / 2)), (int) ((axes[i][1]
-              * scale * max[1]) + (getHeight() / 2)));
+      g.drawLine(getWidth() / 2, getHeight() / 2,
+              (int) ((axes[i][0] * scale * max[0]) + (getWidth() / 2)),
+              (int) ((axes[i][1] * scale * max[1]) + (getHeight() / 2)));
     }
   }
 
@@ -655,8 +674,8 @@ public class RotatableCanvas extends JPanel implements MouseListener,
         {
           aps[a].av.setSelectionGroup(new SequenceGroup());
           aps[a].av.getSelectionGroup().addOrRemove(found, true);
-          aps[a].av.getSelectionGroup().setEndRes(
-                  aps[a].av.getAlignment().getWidth() - 1);
+          aps[a].av.getSelectionGroup()
+                  .setEndRes(aps[a].av.getAlignment().getWidth() - 1);
         }
       }
       PaintRefresher.Refresh(this, av.getSequenceSetId());
@@ -754,8 +773,10 @@ public class RotatableCanvas extends JPanel implements MouseListener,
     for (int i = 0; i < npoint; i++)
     {
       SequencePoint sp = (SequencePoint) points.elementAt(i);
-      int tmp1 = (int) (((sp.coord[0] - centre[0]) * scale) + ((float) getWidth() / 2.0));
-      int tmp2 = (int) (((sp.coord[1] - centre[1]) * scale) + ((float) getHeight() / 2.0));
+      int tmp1 = (int) (((sp.coord[0] - centre[0]) * scale)
+              + ((float) getWidth() / 2.0));
+      int tmp2 = (int) (((sp.coord[1] - centre[1]) * scale)
+              + ((float) getHeight() / 2.0));
 
       if ((tmp1 > x1) && (tmp1 < x2) && (tmp2 > y1) && (tmp2 < y2))
       {
@@ -824,8 +845,7 @@ public class RotatableCanvas extends JPanel implements MouseListener,
     }
     else
     {
-      return new AlignmentPanel[]
-      { ap };
+      return new AlignmentPanel[] { ap };
     }
   }