X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FRotatableCanvas.java;h=67fc95cecc7ef787419042bc96214ef4cd684942;hb=153dd62dc91da13ae732600e6ea55ddbe15eab39;hp=14cd425fb52afbf3858d15995709973c739149d8;hpb=506d60f0e188723ddc91c26824b41ac7034df3fe;p=jalview.git diff --git a/src/jalview/gui/RotatableCanvas.java b/src/jalview/gui/RotatableCanvas.java index 14cd425..67fc95c 100755 --- a/src/jalview/gui/RotatableCanvas.java +++ b/src/jalview/gui/RotatableCanvas.java @@ -1,20 +1,19 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4) - * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6) + * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle * - * This program 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 2 - * of the License, or (at your option) any later version. + * This file is part of Jalview. * - * This program 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. + * 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. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * 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 . */ package jalview.gui; @@ -350,7 +349,7 @@ public class RotatableCanvas extends JPanel implements MouseListener, * DOCUMENT ME! * * @param g - * DOCUMENT ME! + * DOCUMENT ME! */ public void paintComponent(Graphics g1) { @@ -396,7 +395,7 @@ public class RotatableCanvas extends JPanel implements MouseListener, * DOCUMENT ME! * * @param g - * DOCUMENT ME! + * DOCUMENT ME! */ public void drawAxes(Graphics g) { @@ -415,9 +414,9 @@ public class RotatableCanvas extends JPanel implements MouseListener, * DOCUMENT ME! * * @param g - * DOCUMENT ME! + * DOCUMENT ME! * @param col - * DOCUMENT ME! + * DOCUMENT ME! */ public void drawBackground(Graphics g, Color col) { @@ -429,7 +428,7 @@ public class RotatableCanvas extends JPanel implements MouseListener, * DOCUMENT ME! * * @param g - * DOCUMENT ME! + * DOCUMENT ME! */ public void drawScene(Graphics g1) { @@ -514,7 +513,7 @@ public class RotatableCanvas extends JPanel implements MouseListener, * DOCUMENT ME! * * @param evt - * DOCUMENT ME! + * DOCUMENT ME! */ public void keyTyped(KeyEvent evt) { @@ -524,7 +523,7 @@ public class RotatableCanvas extends JPanel implements MouseListener, * DOCUMENT ME! * * @param evt - * DOCUMENT ME! + * DOCUMENT ME! */ public void keyReleased(KeyEvent evt) { @@ -534,7 +533,7 @@ public class RotatableCanvas extends JPanel implements MouseListener, * DOCUMENT ME! * * @param evt - * DOCUMENT ME! + * DOCUMENT ME! */ public void keyPressed(KeyEvent evt) { @@ -565,7 +564,7 @@ public class RotatableCanvas extends JPanel implements MouseListener, * DOCUMENT ME! * * @param evt - * DOCUMENT ME! + * DOCUMENT ME! */ public void mouseClicked(MouseEvent evt) { @@ -575,7 +574,7 @@ public class RotatableCanvas extends JPanel implements MouseListener, * DOCUMENT ME! * * @param evt - * DOCUMENT ME! + * DOCUMENT ME! */ public void mouseEntered(MouseEvent evt) { @@ -585,7 +584,7 @@ public class RotatableCanvas extends JPanel implements MouseListener, * DOCUMENT ME! * * @param evt - * DOCUMENT ME! + * DOCUMENT ME! */ public void mouseExited(MouseEvent evt) { @@ -595,7 +594,7 @@ public class RotatableCanvas extends JPanel implements MouseListener, * DOCUMENT ME! * * @param evt - * DOCUMENT ME! + * DOCUMENT ME! */ public void mouseReleased(MouseEvent evt) { @@ -605,7 +604,7 @@ public class RotatableCanvas extends JPanel implements MouseListener, * DOCUMENT ME! * * @param evt - * DOCUMENT ME! + * DOCUMENT ME! */ public void mousePressed(MouseEvent evt) { @@ -647,8 +646,9 @@ public class RotatableCanvas extends JPanel implements MouseListener, aps[a].av.alignment.getWidth() - 1); } } - PaintRefresher.Refresh(this, av.getSequenceSetId()); + // canonical selection is sent to other listeners + av.sendSelection(); } repaint(); @@ -676,7 +676,7 @@ public class RotatableCanvas extends JPanel implements MouseListener, * DOCUMENT ME! * * @param evt - * DOCUMENT ME! + * DOCUMENT ME! */ public void mouseDragged(MouseEvent evt) { @@ -728,13 +728,13 @@ public class RotatableCanvas extends JPanel implements MouseListener, * DOCUMENT ME! * * @param x1 - * DOCUMENT ME! + * DOCUMENT ME! * @param y1 - * DOCUMENT ME! + * DOCUMENT ME! * @param x2 - * DOCUMENT ME! + * DOCUMENT ME! * @param y2 - * DOCUMENT ME! + * DOCUMENT ME! */ public void rectSelect(int x1, int y1, int x2, int y2) { @@ -766,9 +766,9 @@ public class RotatableCanvas extends JPanel implements MouseListener, * DOCUMENT ME! * * @param x - * DOCUMENT ME! + * DOCUMENT ME! * @param y - * DOCUMENT ME! + * DOCUMENT ME! * * @return DOCUMENT ME! */ @@ -815,4 +815,19 @@ 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; + } + }