X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FIdPanel.java;h=ea8b711b02f4679a018a3854606c3dc992d7e050;hb=5e34c2ccda1cf0d409618a564804408350c932d0;hp=a325618e324fc24a90f56fe31756d553a78bcc39;hpb=21f3e784749a8eb93cd716fca379d50732f08827;p=jalview.git
diff --git a/src/jalview/gui/IdPanel.java b/src/jalview/gui/IdPanel.java
index a325618..ea8b711 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.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;
@@ -44,6 +43,8 @@ public class IdPanel extends JPanel implements MouseListener,
ScrollThread scrollThread = null;
+ String linkImageURL;
+
int offy;
// int width;
@@ -55,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);
@@ -76,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())
{
@@ -111,25 +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)
{
- tip.append("
");
int sz = -tip.length();
- boolean nl=false;
- if (features[i].getFeatureGroup()!=null) { tip.append(features[i].getFeatureGroup()); nl=true;};
- if (features[i].getType()!=null) { tip.append(" "); tip.append(features[i].getType()); nl=true;};
- if (features[i].getDescription()!=null) { tip.append(" "); tip.append(features[i].getDescription()); nl=true;};
- if (features[i].getScore()!=Float.NaN && features[i].getScore()!=0f) { tip.append(" Score = "); tip.append(features[i].getScore()); nl=true;};
- if (features[i].getStatus()!=null && features[i].getStatus().length()>0) { tip.append(" ("); tip.append(features[i].getStatus()); tip.append(")");nl=true;};
- if (nl) {
- sz+=tip.length();
- tip.append("
");
- maxWidth = Math.max(maxWidth, sz);
- }
+ tfeat[0] = features[i];
+ sp.appendFeatures(tip, linkImageURL, 0, tfeat,
+ sp.seqCanvas.fr.minmax);
+ sz += tip.length();
+ maxWidth = Math.max(maxWidth, sz);
}
}
}
@@ -142,7 +139,7 @@ public class IdPanel extends JPanel implements MouseListener,
tip.append("