X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fappletgui%2FRotatableCanvas.java;h=afb4e9546652fbf951abde5b38d1e1e23773f241;hb=584c1b0136786968958e22e52b6ce51bd24511e5;hp=4efa701ba944cf6277fd9d78d1ec6b065d6986ca;hpb=153dd62dc91da13ae732600e6ea55ddbe15eab39;p=jalview.git
diff --git a/src/jalview/appletgui/RotatableCanvas.java b/src/jalview/appletgui/RotatableCanvas.java
index 4efa701..afb4e95 100755
--- a/src/jalview/appletgui/RotatableCanvas.java
+++ b/src/jalview/appletgui/RotatableCanvas.java
@@ -1,33 +1,49 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview 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 3 of the License, or (at your option) any later version.
- *
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
* Jalview 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 Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.appletgui;
-import java.util.*;
-
-import java.awt.*;
-import java.awt.event.*;
-
-import jalview.datamodel.*;
-import jalview.math.*;
-import jalview.util.*;
+import jalview.api.RotatableCanvasI;
+import jalview.datamodel.SequenceGroup;
+import jalview.datamodel.SequenceI;
+import jalview.datamodel.SequencePoint;
+import jalview.math.RotatableMatrix;
+import jalview.util.Format;
+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.Image;
+import java.awt.Panel;
+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.util.Vector;
public class RotatableCanvas extends Panel implements MouseListener,
- MouseMotionListener, KeyListener
+ MouseMotionListener, KeyListener, RotatableCanvasI
{
RotatableMatrix idmat = new RotatableMatrix(3, 3);
@@ -95,11 +111,11 @@ public class RotatableCanvas extends Panel implements MouseListener,
float scalefactor = 1;
- AlignViewport av;
+ AlignmentViewport av;
boolean showLabels = false;
- public RotatableCanvas(AlignViewport av)
+ public RotatableCanvas(AlignmentViewport av)
{
this.av = av;
}
@@ -315,7 +331,9 @@ public class RotatableCanvas extends Panel implements MouseListener,
if (points == null)
{
g.setFont(new Font("Verdana", Font.PLAIN, 18));
- g.drawString("Calculating PCA....", 20, getSize().height / 2);
+ g.drawString(
+ MessageManager.getString("label.calculating_pca") + "....",
+ 20, getSize().height / 2);
}
else
{
@@ -396,8 +414,8 @@ public class RotatableCanvas extends Panel implements MouseListener,
if (av.getSelectionGroup() != null)
{
- if (av.getSelectionGroup().getSequences(null).contains(
- ((SequencePoint) points.elementAt(i)).sequence))
+ if (av.getSelectionGroup().getSequences(null)
+ .contains(((SequencePoint) points.elementAt(i)).sequence))
{
g.setColor(Color.gray);
}
@@ -411,8 +429,9 @@ public class RotatableCanvas extends Panel implements MouseListener,
if (showLabels)
{
g.setColor(Color.red);
- g.drawString(((SequencePoint) points.elementAt(i)).sequence
- .getName(), x - 3, y - 4);
+ g.drawString(
+ ((SequencePoint) points.elementAt(i)).sequence.getName(),
+ x - 3, y - 4);
}
}
}
@@ -513,19 +532,22 @@ public class RotatableCanvas extends Panel implements MouseListener,
if (found != null)
{
+ // TODO: applet PCA is not associatable with multi-panels - only parent
+ // view
if (av.getSelectionGroup() != null)
{
av.getSelectionGroup().addOrRemove(found, true);
- av.getSelectionGroup().setEndRes(av.alignment.getWidth() - 1);
- PaintRefresher.Refresh(this, av.getSequenceSetId());
+ av.getSelectionGroup().setEndRes(av.getAlignment().getWidth() - 1);
}
else
{
av.setSelectionGroup(new SequenceGroup());
av.getSelectionGroup().addOrRemove(found, true);
- av.getSelectionGroup().setEndRes(av.alignment.getWidth() - 1);
+ av.getSelectionGroup().setEndRes(av.getAlignment().getWidth() - 1);
}
+ PaintRefresher.Refresh(this, av.getSequenceSetId());
+ av.sendSelection();
}
repaint();
}
@@ -588,15 +610,17 @@ public class RotatableCanvas extends Panel 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) getSize().width / 2.0);
- int tmp2 = (int) ((sp.coord[1] - centre[1]) * scale + (float) getSize().height / 2.0);
+ 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().getSequences(null).contains(
- sp.sequence))
+ if (!av.getSelectionGroup().getSequences(null)
+ .contains(sp.sequence))
{
av.getSelectionGroup().addSequence(sp.sequence, true);
}