X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FRotatableCanvas.java;h=02368df450693be5b54fab0948156afcdf76ef86;hb=86a0fb1fbbcde7087a58034eb12fefea7d02f7de;hp=67fc95cecc7ef787419042bc96214ef4cd684942;hpb=153dd62dc91da13ae732600e6ea55ddbe15eab39;p=jalview.git
diff --git a/src/jalview/gui/RotatableCanvas.java b/src/jalview/gui/RotatableCanvas.java
index 67fc95c..02368df 100755
--- a/src/jalview/gui/RotatableCanvas.java
+++ b/src/jalview/gui/RotatableCanvas.java
@@ -1,30 +1,52 @@
/*
- * 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.gui;
-import java.util.*;
-
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import jalview.datamodel.*;
-import jalview.math.*;
+import jalview.api.RotatableCanvasI;
+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!
@@ -33,7 +55,7 @@ import jalview.math.*;
* @version $Revision$
*/
public class RotatableCanvas extends JPanel implements MouseListener,
- MouseMotionListener, KeyListener
+ MouseMotionListener, KeyListener, RotatableCanvasI
{
RotatableMatrix idmat = new RotatableMatrix(3, 3);
@@ -96,7 +118,7 @@ public class RotatableCanvas extends JPanel implements MouseListener,
float scalefactor = 1;
- AlignViewport av;
+ AlignmentViewport av;
AlignmentPanel ap;
@@ -106,7 +128,6 @@ public class RotatableCanvas extends JPanel implements MouseListener,
boolean applyToAllViews = false;
- // Controller controller;
public RotatableCanvas(AlignmentPanel ap)
{
this.av = ap.av;
@@ -114,16 +135,23 @@ public class RotatableCanvas extends JPanel implements MouseListener,
addMouseWheelListener(new MouseWheelListener()
{
+ @Override
public void mouseWheelMoved(MouseWheelEvent e)
{
- if (e.getWheelRotation() > 0)
+ double wheelRotation = e.getPreciseWheelRotation();
+ if (wheelRotation > 0)
{
+ /*
+ * zoom in
+ */
scale = (float) (scale * 1.1);
repaint();
}
-
- else
+ else if (wheelRotation < 0)
{
+ /*
+ * zoom out
+ */
scale = (float) (scale * 0.9);
repaint();
}
@@ -138,14 +166,19 @@ public class RotatableCanvas extends JPanel implements MouseListener,
repaint();
}
+ boolean first = true;
+
+ @Override
public void setPoints(Vector points, int npoint)
{
this.points = points;
this.npoint = npoint;
- ToolTipManager.sharedInstance().registerComponent(this);
- ToolTipManager.sharedInstance().setInitialDelay(0);
- ToolTipManager.sharedInstance().setDismissDelay(10000);
-
+ if (first)
+ {
+ ToolTipManager.sharedInstance().registerComponent(this);
+ ToolTipManager.sharedInstance().setInitialDelay(0);
+ ToolTipManager.sharedInstance().setDismissDelay(10000);
+ }
prefsize = getPreferredSize();
orig = new float[npoint][3];
@@ -186,11 +219,14 @@ public class RotatableCanvas extends JPanel implements MouseListener,
findWidth();
scale = findScale();
+ if (first)
+ {
- addMouseListener(this);
-
- addMouseMotionListener(this);
+ addMouseListener(this);
+ addMouseMotionListener(this);
+ }
+ first = false;
}
public void initAxes()
@@ -298,7 +334,7 @@ public class RotatableCanvas extends JPanel implements MouseListener,
dim = height;
}
- return (float) ((dim * scalefactor) / (2 * maxwidth));
+ return (dim * scalefactor) / (2 * maxwidth);
}
/**
@@ -323,6 +359,7 @@ public class RotatableCanvas extends JPanel implements MouseListener,
*
* @return DOCUMENT ME!
*/
+ @Override
public Dimension getPreferredSize()
{
if (prefsize != null)
@@ -340,6 +377,7 @@ public class RotatableCanvas extends JPanel implements MouseListener,
*
* @return DOCUMENT ME!
*/
+ @Override
public Dimension getMinimumSize()
{
return getPreferredSize();
@@ -351,6 +389,7 @@ public class RotatableCanvas extends JPanel implements MouseListener,
* @param g
* DOCUMENT ME!
*/
+ @Override
public void paintComponent(Graphics g1)
{
@@ -361,7 +400,9 @@ public class RotatableCanvas extends JPanel implements MouseListener,
if (points == null)
{
g.setFont(new Font("Verdana", Font.PLAIN, 18));
- g.drawString("Calculating PCA....", 20, getHeight() / 2);
+ g.drawString(
+ MessageManager.getString("label.calculating_pca") + "....",
+ 20, getHeight() / 2);
}
else
{
@@ -404,9 +445,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)));
}
}
@@ -444,8 +485,8 @@ public class RotatableCanvas extends JPanel implements MouseListener,
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)
+ int x = (int) ((sp.coord[0] - centre[0]) * scale) + halfwidth;
+ int y = (int) ((sp.coord[1] - centre[1]) * scale)
+ halfheight;
float z = sp.coord[1] - centre[2];
@@ -460,8 +501,8 @@ public class RotatableCanvas extends JPanel 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);
}
@@ -476,8 +517,9 @@ public class RotatableCanvas extends JPanel 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);
}
}
@@ -515,6 +557,7 @@ public class RotatableCanvas extends JPanel implements MouseListener,
* @param evt
* DOCUMENT ME!
*/
+ @Override
public void keyTyped(KeyEvent evt)
{
}
@@ -525,6 +568,7 @@ public class RotatableCanvas extends JPanel implements MouseListener,
* @param evt
* DOCUMENT ME!
*/
+ @Override
public void keyReleased(KeyEvent evt)
{
}
@@ -535,6 +579,7 @@ public class RotatableCanvas extends JPanel implements MouseListener,
* @param evt
* DOCUMENT ME!
*/
+ @Override
public void keyPressed(KeyEvent evt)
{
if (evt.getKeyCode() == KeyEvent.VK_UP)
@@ -566,6 +611,7 @@ public class RotatableCanvas extends JPanel implements MouseListener,
* @param evt
* DOCUMENT ME!
*/
+ @Override
public void mouseClicked(MouseEvent evt)
{
}
@@ -576,6 +622,7 @@ public class RotatableCanvas extends JPanel implements MouseListener,
* @param evt
* DOCUMENT ME!
*/
+ @Override
public void mouseEntered(MouseEvent evt)
{
}
@@ -586,6 +633,7 @@ public class RotatableCanvas extends JPanel implements MouseListener,
* @param evt
* DOCUMENT ME!
*/
+ @Override
public void mouseExited(MouseEvent evt)
{
}
@@ -596,6 +644,7 @@ public class RotatableCanvas extends JPanel implements MouseListener,
* @param evt
* DOCUMENT ME!
*/
+ @Override
public void mouseReleased(MouseEvent evt)
{
}
@@ -606,6 +655,7 @@ public class RotatableCanvas extends JPanel implements MouseListener,
* @param evt
* DOCUMENT ME!
*/
+ @Override
public void mousePressed(MouseEvent evt)
{
int x = evt.getX();
@@ -642,8 +692,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.alignment.getWidth() - 1);
+ aps[a].av.getSelectionGroup()
+ .setEndRes(aps[a].av.getAlignment().getWidth() - 1);
}
}
PaintRefresher.Refresh(this, av.getSequenceSetId());
@@ -658,6 +708,7 @@ public class RotatableCanvas extends JPanel implements MouseListener,
// controller.handleSequenceSelectionEvent(new
// SequenceSelectionEvent(this,sel));
// }
+ @Override
public void mouseMoved(MouseEvent evt)
{
SequenceI found = findPoint(evt.getX(), evt.getY());
@@ -678,6 +729,7 @@ public class RotatableCanvas extends JPanel implements MouseListener,
* @param evt
* DOCUMENT ME!
*/
+ @Override
public void mouseDragged(MouseEvent evt)
{
mx = evt.getX();
@@ -693,8 +745,8 @@ public class RotatableCanvas extends JPanel implements MouseListener,
{
rotmat.setIdentity();
- rotmat.rotate((float) (my - omy), 'x');
- rotmat.rotate((float) (mx - omx), 'y');
+ rotmat.rotate(my - omy, 'x');
+ rotmat.rotate(mx - omx, 'y');
for (int i = 0; i < npoint; i++)
{
@@ -741,15 +793,17 @@ 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)
+ + (getWidth() / 2.0));
+ int tmp2 = (int) (((sp.coord[1] - centre[1]) * scale)
+ + (getHeight() / 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);
}
@@ -782,9 +836,9 @@ public class RotatableCanvas extends JPanel implements MouseListener,
for (int i = 0; i < npoint; i++)
{
SequencePoint sp = (SequencePoint) points.elementAt(i);
- int px = (int) ((float) (sp.coord[0] - centre[0]) * scale)
+ int px = (int) ((sp.coord[0] - centre[0]) * scale)
+ halfwidth;
- int py = (int) ((float) (sp.coord[1] - centre[1]) * scale)
+ int py = (int) ((sp.coord[1] - centre[1]) * scale)
+ halfheight;
if ((Math.abs(px - x) < 3) && (Math.abs(py - y) < 3))
@@ -811,19 +865,19 @@ public class RotatableCanvas extends JPanel implements MouseListener,
}
else
{
- return new AlignmentPanel[]
- { ap };
+ return new AlignmentPanel[] { ap };
}
}
/**
*
- * @return x,y,z positions of point s (index into points) under current transform.
+ * @return x,y,z positions of point s (index into points) under current
+ * transform.
*/
public double[] getPointPosition(int s)
{
double pts[] = new double[3];
- float[] p = ((SequencePoint)points.elementAt(s)).coord;
+ float[] p = ((SequencePoint) points.elementAt(s)).coord;
pts[0] = p[0];
pts[1] = p[1];
pts[2] = p[2];