git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'patch/JAL-2754_patch2104forJava8' into develop
[jalview.git]
/
src
/
jalview
/
gui
/
RotatableCanvas.java
diff --git
a/src/jalview/gui/RotatableCanvas.java
b/src/jalview/gui/RotatableCanvas.java
index
4ef18d4
..
02368df
100755
(executable)
--- a/
src/jalview/gui/RotatableCanvas.java
+++ b/
src/jalview/gui/RotatableCanvas.java
@@
-128,7
+128,6
@@
public class RotatableCanvas extends JPanel implements MouseListener,
boolean applyToAllViews = false;
boolean applyToAllViews = false;
- // Controller controller;
public RotatableCanvas(AlignmentPanel ap)
{
this.av = ap.av;
public RotatableCanvas(AlignmentPanel ap)
{
this.av = ap.av;
@@
-136,16
+135,23
@@
public class RotatableCanvas extends JPanel implements MouseListener,
addMouseWheelListener(new MouseWheelListener()
{
addMouseWheelListener(new MouseWheelListener()
{
+ @Override
public void mouseWheelMoved(MouseWheelEvent e)
{
public void mouseWheelMoved(MouseWheelEvent e)
{
- if (e.getWheelRotation() > 0)
+ double wheelRotation = e.getPreciseWheelRotation();
+ if (wheelRotation > 0)
{
{
+ /*
+ * zoom in
+ */
scale = (float) (scale * 1.1);
repaint();
}
scale = (float) (scale * 1.1);
repaint();
}
-
- else
+ else if (wheelRotation < 0)
{
{
+ /*
+ * zoom out
+ */
scale = (float) (scale * 0.9);
repaint();
}
scale = (float) (scale * 0.9);
repaint();
}
@@
-162,6
+168,7
@@
public class RotatableCanvas extends JPanel implements MouseListener,
boolean first = true;
boolean first = true;
+ @Override
public void setPoints(Vector points, int npoint)
{
this.points = points;
public void setPoints(Vector points, int npoint)
{
this.points = points;
@@
-327,7
+334,7
@@
public class RotatableCanvas extends JPanel implements MouseListener,
dim = height;
}
dim = height;
}
- return (float) ((dim * scalefactor) / (2 * maxwidth));
+ return (dim * scalefactor) / (2 * maxwidth);
}
/**
}
/**
@@
-352,6
+359,7
@@
public class RotatableCanvas extends JPanel implements MouseListener,
*
* @return DOCUMENT ME!
*/
*
* @return DOCUMENT ME!
*/
+ @Override
public Dimension getPreferredSize()
{
if (prefsize != null)
public Dimension getPreferredSize()
{
if (prefsize != null)
@@
-369,6
+377,7
@@
public class RotatableCanvas extends JPanel implements MouseListener,
*
* @return DOCUMENT ME!
*/
*
* @return DOCUMENT ME!
*/
+ @Override
public Dimension getMinimumSize()
{
return getPreferredSize();
public Dimension getMinimumSize()
{
return getPreferredSize();
@@
-380,6
+389,7
@@
public class RotatableCanvas extends JPanel implements MouseListener,
* @param g
* DOCUMENT ME!
*/
* @param g
* DOCUMENT ME!
*/
+ @Override
public void paintComponent(Graphics g1)
{
public void paintComponent(Graphics g1)
{
@@
-475,8
+485,8
@@
public class RotatableCanvas extends JPanel implements MouseListener,
for (int i = 0; i < npoint; i++)
{
SequencePoint sp = (SequencePoint) points.elementAt(i);
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];
+ halfheight;
float z = sp.coord[1] - centre[2];
@@
-547,6
+557,7
@@
public class RotatableCanvas extends JPanel implements MouseListener,
* @param evt
* DOCUMENT ME!
*/
* @param evt
* DOCUMENT ME!
*/
+ @Override
public void keyTyped(KeyEvent evt)
{
}
public void keyTyped(KeyEvent evt)
{
}
@@
-557,6
+568,7
@@
public class RotatableCanvas extends JPanel implements MouseListener,
* @param evt
* DOCUMENT ME!
*/
* @param evt
* DOCUMENT ME!
*/
+ @Override
public void keyReleased(KeyEvent evt)
{
}
public void keyReleased(KeyEvent evt)
{
}
@@
-567,6
+579,7
@@
public class RotatableCanvas extends JPanel implements MouseListener,
* @param evt
* DOCUMENT ME!
*/
* @param evt
* DOCUMENT ME!
*/
+ @Override
public void keyPressed(KeyEvent evt)
{
if (evt.getKeyCode() == KeyEvent.VK_UP)
public void keyPressed(KeyEvent evt)
{
if (evt.getKeyCode() == KeyEvent.VK_UP)
@@
-598,6
+611,7
@@
public class RotatableCanvas extends JPanel implements MouseListener,
* @param evt
* DOCUMENT ME!
*/
* @param evt
* DOCUMENT ME!
*/
+ @Override
public void mouseClicked(MouseEvent evt)
{
}
public void mouseClicked(MouseEvent evt)
{
}
@@
-608,6
+622,7
@@
public class RotatableCanvas extends JPanel implements MouseListener,
* @param evt
* DOCUMENT ME!
*/
* @param evt
* DOCUMENT ME!
*/
+ @Override
public void mouseEntered(MouseEvent evt)
{
}
public void mouseEntered(MouseEvent evt)
{
}
@@
-618,6
+633,7
@@
public class RotatableCanvas extends JPanel implements MouseListener,
* @param evt
* DOCUMENT ME!
*/
* @param evt
* DOCUMENT ME!
*/
+ @Override
public void mouseExited(MouseEvent evt)
{
}
public void mouseExited(MouseEvent evt)
{
}
@@
-628,6
+644,7
@@
public class RotatableCanvas extends JPanel implements MouseListener,
* @param evt
* DOCUMENT ME!
*/
* @param evt
* DOCUMENT ME!
*/
+ @Override
public void mouseReleased(MouseEvent evt)
{
}
public void mouseReleased(MouseEvent evt)
{
}
@@
-638,6
+655,7
@@
public class RotatableCanvas extends JPanel implements MouseListener,
* @param evt
* DOCUMENT ME!
*/
* @param evt
* DOCUMENT ME!
*/
+ @Override
public void mousePressed(MouseEvent evt)
{
int x = evt.getX();
public void mousePressed(MouseEvent evt)
{
int x = evt.getX();
@@
-690,6
+708,7
@@
public class RotatableCanvas extends JPanel implements MouseListener,
// controller.handleSequenceSelectionEvent(new
// SequenceSelectionEvent(this,sel));
// }
// controller.handleSequenceSelectionEvent(new
// SequenceSelectionEvent(this,sel));
// }
+ @Override
public void mouseMoved(MouseEvent evt)
{
SequenceI found = findPoint(evt.getX(), evt.getY());
public void mouseMoved(MouseEvent evt)
{
SequenceI found = findPoint(evt.getX(), evt.getY());
@@
-710,6
+729,7
@@
public class RotatableCanvas extends JPanel implements MouseListener,
* @param evt
* DOCUMENT ME!
*/
* @param evt
* DOCUMENT ME!
*/
+ @Override
public void mouseDragged(MouseEvent evt)
{
mx = evt.getX();
public void mouseDragged(MouseEvent evt)
{
mx = evt.getX();
@@
-725,8
+745,8
@@
public class RotatableCanvas extends JPanel implements MouseListener,
{
rotmat.setIdentity();
{
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++)
{
for (int i = 0; i < npoint; i++)
{
@@
-774,9
+794,9
@@
public class RotatableCanvas extends JPanel implements MouseListener,
{
SequencePoint sp = (SequencePoint) points.elementAt(i);
int tmp1 = (int) (((sp.coord[0] - centre[0]) * scale)
{
SequencePoint sp = (SequencePoint) points.elementAt(i);
int tmp1 = (int) (((sp.coord[0] - centre[0]) * scale)
- + ((float) getWidth() / 2.0));
+ + (getWidth() / 2.0));
int tmp2 = (int) (((sp.coord[1] - centre[1]) * scale)
int tmp2 = (int) (((sp.coord[1] - centre[1]) * scale)
- + ((float) getHeight() / 2.0));
+ + (getHeight() / 2.0));
if ((tmp1 > x1) && (tmp1 < x2) && (tmp2 > y1) && (tmp2 < y2))
{
if ((tmp1 > x1) && (tmp1 < x2) && (tmp2 > y1) && (tmp2 < y2))
{
@@
-816,9
+836,9
@@
public class RotatableCanvas extends JPanel implements MouseListener,
for (int i = 0; i < npoint; i++)
{
SequencePoint sp = (SequencePoint) points.elementAt(i);
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;
+ 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))
+ halfheight;
if ((Math.abs(px - x) < 3) && (Math.abs(py - y) < 3))