X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FIdPanel.java;h=3b9d385d39007231b7cb9619d06ccf9262f1f35c;hb=3eef76298c55f3def21eed2516b5ace4405bed0a;hp=0480ffa6c6314f136df9fc37f5892c7442b32c22;hpb=d10415f14ea6e2cbeba5d698e6162558d77281b1;p=jalview.git diff --git a/src/jalview/gui/IdPanel.java b/src/jalview/gui/IdPanel.java index 0480ffa..3b9d385 100755 --- a/src/jalview/gui/IdPanel.java +++ b/src/jalview/gui/IdPanel.java @@ -25,6 +25,7 @@ import java.util.Vector; import javax.swing.*; import jalview.datamodel.*; +import jalview.io.SequenceAnnotationReport; import jalview.util.UrlLink; /** @@ -52,6 +53,7 @@ public class IdPanel extends JPanel implements MouseListener, int lastid = -1; boolean mouseDragging = false; + private final SequenceAnnotationReport seqAnnotReport; /** * Creates a new IdPanel object. @@ -67,6 +69,7 @@ public class IdPanel extends JPanel implements MouseListener, alignPanel = parent; idCanvas = new IdCanvas(av); linkImageURL = getClass().getResource("/images/link.gif").toString(); + seqAnnotReport = new SequenceAnnotationReport(linkImageURL); setLayout(new BorderLayout()); add(idCanvas, BorderLayout.CENTER); addMouseListener(this); @@ -74,7 +77,6 @@ public class IdPanel extends JPanel implements MouseListener, addMouseWheelListener(this); ToolTipManager.sharedInstance().registerComponent(this); } - /** * DOCUMENT ME! * @@ -86,63 +88,15 @@ public class IdPanel extends JPanel implements MouseListener, { SeqPanel sp = alignPanel.seqPanel; int seq = Math.max(0, sp.findSeq(e)); - String tmp; if (seq > -1 && seq < av.getAlignment().getHeight()) { SequenceI sequence = av.getAlignment().getSequenceAt(seq); StringBuffer tip = new StringBuffer(); - tip.append(""); - - int maxWidth = 0; - if (sequence.getDescription() != null) - { - tmp = sequence.getDescription(); - tip.append("
" + tmp); - maxWidth = Math.max(maxWidth, tmp.length()); - } - - DBRefEntry[] dbrefs = sequence.getDatasetSequence().getDBRef(); - if (av.isShowDbRefs() && dbrefs != null) - { - for (int i = 0; i < dbrefs.length; i++) - { - tip.append("
"); - tmp = dbrefs[i].getSource() + " " + dbrefs[i].getAccessionId(); - tip.append(tmp); - maxWidth = Math.max(maxWidth, tmp.length()); - } - } - - // 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) - { - 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); - } - } - } - - if (maxWidth > 60) - { - tip.insert(0, "
"); - tip.append("
"); - } - - tip.append(""); - + seqAnnotReport.createSequenceAnnotationReport(tip, sequence, + av.isShowDbRefs(), av.isShowNpFeats(), + sp.seqCanvas.fr.minmax); setToolTipText("" + sequence.getDisplayId(true) + " " - + tip.toString()); + + tip.toString()+""); } }