X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FIdPanel.java;h=38912fddc6e9f67e13e51db923fc7a43f628f597;hb=153dd62dc91da13ae732600e6ea55ddbe15eab39;hp=222cf8d5d224812e34249200cb6439da3fe204c3;hpb=1576c6118a09c59098483daa16a94e9cca8de260;p=jalview.git diff --git a/src/jalview/gui/IdPanel.java b/src/jalview/gui/IdPanel.java index 222cf8d..38912fd 100755 --- a/src/jalview/gui/IdPanel.java +++ b/src/jalview/gui/IdPanel.java @@ -1,25 +1,26 @@ /* - * 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; import java.awt.*; import java.awt.event.*; +import java.util.Vector; + import javax.swing.*; import jalview.datamodel.*; @@ -42,6 +43,8 @@ public class IdPanel extends JPanel implements MouseListener, ScrollThread scrollThread = null; + String linkImageURL; + int offy; // int width; @@ -53,15 +56,16 @@ 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) { this.av = av; alignPanel = parent; idCanvas = new IdCanvas(av); + linkImageURL = getClass().getResource("/images/link.gif").toString(); setLayout(new BorderLayout()); add(idCanvas, BorderLayout.CENTER); addMouseListener(this); @@ -74,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()) { @@ -109,16 +114,19 @@ public class IdPanel extends JPanel implements MouseListener, // ADD NON POSITIONAL SEQUENCE INFO SequenceFeature[] features = sequence.getDatasetSequence() .getSequenceFeatures(); + SequenceFeature[] tfeat = new SequenceFeature[1]; if (av.isShowNpFeats() && features != null) { for (int i = 0; i < features.length; i++) { if (features[i].begin == 0 && features[i].end == 0) { - tmp = features[i].featureGroup + " " + features[i].getType() - + " " + features[i].description; - tip.append("
" + tmp); - maxWidth = Math.max(maxWidth, tmp.length()); + int sz = -tip.length(); + tfeat[0] = features[i]; + sp.appendFeatures(tip, linkImageURL, 0, tfeat, + sp.seqCanvas.fr.minmax); + sz += tip.length(); + maxWidth = Math.max(maxWidth, sz); } } } @@ -131,7 +139,7 @@ public class IdPanel extends JPanel implements MouseListener, tip.append(""); - setToolTipText("" + sequence.getDisplayId(true) + setToolTipText("" + sequence.getDisplayId(true) + " " + tip.toString()); } } @@ -140,7 +148,7 @@ public class IdPanel extends JPanel implements MouseListener, * DOCUMENT ME! * * @param e - * DOCUMENT ME! + * DOCUMENT ME! */ public void mouseDragged(MouseEvent e) { @@ -178,7 +186,7 @@ public class IdPanel extends JPanel implements MouseListener, * DOCUMENT ME! * * @param e - * DOCUMENT ME! + * DOCUMENT ME! */ public void mouseClicked(MouseEvent e) { @@ -250,7 +258,7 @@ public class IdPanel extends JPanel implements MouseListener, * DOCUMENT ME! * * @param e - * DOCUMENT ME! + * DOCUMENT ME! */ public void mouseEntered(MouseEvent e) { @@ -264,7 +272,7 @@ public class IdPanel extends JPanel implements MouseListener, * DOCUMENT ME! * * @param e - * DOCUMENT ME! + * DOCUMENT ME! */ public void mouseExited(MouseEvent e) { @@ -289,7 +297,7 @@ public class IdPanel extends JPanel implements MouseListener, * DOCUMENT ME! * * @param e - * DOCUMENT ME! + * DOCUMENT ME! */ public void mousePressed(MouseEvent e) { @@ -302,9 +310,27 @@ public class IdPanel extends JPanel implements MouseListener, if (javax.swing.SwingUtilities.isRightMouseButton(e)) { - jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu(alignPanel, - (Sequence) av.getAlignment().getSequenceAt(seq), - Preferences.sequenceURLLinks); + 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 && sl < sf.length; sl++) + { + if (sf[sl].begin == sf[sl].end && sf[sl].begin == 0) + { + if (sf[sl].links != null && sf[sl].links.size() > 0) + { + for (int l = 0, lSize = sf[sl].links.size(); l < lSize; l++) + { + nlinks.addElement(sf[sl].links.elementAt(l)); + } + } + } + } + + jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu(alignPanel, sq, + nlinks, new Vector(Preferences.getGroupURLLinks())); pop.show(this, e.getX(), e.getY()); return; @@ -327,7 +353,6 @@ public class IdPanel extends JPanel implements MouseListener, { selectSeq(seq); } - alignPanel.paintAlignment(true); } @@ -335,7 +360,7 @@ public class IdPanel extends JPanel implements MouseListener, * DOCUMENT ME! * * @param seq - * DOCUMENT ME! + * DOCUMENT ME! */ void selectSeq(int seq) { @@ -349,9 +374,9 @@ public class IdPanel extends JPanel implements MouseListener, * DOCUMENT ME! * * @param start - * DOCUMENT ME! + * DOCUMENT ME! * @param end - * DOCUMENT ME! + * DOCUMENT ME! */ void selectSeqs(int start, int end) { @@ -386,7 +411,7 @@ public class IdPanel extends JPanel implements MouseListener, * DOCUMENT ME! * * @param e - * DOCUMENT ME! + * DOCUMENT ME! */ public void mouseReleased(MouseEvent e) { @@ -394,6 +419,12 @@ public class IdPanel extends JPanel implements MouseListener, { scrollThread.running = false; } + // if (mouseDragging) + { + // always send selection message when mouse is released + av.sendSelection(); + + } mouseDragging = false; PaintRefresher.Refresh(this, av.getSequenceSetId()); @@ -403,7 +434,7 @@ public class IdPanel extends JPanel implements MouseListener, * DOCUMENT ME! * * @param found - * DOCUMENT ME! + * DOCUMENT ME! */ public void highlightSearchResults(java.util.Vector found) {