X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FIdPanel.java;h=11ef52a6a8d169998b757c807f384e8ac1dda83f;hb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;hp=8f748a88faae71c0e4f7893f750d1b978b68111e;hpb=94f7397e4369deba3ec5743f9d28c14566fdfad2;p=jalview.git diff --git a/src/jalview/gui/IdPanel.java b/src/jalview/gui/IdPanel.java index 8f748a8..11ef52a 100755 --- a/src/jalview/gui/IdPanel.java +++ b/src/jalview/gui/IdPanel.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.7) + * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, 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; @@ -43,8 +42,9 @@ public class IdPanel extends JPanel implements MouseListener, protected AlignmentPanel alignPanel; ScrollThread scrollThread = null; + String linkImageURL; - + int offy; // int width; @@ -56,9 +56,9 @@ public class IdPanel extends JPanel implements MouseListener, * Creates a new IdPanel object. * * @param av - * DOCUMENT ME! + * DOCUMENT ME! * @param parent - * DOCUMENT ME! + * DOCUMENT ME! */ public IdPanel(AlignViewport av, AlignmentPanel parent) { @@ -78,11 +78,12 @@ public class IdPanel extends JPanel implements MouseListener, * DOCUMENT ME! * * @param e - * DOCUMENT ME! + * DOCUMENT ME! */ public void mouseMoved(MouseEvent e) { - int seq = Math.max(0, alignPanel.seqPanel.findSeq(e)); + SeqPanel sp = alignPanel.seqPanel; + int seq = Math.max(0, sp.findSeq(e)); String tmp; if (seq > -1 && seq < av.alignment.getHeight()) { @@ -122,8 +123,9 @@ public class IdPanel extends JPanel implements MouseListener, { int sz = -tip.length(); tfeat[0] = features[i]; - SeqPanel.appendFeatures(tip, linkImageURL, 0, tfeat); - sz+=tip.length(); + sp.appendFeatures(tip, linkImageURL, 0, tfeat, + sp.seqCanvas.fr.minmax); + sz += tip.length(); maxWidth = Math.max(maxWidth, sz); } } @@ -137,7 +139,7 @@ public class IdPanel extends JPanel implements MouseListener, tip.append(""); - setToolTipText("" + sequence.getDisplayId(true) + setToolTipText("" + sequence.getDisplayId(true) + " " + tip.toString()); } } @@ -146,7 +148,7 @@ public class IdPanel extends JPanel implements MouseListener, * DOCUMENT ME! * * @param e - * DOCUMENT ME! + * DOCUMENT ME! */ public void mouseDragged(MouseEvent e) { @@ -184,7 +186,7 @@ public class IdPanel extends JPanel implements MouseListener, * DOCUMENT ME! * * @param e - * DOCUMENT ME! + * DOCUMENT ME! */ public void mouseClicked(MouseEvent e) { @@ -256,7 +258,7 @@ public class IdPanel extends JPanel implements MouseListener, * DOCUMENT ME! * * @param e - * DOCUMENT ME! + * DOCUMENT ME! */ public void mouseEntered(MouseEvent e) { @@ -270,7 +272,7 @@ public class IdPanel extends JPanel implements MouseListener, * DOCUMENT ME! * * @param e - * DOCUMENT ME! + * DOCUMENT ME! */ public void mouseExited(MouseEvent e) { @@ -295,7 +297,7 @@ public class IdPanel extends JPanel implements MouseListener, * DOCUMENT ME! * * @param e - * DOCUMENT ME! + * DOCUMENT ME! */ public void mousePressed(MouseEvent e) { @@ -308,28 +310,27 @@ public class IdPanel extends JPanel implements MouseListener, if (javax.swing.SwingUtilities.isRightMouseButton(e)) { - Sequence sq = (Sequence) av - .getAlignment().getSequenceAt(seq); - // build a new links menu based on the current links + any non-positional features + Sequence sq = (Sequence) av.getAlignment().getSequenceAt(seq); + // build a new links menu based on the current links + any non-positional + // features Vector nlinks = new Vector(Preferences.sequenceURLLinks); - SequenceFeature sf[] = sq.getDatasetSequence().getSequenceFeatures(); - for (int sl=0;sf!=null && sl0) + if (sf[sl].links != null && sf[sl].links.size() > 0) { - for (int l=0, lSize=sf[sl].links.size(); l