X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FRotatableCanvas.java;h=f3312c32bf08e3ffdad209f191be87fd36cca415;hb=d053a3c980cf4318b9a19a255f9fc870e74de989;hp=883a4c972ea01c9a7c3ff3a7e7ecf11db3a38e9a;hpb=d423f22792e47dbc800ae220a58677f988971d06;p=jalview.git diff --git a/src/jalview/gui/RotatableCanvas.java b/src/jalview/gui/RotatableCanvas.java index 883a4c9..f3312c3 100755 --- a/src/jalview/gui/RotatableCanvas.java +++ b/src/jalview/gui/RotatableCanvas.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5) - * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) + * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle * * This file is part of Jalview. * @@ -460,8 +460,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 +476,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); } } @@ -643,7 +644,7 @@ 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.getAlignment().getWidth() - 1); } } PaintRefresher.Refresh(this, av.getSequenceSetId()); @@ -748,8 +749,8 @@ public class RotatableCanvas extends JPanel implements MouseListener, { 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); } @@ -815,4 +816,20 @@ public class RotatableCanvas extends JPanel implements MouseListener, { ap }; } } + + /** + * + * @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; + pts[0] = p[0]; + pts[1] = p[1]; + pts[2] = p[2]; + return pts; + } + }