/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
* Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
*
* This file is part of Jalview.
package jalview.gui;
import java.util.*;
+import java.util.regex.Pattern;
import java.awt.*;
import java.awt.datatransfer.*;
{
}
- BufferedImage bi = new BufferedImage(temp.getHeight(this), temp
- .getWidth(this), BufferedImage.TYPE_INT_RGB);
+ BufferedImage bi = new BufferedImage(temp.getHeight(this),
+ temp.getWidth(this), BufferedImage.TYPE_INT_RGB);
Graphics2D g = (Graphics2D) bi.getGraphics();
g.rotate(Math.toRadians(90));
g.drawImage(temp, 0, -bi.getWidth(this), this);
else if (evt.getActionCommand().equals(HIDE))
{
aa[selectedRow].visible = false;
-
- if (aa[selectedRow].label.equals("Quality"))
- {
- ap.av.quality = null;
- }
}
else if (evt.getActionCommand().equals(DELETE))
{
aa[selectedRow].scaleColLabel = !aa[selectedRow].scaleColLabel;
}
- ap.annotationPanel.adjustPanelHeight();
- ap.annotationScroller.validate();
- ap.paintAlignment(true);
+ ap.validateAnnotationDimensions(false);
+ ap.addNotify();
+ ap.repaint();
+ //validate();
+ //ap.paintAlignment(true);
}
/**
&& ap.av.alignment.getAlignmentAnnotation().length > selectedRow)
{
AlignmentAnnotation aa = ap.av.alignment.getAlignmentAnnotation()[selectedRow];
-
- StringBuffer desc = new StringBuffer("<html>");
-
+
+ StringBuffer desc = new StringBuffer();
if (aa.description != null
&& !aa.description.equals("New description"))
{
- desc.append(aa.getDescription(true));
- if (aa.hasScore)
- desc.append("<br>");
+ // TODO: we could refactor and merge this code with the code in jalview.gui.SeqPanel.mouseMoved(..) that formats sequence feature tooltips
+ desc.append(aa.getDescription(true).trim());
+ // check to see if the description is an html fragment.
+ if (desc.length()<6 || (desc.substring(0,6).toLowerCase().indexOf("<html>")<0))
+ {
+ // clean the description ready for embedding in html
+ desc = new StringBuffer(Pattern.compile("<").matcher(desc).replaceAll("<"));
+ desc.insert(0, "<html>");
+ } else {
+ // remove terminating html if any
+ int i=desc.substring(desc.length()-7).toLowerCase().lastIndexOf("</html>");
+ if (i>-1) {
+ desc.setLength(desc.length()-7+i);
+ }
+ }
+ if (aa.hasScore())
+ {
+ desc.append("<br/>");
+ }
+
+
+ } else {
+ // begin the tooltip's html fragment
+ desc.append("<html>");
}
if (aa.hasScore())
{
- desc.append("Score: " + aa.score);
+ // TODO: limit precision of score to avoid noise from imprecise doubles (64.7 becomes 64.7+/some tiny value).
+ desc.append(" Score: " + aa.score);
}
- if (desc.length() != 6)
+ if (desc.length() > 6)
{
desc.append("</html>");
this.setToolTipText(desc.toString());
{
if (evt.getClickCount() >= 2)
{
- // todo: make the ap scroll to the selection
+ // todo: make the ap scroll to the selection - not necessary, first click highlights/scrolls, second selects
ap.seqPanel.ap.idPanel.highlightSearchResults(null);
ap.av.setSelectionGroup(// new SequenceGroup(
- aa[selectedRow].groupRef); // );
- ap.av.sendSelection();
+ aa[selectedRow].groupRef); // );
ap.paintAlignment(false);
PaintRefresher.Refresh(ap, ap.av.getSequenceSetId());
+ ap.av.sendSelection();
}
else
{
final JCheckBoxMenuItem cbmi = new JCheckBoxMenuItem(
"Ignore Gaps In Consensus",
(aa[selectedRow].groupRef != null) ? aa[selectedRow].groupRef
- .getIgnoreGapsConsensus()
- : ap.av.getIgnoreGapsConsensus());
+ .getIgnoreGapsConsensus() : ap.av
+ .getIgnoreGapsConsensus());
final AlignmentAnnotation aaa = aa[selectedRow];
cbmi.addActionListener(new ActionListener()
{
if (aaa.groupRef != null)
{
final JCheckBoxMenuItem chist = new JCheckBoxMenuItem(
- "Show Group Histogram", aa[selectedRow].groupRef
- .isShowConsensusHistogram());
+ "Show Group Histogram",
+ aa[selectedRow].groupRef.isShowConsensusHistogram());
chist.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
});
pop.add(chist);
final JCheckBoxMenuItem cprofl = new JCheckBoxMenuItem(
- "Show Group Logo", aa[selectedRow].groupRef
- .isShowSequenceLogo());
+ "Show Group Logo",
+ aa[selectedRow].groupRef.isShowSequenceLogo());
cprofl.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
String output = new FormatAdapter().formatSequences("Fasta", seqs,
omitHidden);
- Toolkit.getDefaultToolkit().getSystemClipboard().setContents(
- new StringSelection(output), Desktop.instance);
+ Toolkit.getDefaultToolkit().getSystemClipboard()
+ .setContents(new StringSelection(output), Desktop.instance);
Vector hiddenColumns = null;
if (av.hasHiddenColumns)
g.setColor(aa[gg].annotations[0].colour);
}
- g.drawLine(x, y - graphExtras - 3, x
- + fm.stringWidth(aa[gg].label), y - graphExtras - 3);
+ g.drawLine(x, y - graphExtras - 3,
+ x + fm.stringWidth(aa[gg].label), y - graphExtras - 3);
g.setColor(Color.black);
graphExtras += fontHeight + 8;
else if (dragEvent != null && aa != null)
{
g.setColor(Color.lightGray);
- g.drawString(aa[selectedRow].label, dragEvent.getX(), dragEvent
- .getY()
- - scrollOffset);
+ g.drawString(aa[selectedRow].label, dragEvent.getX(),
+ dragEvent.getY() - scrollOffset);
}
if ((aa == null) || (aa.length < 1))