X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FRotatableCanvas.java;fp=src%2Fjalview%2Fappletgui%2FRotatableCanvas.java;h=a870ca445b08636a015ee8f76cfd0e77983f95d4;hb=3459a8a691cb22508d7067f240b7254e588e77d3;hp=34f8ea5ab173bf3f7789968234e02b532ceac4e2;hpb=5b27f1062b2203c4c31702e205f4c78e1992063e;p=jalview.git diff --git a/src/jalview/appletgui/RotatableCanvas.java b/src/jalview/appletgui/RotatableCanvas.java index 34f8ea5..a870ca4 100755 --- a/src/jalview/appletgui/RotatableCanvas.java +++ b/src/jalview/appletgui/RotatableCanvas.java @@ -331,8 +331,10 @@ public class RotatableCanvas extends Panel implements MouseListener, for (int i = 0; i < 3; i++) { g.drawLine(getSize().width / 2, getSize().height / 2, - (int) (axisEndPoints[i].x * scale * max[0] + getSize().width / 2), - (int) (axisEndPoints[i].y * scale * max[1] + getSize().height / 2)); + (int) (axisEndPoints[i].x * scale * max[0] + + getSize().width / 2), + (int) (axisEndPoints[i].y * scale * max[1] + + getSize().height / 2)); } } @@ -353,8 +355,7 @@ public class RotatableCanvas extends Panel implements MouseListener, sequenceColour == Color.black ? Color.white : sequenceColour); if (av.getSelectionGroup() != null) { - if (av.getSelectionGroup().getSequences(null) - .contains(sequence)) + if (av.getSelectionGroup().getSequences(null).contains(sequence)) { g.setColor(Color.gray); } @@ -549,8 +550,7 @@ public class RotatableCanvas extends Panel implements MouseListener, { if (av != null) { - if (!av.getSelectionGroup().getSequences(null) - .contains(sequence)) + if (!av.getSelectionGroup().getSequences(null).contains(sequence)) { av.getSelectionGroup().addSequence(sequence, true); } @@ -579,10 +579,8 @@ public class RotatableCanvas extends Panel implements MouseListener, { SequencePoint sp = points.get(i); - int px = (int) ((sp.coord.x - centre.x) * scale) - + halfwidth; - int py = (int) ((sp.coord.y - centre.y) * scale) - + halfheight; + int px = (int) ((sp.coord.x - centre.x) * scale) + halfwidth; + int py = (int) ((sp.coord.y - centre.y) * scale) + halfheight; if (Math.abs(px - x) < 3 && Math.abs(py - y) < 3) { @@ -627,12 +625,12 @@ public class RotatableCanvas extends Panel implements MouseListener, { return; } - + /* * get the identity transformation... */ RotatableMatrix rotmat = new RotatableMatrix(); - + /* * rotate around the X axis for change in Y * (mouse movement up/down); note we are equating a @@ -642,7 +640,7 @@ public class RotatableCanvas extends Panel implements MouseListener, { rotmat.rotate(y, Axis.X); } - + /* * rotate around the Y axis for change in X * (mouse movement left/right) @@ -651,7 +649,7 @@ public class RotatableCanvas extends Panel implements MouseListener, { rotmat.rotate(x, Axis.Y); } - + /* * apply the composite transformation to sequence points */ @@ -666,7 +664,7 @@ public class RotatableCanvas extends Panel implements MouseListener, // Now translate back again sp.translate(centre.x, centre.y, centre.z); } - + /* * rotate the x/y/z axis positions */