X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationLabels.java;h=2517a9f99aca8b0fab5ec2a69218356310eb4e49;hb=943e92b0135861f6d400e10f12de8251222a9952;hp=f92d67febe4d44e7c3b1c03fd0747e37c0a18a82;hpb=69bab27e77ceaca6d12e0de49f8fc62e01678f53;p=jalview.git diff --git a/src/jalview/gui/AnnotationLabels.java b/src/jalview/gui/AnnotationLabels.java index f92d67f..2517a9f 100755 --- a/src/jalview/gui/AnnotationLabels.java +++ b/src/jalview/gui/AnnotationLabels.java @@ -20,24 +20,28 @@ */ package jalview.gui; +import jalview.analysis.AlignSeq; import jalview.analysis.AlignmentUtils; import jalview.datamodel.Alignment; import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.Annotation; +import jalview.datamodel.HiddenColumns; import jalview.datamodel.Sequence; import jalview.datamodel.SequenceGroup; import jalview.datamodel.SequenceI; +import jalview.io.FileFormat; import jalview.io.FormatAdapter; +import jalview.util.Comparison; import jalview.util.MessageManager; +import jalview.util.Platform; import java.awt.Color; +import java.awt.Cursor; import java.awt.Dimension; import java.awt.Font; import java.awt.FontMetrics; import java.awt.Graphics; import java.awt.Graphics2D; -import java.awt.Image; -import java.awt.MediaTracker; import java.awt.RenderingHints; import java.awt.Toolkit; import java.awt.datatransfer.StringSelection; @@ -47,12 +51,9 @@ import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; import java.awt.geom.AffineTransform; -import java.awt.image.BufferedImage; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.List; -import java.util.regex.Pattern; +import java.util.Iterator; import javax.swing.JCheckBoxMenuItem; import javax.swing.JMenuItem; @@ -62,63 +63,75 @@ import javax.swing.SwingUtilities; import javax.swing.ToolTipManager; /** - * DOCUMENT ME! - * - * @author $author$ - * @version $Revision$ + * The panel that holds the labels for alignment annotations, providing + * tooltips, context menus, drag to reorder rows, and drag to adjust panel + * height */ -public class AnnotationLabels extends JPanel implements MouseListener, - MouseMotionListener, ActionListener +public class AnnotationLabels extends JPanel + implements MouseListener, MouseMotionListener, ActionListener { - private static final Pattern LEFT_ANGLE_BRACKET_PATTERN = Pattern - .compile("<"); + private static final String HTML_END_TAG = ""; + + private static final String HTML_START_TAG = ""; + + /** + * width in pixels within which height adjuster arrows are shown and active + */ + private static final int HEIGHT_ADJUSTER_WIDTH = 50; + + /** + * height in pixels for allowing height adjuster to be active + */ + private static int HEIGHT_ADJUSTER_HEIGHT = 10; - String TOGGLE_LABELSCALE = MessageManager + private static final Font font = new Font("Arial", Font.PLAIN, 11); + + private static final String TOGGLE_LABELSCALE = MessageManager .getString("label.scale_label_to_column"); - String ADDNEW = MessageManager.getString("label.add_new_row"); + private static final String ADDNEW = MessageManager + .getString("label.add_new_row"); - String EDITNAME = MessageManager + private static final String EDITNAME = MessageManager .getString("label.edit_label_description"); - String HIDE = MessageManager.getString("label.hide_row"); + private static final String HIDE = MessageManager + .getString("label.hide_row"); - String DELETE = MessageManager.getString("label.delete_row"); + private static final String DELETE = MessageManager + .getString("label.delete_row"); - String SHOWALL = MessageManager.getString("label.show_all_hidden_rows"); + private static final String SHOWALL = MessageManager + .getString("label.show_all_hidden_rows"); - String OUTPUT_TEXT = MessageManager.getString("label.export_annotation"); + private static final String OUTPUT_TEXT = MessageManager + .getString("label.export_annotation"); - String COPYCONS_SEQ = MessageManager + private static final String COPYCONS_SEQ = MessageManager .getString("label.copy_consensus_sequence"); - boolean resizePanel = false; - - Image image; + private final boolean debugRedraw = false; - AlignmentPanel ap; + private AlignmentPanel ap; AlignViewport av; - boolean resizing = false; - - MouseEvent dragEvent; + private MouseEvent dragEvent; - int oldY; + private int oldY; - int selectedRow; + private int selectedRow; private int scrollOffset = 0; - Font font = new Font("Arial", Font.PLAIN, 11); - private boolean hasHiddenRows; + private boolean resizePanel = false; + /** - * Creates a new AnnotationLabels object. + * Creates a new AnnotationLabels object * * @param ap - * DOCUMENT ME! */ public AnnotationLabels(AlignmentPanel ap) { @@ -126,30 +139,6 @@ public class AnnotationLabels extends JPanel implements MouseListener, av = ap.av; ToolTipManager.sharedInstance().registerComponent(this); - java.net.URL url = getClass().getResource("/images/idwidth.gif"); - Image temp = null; - - if (url != null) - { - temp = java.awt.Toolkit.getDefaultToolkit().createImage(url); - } - - try - { - MediaTracker mt = new MediaTracker(this); - mt.addImage(temp, 0); - mt.waitForID(0); - } catch (Exception ex) - { - } - - 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); - image = bi; - addMouseListener(this); addMouseMotionListener(this); addMouseWheelListener(ap.getAnnotationPanel()); @@ -219,6 +208,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, AlignmentAnnotation[] aa = ap.av.getAlignment() .getAlignmentAnnotation(); + boolean fullRepaint = false; if (evt.getActionCommand().equals(ADDNEW)) { AlignmentAnnotation newAnnotation = new AlignmentAnnotation(null, @@ -231,11 +221,16 @@ public class AnnotationLabels extends JPanel implements MouseListener, ap.av.getAlignment().addAnnotation(newAnnotation); ap.av.getAlignment().setAnnotationIndex(newAnnotation, 0); + fullRepaint = true; } else if (evt.getActionCommand().equals(EDITNAME)) { + String name = aa[selectedRow].label; editLabelDescription(aa[selectedRow]); - repaint(); + if (!name.equalsIgnoreCase(aa[selectedRow].label)) + { + fullRepaint = true; + } } else if (evt.getActionCommand().equals(HIDE)) { @@ -244,6 +239,8 @@ public class AnnotationLabels extends JPanel implements MouseListener, else if (evt.getActionCommand().equals(DELETE)) { ap.av.getAlignment().deleteAnnotation(aa[selectedRow]); + ap.av.getCalcManager().removeWorkerForAnnotation(aa[selectedRow]); + fullRepaint = true; } else if (evt.getActionCommand().equals(SHOWALL)) { @@ -254,11 +251,11 @@ public class AnnotationLabels extends JPanel implements MouseListener, aa[i].visible = true; } } + fullRepaint = true; } else if (evt.getActionCommand().equals(OUTPUT_TEXT)) { - new AnnotationExporter().exportAnnotations(ap, - new AlignmentAnnotation[] { aa[selectedRow] }); + new AnnotationExporter(ap).exportAnnotation(aa[selectedRow]); } else if (evt.getActionCommand().equals(COPYCONS_SEQ)) { @@ -282,21 +279,11 @@ public class AnnotationLabels extends JPanel implements MouseListener, aa[selectedRow].scaleColLabel = !aa[selectedRow].scaleColLabel; } - refresh(); + ap.refresh(fullRepaint); } /** - * Redraw sensibly. - */ - protected void refresh() - { - ap.validateAnnotationDimensions(false); - ap.addNotify(); - ap.repaint(); - } - - /** * DOCUMENT ME! * * @param e @@ -304,6 +291,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, */ boolean editLabelDescription(AlignmentAnnotation annotation) { + // TODO i18n EditNameDialog dialog = new EditNameDialog(annotation.label, annotation.description, " Annotation Name ", "Annotation Description ", "Edit Annotation Name/Description", @@ -326,301 +314,27 @@ public class AnnotationLabels extends JPanel implements MouseListener, return true; } - /** - * DOCUMENT ME! - * - * @param evt - * DOCUMENT ME! - */ @Override public void mousePressed(MouseEvent evt) { getSelectedRow(evt.getY() - getScrollOffset()); oldY = evt.getY(); - } - - /** - * DOCUMENT ME! - * - * @param evt - * DOCUMENT ME! - */ - @Override - public void mouseReleased(MouseEvent evt) - { - int start = selectedRow; - getSelectedRow(evt.getY() - getScrollOffset()); - int end = selectedRow; - - if (start != end) - { - // Swap these annotations - AlignmentAnnotation startAA = ap.av.getAlignment() - .getAlignmentAnnotation()[start]; - if (end == -1) - { - end = ap.av.getAlignment().getAlignmentAnnotation().length - 1; - } - AlignmentAnnotation endAA = ap.av.getAlignment() - .getAlignmentAnnotation()[end]; - - ap.av.getAlignment().getAlignmentAnnotation()[end] = startAA; - ap.av.getAlignment().getAlignmentAnnotation()[start] = endAA; - } - - resizePanel = false; - dragEvent = null; - repaint(); - ap.getAnnotationPanel().repaint(); - } - - /** - * DOCUMENT ME! - * - * @param evt - * DOCUMENT ME! - */ - @Override - public void mouseEntered(MouseEvent evt) - { - if (evt.getY() < 10) + if (evt.isPopupTrigger()) { - resizePanel = true; - repaint(); + showPopupMenu(evt); } } /** - * DOCUMENT ME! + * Build and show the Pop-up menu at the right-click mouse position * * @param evt - * DOCUMENT ME! */ - @Override - public void mouseExited(MouseEvent evt) - { - if (dragEvent == null) - { - resizePanel = false; - repaint(); - } - } - - /** - * DOCUMENT ME! - * - * @param evt - * DOCUMENT ME! - */ - @Override - public void mouseDragged(MouseEvent evt) - { - dragEvent = evt; - - if (resizePanel) - { - Dimension d = ap.annotationScroller.getPreferredSize(); - int dif = evt.getY() - oldY; - - dif /= ap.av.getCharHeight(); - dif *= ap.av.getCharHeight(); - - if ((d.height - dif) > 20) - { - ap.annotationScroller.setPreferredSize(new Dimension(d.width, - d.height - dif)); - d = ap.annotationSpaceFillerHolder.getPreferredSize(); - ap.annotationSpaceFillerHolder.setPreferredSize(new Dimension( - d.width, d.height - dif)); - ap.paintAlignment(true); - } - - ap.addNotify(); - } - else - { - repaint(); - } - } - - /** - * DOCUMENT ME! - * - * @param evt - * DOCUMENT ME! - */ - @Override - public void mouseMoved(MouseEvent evt) - { - resizePanel = evt.getY() < 10; - - getSelectedRow(evt.getY() - getScrollOffset()); - - if (selectedRow > -1 - && ap.av.getAlignment().getAlignmentAnnotation().length > selectedRow) - { - AlignmentAnnotation aa = ap.av.getAlignment() - .getAlignmentAnnotation()[selectedRow]; - - StringBuffer desc = new StringBuffer(); - if (aa.description != null - && !aa.description.equals("New description")) - { - // 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("") < 0)) - { - // clean the description ready for embedding in html - desc = new StringBuffer(LEFT_ANGLE_BRACKET_PATTERN.matcher(desc) - .replaceAll("<")); - desc.insert(0, ""); - } - else - { - // remove terminating html if any - int i = desc.substring(desc.length() - 7).toLowerCase() - .lastIndexOf(""); - if (i > -1) - { - desc.setLength(desc.length() - 7 + i); - } - } - if (aa.hasScore()) - { - desc.append("
"); - } - // if (aa.hasProperties()) - // { - // desc.append(""); - // for (String prop : aa.getProperties()) - // { - // desc.append(""); - // } - // desc.append("
" + prop + "" - // + aa.getProperty(prop) + "
"); - // } - } - else - { - // begin the tooltip's html fragment - desc.append(""); - if (aa.hasScore()) - { - // 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) - { - desc.append(""); - this.setToolTipText(desc.toString()); - } - else - { - this.setToolTipText(null); - } - } - } - - /** - * DOCUMENT ME! - * - * @param evt - * DOCUMENT ME! - */ - @Override - public void mouseClicked(MouseEvent evt) + void showPopupMenu(MouseEvent evt) { + evt.consume(); final AlignmentAnnotation[] aa = ap.av.getAlignment() .getAlignmentAnnotation(); - if (SwingUtilities.isLeftMouseButton(evt)) - { - if (selectedRow > -1 && selectedRow < aa.length) - { - if (aa[selectedRow].groupRef != null) - { - if (evt.getClickCount() >= 2) - { - // todo: make the ap scroll to the selection - not necessary, first - // click highlights/scrolls, second selects - ap.getSeqPanel().ap.getIdPanel().highlightSearchResults(null); - ap.av.setSelectionGroup(// new SequenceGroup( - aa[selectedRow].groupRef); // ); - ap.paintAlignment(false); - PaintRefresher.Refresh(ap, ap.av.getSequenceSetId()); - ap.av.sendSelection(); - } - else - { - ap.getSeqPanel().ap.getIdPanel().highlightSearchResults( - aa[selectedRow].groupRef.getSequences(null)); - } - return; - } - else if (aa[selectedRow].sequenceRef != null) - { - if (evt.getClickCount() == 1) - { - ap.getSeqPanel().ap - .getIdPanel() - .highlightSearchResults( - Arrays.asList(new SequenceI[] { aa[selectedRow].sequenceRef })); - } - else if (evt.getClickCount() >= 2) - { - ap.getSeqPanel().ap.getIdPanel().highlightSearchResults(null); - SequenceGroup sg = ap.av.getSelectionGroup(); - if (sg != null) - { - // we make a copy rather than edit the current selection if no - // modifiers pressed - // see Enhancement JAL-1557 - if (!(evt.isControlDown() || evt.isShiftDown())) - { - sg = new SequenceGroup(sg); - sg.clear(); - sg.addSequence(aa[selectedRow].sequenceRef, false); - } - else - { - if (evt.isControlDown()) - { - sg.addOrRemove(aa[selectedRow].sequenceRef, true); - } - else - { - // notionally, we should also add intermediate sequences from - // last added sequence ? - sg.addSequence(aa[selectedRow].sequenceRef, true); - } - } - } - else - { - sg = new SequenceGroup(); - sg.setStartRes(0); - sg.setEndRes(ap.av.getAlignment().getWidth() - 1); - sg.addSequence(aa[selectedRow].sequenceRef, false); - } - ap.av.setSelectionGroup(sg); - ap.av.sendSelection(); - ap.paintAlignment(false); - PaintRefresher.Refresh(ap, ap.av.getSequenceSetId()); - } - - } - } - } - if (!evt.isPopupTrigger()) - { - return; - } JPopupMenu pop = new JPopupMenu( MessageManager.getString("label.annotations")); @@ -671,7 +385,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, // ann.visible = false; // } // } - refresh(); + ap.refresh(true); } }); pop.add(hideType); @@ -713,9 +427,9 @@ public class AnnotationLabels extends JPanel implements MouseListener, // av and sequencegroup need to implement same interface for final JCheckBoxMenuItem cbmi = new JCheckBoxMenuItem( MessageManager.getString("label.ignore_gaps_consensus"), - (aa[selectedRow].groupRef != null) ? aa[selectedRow].groupRef - .getIgnoreGapsConsensus() : ap.av - .isIgnoreGapsConsensus()); + (aa[selectedRow].groupRef != null) + ? aa[selectedRow].groupRef.getIgnoreGapsConsensus() + : ap.av.isIgnoreGapsConsensus()); final AlignmentAnnotation aaa = aa[selectedRow]; cbmi.addActionListener(new ActionListener() { @@ -726,13 +440,14 @@ public class AnnotationLabels extends JPanel implements MouseListener, { // TODO: pass on reference to ap so the view can be updated. aaa.groupRef.setIgnoreGapsConsensus(cbmi.getState()); - ap.getAnnotationPanel().paint( - ap.getAnnotationPanel().getGraphics()); + ap.getAnnotationPanel() + .paint(ap.getAnnotationPanel().getGraphics()); } else { ap.av.setIgnoreGapsConsensus(cbmi.getState(), ap); } + ap.alignmentChanged(); } }); pop.add(cbmi); @@ -879,6 +594,324 @@ public class AnnotationLabels extends JPanel implements MouseListener, } /** + * Reorders annotation rows after a drag of a label + * + * @param evt + */ + @Override + public void mouseReleased(MouseEvent evt) + { + if (evt.isPopupTrigger()) + { + showPopupMenu(evt); + return; + } + + int start = selectedRow; + getSelectedRow(evt.getY() - getScrollOffset()); + int end = selectedRow; + + /* + * if dragging to resize instead, start == end + */ + if (start != end) + { + // Swap these annotations + AlignmentAnnotation startAA = ap.av.getAlignment() + .getAlignmentAnnotation()[start]; + if (end == -1) + { + end = ap.av.getAlignment().getAlignmentAnnotation().length - 1; + } + AlignmentAnnotation endAA = ap.av.getAlignment() + .getAlignmentAnnotation()[end]; + + ap.av.getAlignment().getAlignmentAnnotation()[end] = startAA; + ap.av.getAlignment().getAlignmentAnnotation()[start] = endAA; + } + + resizePanel = false; + dragEvent = null; + repaint(); + ap.getAnnotationPanel().repaint(); + } + + /** + * Removes the height adjuster image on leaving the panel, unless currently + * dragging it + */ + @Override + public void mouseExited(MouseEvent evt) + { + if (resizePanel && dragEvent == null) + { + resizePanel = false; + repaint(); + } + } + + /** + * A mouse drag may be either an adjustment of the panel height (if flag + * resizePanel is set on), or a reordering of the annotation rows. The former + * is dealt with by this method, the latter in mouseReleased. + * + * @param evt + */ + @Override + public void mouseDragged(MouseEvent evt) + { + dragEvent = evt; + + if (resizePanel) + { + Dimension d = ap.annotationScroller.getPreferredSize(); + int dif = evt.getY() - oldY; + + dif /= ap.av.getCharHeight(); + dif *= ap.av.getCharHeight(); + + if ((d.height - dif) > 20) + { + ap.annotationScroller + .setPreferredSize(new Dimension(d.width, d.height - dif)); + d = ap.annotationSpaceFillerHolder.getPreferredSize(); + ap.annotationSpaceFillerHolder + .setPreferredSize(new Dimension(d.width, d.height - dif)); + ap.paintAlignment(true, false); + } + + ap.addNotify(); + } + else + { + repaint(); + } + } + + /** + * Updates the tooltip as the mouse moves over the labels + * + * @param evt + */ + @Override + public void mouseMoved(MouseEvent evt) + { + showOrHideAdjuster(evt); + + getSelectedRow(evt.getY() - getScrollOffset()); + + if (selectedRow > -1 && ap.av.getAlignment() + .getAlignmentAnnotation().length > selectedRow) + { + AlignmentAnnotation aa = ap.av.getAlignment() + .getAlignmentAnnotation()[selectedRow]; + + String desc = getTooltip(aa); + this.setToolTipText(desc); + } + } + + /** + * Answers a tooltip, formatted as html, containing the annotation description + * (prefixed by associated sequence id if applicable), and the annotation + * (non-positional) score if it has one. Answers null if neither description + * nor score is found. + * + * @param aa + * @return + */ + static String getTooltip(AlignmentAnnotation aa) + { + if (aa == null) + { + return null; + } + StringBuilder tooltip = new StringBuilder(); + if (aa.description != null && !aa.description.equals("New description")) + { + // TODO: we could refactor and merge this code with the code in + // jalview.gui.SeqPanel.mouseMoved(..) that formats sequence feature + // tooltips + String desc = aa.getDescription(true).trim(); + if (!desc.toLowerCase().startsWith(HTML_START_TAG)) + { + tooltip.append(HTML_START_TAG); + desc = desc.replace("<", "<"); + } + else if (desc.toLowerCase().endsWith(HTML_END_TAG)) + { + desc = desc.substring(0, desc.length() - HTML_END_TAG.length()); + } + tooltip.append(desc); + } + else + { + // begin the tooltip's html fragment + tooltip.append(HTML_START_TAG); + } + if (aa.hasScore()) + { + if (tooltip.length() > HTML_START_TAG.length()) + { + tooltip.append("
"); + } + // TODO: limit precision of score to avoid noise from imprecise + // doubles + // (64.7 becomes 64.7+/some tiny value). + tooltip.append(" Score: ").append(String.valueOf(aa.score)); + } + + if (tooltip.length() > HTML_START_TAG.length()) + { + return tooltip.append(HTML_END_TAG).toString(); + } + + /* + * nothing in the tooltip (except "") + */ + return null; + } + + /** + * Shows the height adjuster image if the mouse moves into the top left + * region, or hides it if the mouse leaves the regio + * + * @param evt + */ + protected void showOrHideAdjuster(MouseEvent evt) + { + boolean was = resizePanel; + resizePanel = evt.getY() < HEIGHT_ADJUSTER_HEIGHT && evt.getX() < HEIGHT_ADJUSTER_WIDTH; + + if (resizePanel != was) + { + setCursor(Cursor.getPredefinedCursor( + resizePanel ? Cursor.S_RESIZE_CURSOR + : Cursor.DEFAULT_CURSOR)); + repaint(); + } + } + + @Override + public void mouseClicked(MouseEvent evt) + { + final AlignmentAnnotation[] aa = ap.av.getAlignment() + .getAlignmentAnnotation(); + if (!evt.isPopupTrigger() && SwingUtilities.isLeftMouseButton(evt)) + { + if (selectedRow > -1 && selectedRow < aa.length) + { + if (aa[selectedRow].groupRef != null) + { + if (evt.getClickCount() >= 2) + { + // todo: make the ap scroll to the selection - not necessary, first + // click highlights/scrolls, second selects + ap.getSeqPanel().ap.getIdPanel().highlightSearchResults(null); + // process modifiers + SequenceGroup sg = ap.av.getSelectionGroup(); + if (sg == null || sg == aa[selectedRow].groupRef + || !(Platform.isControlDown(evt) || evt.isShiftDown())) + { + if (Platform.isControlDown(evt) || evt.isShiftDown()) + { + // clone a new selection group from the associated group + ap.av.setSelectionGroup( + new SequenceGroup(aa[selectedRow].groupRef)); + } + else + { + // set selection to the associated group so it can be edited + ap.av.setSelectionGroup(aa[selectedRow].groupRef); + } + } + else + { + // modify current selection with associated group + int remainToAdd = aa[selectedRow].groupRef.getSize(); + for (SequenceI sgs : aa[selectedRow].groupRef.getSequences()) + { + if (jalview.util.Platform.isControlDown(evt)) + { + sg.addOrRemove(sgs, --remainToAdd == 0); + } + else + { + // notionally, we should also add intermediate sequences from + // last added sequence ? + sg.addSequence(sgs, --remainToAdd == 0); + } + } + } + + ap.paintAlignment(false, false); + PaintRefresher.Refresh(ap, ap.av.getSequenceSetId()); + ap.av.sendSelection(); + } + else + { + ap.getSeqPanel().ap.getIdPanel().highlightSearchResults( + aa[selectedRow].groupRef.getSequences(null)); + } + return; + } + else if (aa[selectedRow].sequenceRef != null) + { + if (evt.getClickCount() == 1) + { + ap.getSeqPanel().ap.getIdPanel() + .highlightSearchResults(Arrays.asList(new SequenceI[] + { aa[selectedRow].sequenceRef })); + } + else if (evt.getClickCount() >= 2) + { + ap.getSeqPanel().ap.getIdPanel().highlightSearchResults(null); + SequenceGroup sg = ap.av.getSelectionGroup(); + if (sg != null) + { + // we make a copy rather than edit the current selection if no + // modifiers pressed + // see Enhancement JAL-1557 + if (!(Platform.isControlDown(evt) || evt.isShiftDown())) + { + sg = new SequenceGroup(sg); + sg.clear(); + sg.addSequence(aa[selectedRow].sequenceRef, false); + } + else + { + if (Platform.isControlDown(evt)) + { + sg.addOrRemove(aa[selectedRow].sequenceRef, true); + } + else + { + // notionally, we should also add intermediate sequences from + // last added sequence ? + sg.addSequence(aa[selectedRow].sequenceRef, true); + } + } + } + else + { + sg = new SequenceGroup(); + sg.setStartRes(0); + sg.setEndRes(ap.av.getAlignment().getWidth() - 1); + sg.addSequence(aa[selectedRow].sequenceRef, false); + } + ap.av.setSelectionGroup(sg); + ap.paintAlignment(false, false); + PaintRefresher.Refresh(ap, ap.av.getSequenceSetId()); + ap.av.sendSelection(); + } + + } + } + return; + } + } + + /** * do a single sequence copy to jalview and the system clipboard * * @param sq @@ -892,39 +925,38 @@ public class AnnotationLabels extends JPanel implements MouseListener, if (dseqs[0] == null) { dseqs[0] = new Sequence(sq); - dseqs[0].setSequence(jalview.analysis.AlignSeq.extractGaps( - jalview.util.Comparison.GapChars, sq.getSequenceAsString())); + dseqs[0].setSequence(AlignSeq.extractGaps(Comparison.GapChars, + sq.getSequenceAsString())); sq.setDatasetSequence(dseqs[0]); } Alignment ds = new Alignment(dseqs); if (av.hasHiddenColumns()) { - omitHidden = av.getColumnSelection().getVisibleSequenceStrings(0, - sq.getLength(), seqs); + Iterator it = av.getAlignment().getHiddenColumns() + .getVisContigsIterator(0, sq.getLength(), false); + omitHidden = new String[] { sq.getSequenceStringFromIterator(it) }; } int[] alignmentStartEnd = new int[] { 0, ds.getWidth() - 1 }; - List hiddenCols = av.getColumnSelection().getHiddenColumns(); - if (hiddenCols != null) + if (av.hasHiddenColumns()) { - alignmentStartEnd = av.getAlignment().getVisibleStartAndEndIndex( - hiddenCols); + alignmentStartEnd = av.getAlignment().getHiddenColumns() + .getVisibleStartAndEndIndex(av.getAlignment().getWidth()); } - String output = new FormatAdapter().formatSequences("Fasta", seqs, - omitHidden, alignmentStartEnd); + + String output = new FormatAdapter().formatSequences(FileFormat.Fasta, + seqs, omitHidden, alignmentStartEnd); Toolkit.getDefaultToolkit().getSystemClipboard() .setContents(new StringSelection(output), Desktop.instance); - ArrayList hiddenColumns = null; + HiddenColumns hiddenColumns = null; + if (av.hasHiddenColumns()) { - hiddenColumns = new ArrayList(); - for (int[] region : av.getColumnSelection().getHiddenColumns()) - { - hiddenColumns.add(new int[] { region[0], region[1] }); - } + hiddenColumns = new HiddenColumns( + av.getAlignment().getHiddenColumns()); } Desktop.jalviewClipboard = new Object[] { seqs, ds, // what is the dataset @@ -977,8 +1009,6 @@ public class AnnotationLabels extends JPanel implements MouseListener, drawComponent(g, false, width); } - private final boolean debugRedraw = false; - /** * Draw the full set of annotation Labels for the alignment at the given * cursor @@ -1020,8 +1050,9 @@ public class AnnotationLabels extends JPanel implements MouseListener, int ofontH = fontHeight; int sOffset = 0; int visHeight = 0; - int[] visr = (ap != null && ap.getAnnotationPanel() != null) ? ap - .getAnnotationPanel().getVisibleVRange() : null; + int[] visr = (ap != null && ap.getAnnotationPanel() != null) + ? ap.getAnnotationPanel().getVisibleVRange() + : null; if (clip && visr != null) { sOffset = visr[0]; @@ -1064,8 +1095,8 @@ public class AnnotationLabels extends JPanel implements MouseListener, { if (debugRedraw) { - System.out.println("Scroll offset: " + sOffset - + " after vis: " + i); + System.out.println( + "Scroll offset: " + sOffset + " after vis: " + i); } after = true; } @@ -1103,7 +1134,8 @@ public class AnnotationLabels extends JPanel implements MouseListener, } if (groupSize * (fontHeight + 8) < aa[i].height) { - graphExtras = (aa[i].height - (groupSize * (fontHeight + 8))) / 2; + graphExtras = (aa[i].height - (groupSize * (fontHeight + 8))) + / 2; } else { @@ -1117,11 +1149,12 @@ public class AnnotationLabels extends JPanel implements MouseListener, { fontHeight = -8 + (int) h; s = ((float) fontHeight) / (float) ofontH; - Font f = baseFont.deriveFont(AffineTransform - .getScaleInstance(s, s)); + Font f = baseFont + .deriveFont(AffineTransform.getScaleInstance(s, s)); g.setFont(f); fm = g.getFontMetrics(); - graphExtras = (aa[i].height - (groupSize * (fontHeight + 8))) / 2; + graphExtras = (aa[i].height - (groupSize * (fontHeight + 8))) + / 2; } } if (visible) @@ -1138,8 +1171,8 @@ public class AnnotationLabels extends JPanel implements MouseListener, g.setColor(aa[gg]._linecolour); g.drawLine(x, y - graphExtras + 3, - x + fm.stringWidth(aa[gg].label), y - graphExtras - + 3); + x + fm.stringWidth(aa[gg].label), + y - graphExtras + 3); } g.setColor(Color.black); @@ -1158,11 +1191,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, } } - if (resizePanel) - { - g.drawImage(image, 2, 0 - getScrollOffset(), this); - } - else if (dragEvent != null && aa != null) + if (!resizePanel && dragEvent != null && aa != null) { g.setColor(Color.lightGray); g.drawString(aa[selectedRow].label, dragEvent.getX(), @@ -1181,4 +1210,9 @@ public class AnnotationLabels extends JPanel implements MouseListener, { return scrollOffset; } + + @Override + public void mouseEntered(MouseEvent e) + { + } }