X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FRotatableCanvas.java;h=d695ebbbc8895b9843d7a4569ee72f676be405a7;hb=d1e20f6a5654ea6baf378afa3277b4e751c69a96;hp=d7cb78ac5523422b959f8271e3422034a41a5515;hpb=a1984b1c8c273ed33c7ce9283039f4027dcae2de;p=jalview.git diff --git a/src/jalview/gui/RotatableCanvas.java b/src/jalview/gui/RotatableCanvas.java index d7cb78a..d695ebb 100755 --- a/src/jalview/gui/RotatableCanvas.java +++ b/src/jalview/gui/RotatableCanvas.java @@ -57,9 +57,9 @@ import javax.swing.ToolTipManager; * Models a Panel on which a set of points, and optionally x/y/z axes, can be * drawn, and rotated or zoomed with the mouse */ -public class RotatableCanvas extends JPanel implements MouseListener, - MouseMotionListener, KeyListener, RotatableCanvasI, - MouseWheelListener +public class RotatableCanvas extends JPanel + implements MouseListener, MouseMotionListener, KeyListener, + RotatableCanvasI, MouseWheelListener { private static final float ZOOM_OUT = 0.9f; @@ -198,15 +198,15 @@ public class RotatableCanvas extends JPanel implements MouseListener, { float[] max = new float[DIMS]; float[] min = new float[DIMS]; - + max[0] = -Float.MAX_VALUE; max[1] = -Float.MAX_VALUE; max[2] = -Float.MAX_VALUE; - + min[0] = Float.MAX_VALUE; min[1] = Float.MAX_VALUE; min[2] = Float.MAX_VALUE; - + for (SequencePoint sp : sequencePoints) { max[0] = Math.max(max[0], sp.coord.x); @@ -216,7 +216,7 @@ public class RotatableCanvas extends JPanel implements MouseListener, min[1] = Math.min(min[1], sp.coord.y); min[2] = Math.min(min[2], sp.coord.z); } - + seqMin = min; seqMax = max; } @@ -699,7 +699,7 @@ public class RotatableCanvas extends JPanel implements MouseListener, // Now translate back again sp.translate(centre[0], centre[1], centre[2]); - + zMin = Math.min(zMin, sp.coord.z); zMax = Math.max(zMax, sp.coord.z); } @@ -758,8 +758,7 @@ public class RotatableCanvas extends JPanel implements MouseListener, if (av != null) { SequenceI sequence = sp.getSequence(); - if (!av.getSelectionGroup().getSequences(null) - .contains(sequence)) + if (!av.getSelectionGroup().getSequences(null).contains(sequence)) { av.getSelectionGroup().addSequence(sequence, true); } @@ -794,10 +793,8 @@ public class RotatableCanvas extends JPanel implements MouseListener, for (int i = 0; i < npoint; i++) { SequencePoint sp = sequencePoints.get(i); - int px = (int) ((sp.coord.x - centre[0]) * scaleBy) - + halfwidth; - int py = (int) ((sp.coord.y - centre[1]) * scaleBy) - + halfheight; + int px = (int) ((sp.coord.x - centre[0]) * scaleBy) + halfwidth; + int py = (int) ((sp.coord.y - centre[1]) * scaleBy) + halfheight; if ((Math.abs(px - x) < NEARBY) && (Math.abs(py - y) < NEARBY)) {