X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationLabels.java;h=9c1db3d39cd21fe5dc38e98bf9059b46afd85516;hb=ab43013b7e357b84b4abade0dba949668dfb2a0e;hp=bd46613380d4962af60dd9e75199fed036931fcb;hpb=5dc1f2c2e2827d06041127686c9f33ed1c06a31d;p=jalview.git diff --git a/src/jalview/gui/AnnotationLabels.java b/src/jalview/gui/AnnotationLabels.java index bd46613..9c1db3d 100755 --- a/src/jalview/gui/AnnotationLabels.java +++ b/src/jalview/gui/AnnotationLabels.java @@ -1,32 +1,62 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5) - * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1) + * Copyright (C) 2014 The Jalview Authors * * This file is part of Jalview. * * 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. - * + * as published by the Free Software Foundation, either version 3 + * of the License, or (at your option) any later version. + * * 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 . + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.gui; -import java.util.*; - -import java.awt.*; -import java.awt.datatransfer.*; -import java.awt.event.*; -import java.awt.image.*; -import javax.swing.*; - -import jalview.datamodel.*; -import jalview.io.*; +import jalview.datamodel.Alignment; +import jalview.datamodel.AlignmentAnnotation; +import jalview.datamodel.Annotation; +import jalview.datamodel.Sequence; +import jalview.datamodel.SequenceGroup; +import jalview.datamodel.SequenceI; +import jalview.io.FormatAdapter; +import jalview.util.MessageManager; + +import java.awt.Color; +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; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +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.Arrays; +import java.util.Vector; +import java.util.regex.Pattern; + +import javax.swing.JCheckBoxMenuItem; +import javax.swing.JMenuItem; +import javax.swing.JPanel; +import javax.swing.JPopupMenu; +import javax.swing.SwingUtilities; +import javax.swing.ToolTipManager; /** * DOCUMENT ME! @@ -37,21 +67,21 @@ import jalview.io.*; public class AnnotationLabels extends JPanel implements MouseListener, MouseMotionListener, ActionListener { - static String TOGGLE_LABELSCALE = "Scale Label to Column"; + String TOGGLE_LABELSCALE = MessageManager.getString("label.scale_label_to_column"); - static String ADDNEW = "Add New Row"; + String ADDNEW = MessageManager.getString("label.add_new_row"); - static String EDITNAME = "Edit Label/Description"; + String EDITNAME = MessageManager.getString("label.edit_label_description"); - static String HIDE = "Hide This Row"; + String HIDE = MessageManager.getString("label.hide_row"); - static String DELETE = "Delete This Row"; + String DELETE = MessageManager.getString("label.delete_row"); - static String SHOWALL = "Show All Hidden Rows"; + String SHOWALL = MessageManager.getString("label.show_all_hidden_rows"); - static String OUTPUT_TEXT = "Export Annotation"; + String OUTPUT_TEXT = MessageManager.getString("label.export_annotation"); - static String COPYCONS_SEQ = "Copy Consensus Sequence"; + String COPYCONS_SEQ = MessageManager.getString("label.copy_consensus_sequence"); boolean resizePanel = false; @@ -73,6 +103,8 @@ public class AnnotationLabels extends JPanel implements MouseListener, Font font = new Font("Arial", Font.PLAIN, 11); + private boolean hasHiddenRows; + /** * Creates a new AnnotationLabels object. * @@ -102,15 +134,16 @@ public class AnnotationLabels extends JPanel implements MouseListener, { } - 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); - image = (Image) bi; + image = bi; addMouseListener(this); addMouseMotionListener(this); + addMouseWheelListener(ap.annotationPanel); } public AnnotationLabels(AlignViewport av) @@ -130,15 +163,24 @@ public class AnnotationLabels extends JPanel implements MouseListener, repaint(); } + /** + * sets selectedRow to -2 if no annotation preset, -1 if no visible row is at + * y + * + * @param y + * coordinate position to search for a row + */ void getSelectedRow(int y) { int height = 0; - AlignmentAnnotation[] aa = ap.av.alignment.getAlignmentAnnotation(); - + AlignmentAnnotation[] aa = ap.av.getAlignment() + .getAlignmentAnnotation(); + selectedRow = -2; if (aa != null) { for (int i = 0; i < aa.length; i++) { + selectedRow = -1; if (!aa[i].visible) { continue; @@ -153,8 +195,6 @@ public class AnnotationLabels extends JPanel implements MouseListener, break; } } - } else { - selectedRow = -1; } } @@ -166,20 +206,21 @@ public class AnnotationLabels extends JPanel implements MouseListener, */ public void actionPerformed(ActionEvent evt) { - AlignmentAnnotation[] aa = ap.av.alignment.getAlignmentAnnotation(); + AlignmentAnnotation[] aa = ap.av.getAlignment() + .getAlignmentAnnotation(); if (evt.getActionCommand().equals(ADDNEW)) { AlignmentAnnotation newAnnotation = new AlignmentAnnotation(null, - null, new Annotation[ap.av.alignment.getWidth()]); + null, new Annotation[ap.av.getAlignment().getWidth()]); if (!editLabelDescription(newAnnotation)) { return; } - ap.av.alignment.addAnnotation(newAnnotation); - ap.av.alignment.setAnnotationIndex(newAnnotation, 0); + ap.av.getAlignment().addAnnotation(newAnnotation); + ap.av.getAlignment().setAnnotationIndex(newAnnotation, 0); } else if (evt.getActionCommand().equals(EDITNAME)) { @@ -189,15 +230,10 @@ public class AnnotationLabels extends JPanel implements MouseListener, 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)) { - ap.av.alignment.deleteAnnotation(aa[selectedRow]); + ap.av.getAlignment().deleteAnnotation(aa[selectedRow]); } else if (evt.getActionCommand().equals(SHOWALL)) { @@ -237,9 +273,18 @@ public class AnnotationLabels extends JPanel implements MouseListener, aa[selectedRow].scaleColLabel = !aa[selectedRow].scaleColLabel; } - ap.annotationPanel.adjustPanelHeight(); - ap.annotationScroller.validate(); - ap.paintAlignment(true); + refresh(); + + } + + /** + * Redraw sensibly. + */ + protected void refresh() + { + ap.validateAnnotationDimensions(false); + ap.addNotify(); + ap.repaint(); } /** @@ -252,7 +297,8 @@ public class AnnotationLabels extends JPanel implements MouseListener, { EditNameDialog dialog = new EditNameDialog(annotation.label, annotation.description, " Annotation Name ", - "Annotation Description ", "Edit Annotation Name/Description"); + "Annotation Description ", "Edit Annotation Name/Description", + ap.alignFrame); if (!dialog.accept) { @@ -298,12 +344,17 @@ public class AnnotationLabels extends JPanel implements MouseListener, if (start != end) { // Swap these annotations - AlignmentAnnotation startAA = ap.av.alignment + AlignmentAnnotation startAA = ap.av.getAlignment() .getAlignmentAnnotation()[start]; - AlignmentAnnotation endAA = ap.av.alignment.getAlignmentAnnotation()[end]; + if (end == -1) + { + end = ap.av.getAlignment().getAlignmentAnnotation().length - 1; + } + AlignmentAnnotation endAA = ap.av.getAlignment() + .getAlignmentAnnotation()[end]; - ap.av.alignment.getAlignmentAnnotation()[end] = startAA; - ap.av.alignment.getAlignmentAnnotation()[start] = endAA; + ap.av.getAlignment().getAlignmentAnnotation()[end] = startAA; + ap.av.getAlignment().getAlignmentAnnotation()[start] = endAA; } resizePanel = false; @@ -391,33 +442,75 @@ public class AnnotationLabels extends JPanel implements MouseListener, getSelectedRow(evt.getY() - scrollOffset); if (selectedRow > -1 - && ap.av.alignment.getAlignmentAnnotation().length > selectedRow) + && ap.av.getAlignment().getAlignmentAnnotation().length > selectedRow) { - AlignmentAnnotation aa = ap.av.alignment.getAlignmentAnnotation()[selectedRow]; - - StringBuffer desc = new StringBuffer(""); + AlignmentAnnotation aa = ap.av.getAlignment() + .getAlignmentAnnotation()[selectedRow]; + StringBuffer desc = new StringBuffer(); if (aa.description != null && !aa.description.equals("New description")) { - desc.append(aa.getDescription(true)); - if (aa.hasScore) - desc.append("
"); + // 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(Pattern.compile("<").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) + "
"); + // } } - if (aa.hasScore()) + else { - desc.append("Score: " + aa.score); + // 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) + if (desc.length() > 6) { desc.append(""); this.setToolTipText(desc.toString()); } else + { this.setToolTipText(null); + } } - } /** @@ -428,20 +521,24 @@ public class AnnotationLabels extends JPanel implements MouseListener, */ public void mouseClicked(MouseEvent evt) { - AlignmentAnnotation[] aa = ap.av.alignment.getAlignmentAnnotation(); + final AlignmentAnnotation[] aa = ap.av.getAlignment() + .getAlignmentAnnotation(); if (SwingUtilities.isLeftMouseButton(evt)) { - if (aa!=null && selectedRow < aa.length) + if (selectedRow > -1 && selectedRow < aa.length) { if (aa[selectedRow].groupRef != null) { 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); // ); + aa[selectedRow].groupRef); // ); ap.paintAlignment(false); + PaintRefresher.Refresh(ap, ap.av.getSequenceSetId()); + ap.av.sendSelection(); } else { @@ -453,18 +550,42 @@ public class AnnotationLabels extends JPanel implements MouseListener, } else if (aa[selectedRow].sequenceRef != null) { - Vector sr = new Vector(); - sr.addElement(aa[selectedRow].sequenceRef); if (evt.getClickCount() == 1) { - ap.seqPanel.ap.idPanel.highlightSearchResults(sr); + ap.seqPanel.ap.idPanel.highlightSearchResults(Arrays + .asList(new SequenceI[] + { aa[selectedRow].sequenceRef })); } else if (evt.getClickCount() >= 2) { ap.seqPanel.ap.idPanel.highlightSearchResults(null); - SequenceGroup sg = new SequenceGroup(); - sg.addSequence(aa[selectedRow].sequenceRef, false); + 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()); } @@ -477,32 +598,66 @@ public class AnnotationLabels extends JPanel implements MouseListener, return; } - JPopupMenu pop = new JPopupMenu("Annotations"); + JPopupMenu pop = new JPopupMenu( + MessageManager.getString("label.annotations")); JMenuItem item = new JMenuItem(ADDNEW); item.addActionListener(this); - - if ((aa == null) || (aa.length == 0)) + pop.add(item); + if (selectedRow < 0) { - item = new JMenuItem(SHOWALL); - item.addActionListener(this); - pop.add(item); + if (hasHiddenRows) + { // let the user make everything visible again + item = new JMenuItem(SHOWALL); + item.addActionListener(this); + pop.add(item); + } pop.show(this, evt.getX(), evt.getY()); return; } - - pop.add(item); item = new JMenuItem(EDITNAME); item.addActionListener(this); pop.add(item); item = new JMenuItem(HIDE); item.addActionListener(this); pop.add(item); + // JAL-1264 hide all sequence-specific annotations of this type + final String label = aa[selectedRow].label; + if (selectedRow < aa.length) + { + if (aa[selectedRow].sequenceRef != null) + { + JMenuItem hideType = new JMenuItem(); + String text = MessageManager.getString("label.hide_all") + " " + label; + hideType.setText(text); + hideType.addActionListener(new ActionListener() + { + @Override + public void actionPerformed(ActionEvent e) + { + for (AlignmentAnnotation ann : ap.av.getAlignment() + .getAlignmentAnnotation()) + { + if (ann.sequenceRef != null && ann.label != null + && ann.label.equals(label)) + { + ann.visible = false; + } + } + refresh(); + } + }); + pop.add(hideType); + } + } item = new JMenuItem(DELETE); item.addActionListener(this); pop.add(item); - item = new JMenuItem(SHOWALL); - item.addActionListener(this); - pop.add(item); + if (hasHiddenRows) + { + item = new JMenuItem(SHOWALL); + item.addActionListener(this); + pop.add(item); + } item = new JMenuItem(OUTPUT_TEXT); item.addActionListener(this); pop.add(item); @@ -523,15 +678,15 @@ public class AnnotationLabels extends JPanel implements MouseListener, pop.add(item); } } - else if (aa[selectedRow].label.indexOf("Consensus") > -1) + else if (label.indexOf("Consensus") > -1) { pop.addSeparator(); // av and sequencegroup need to implement same interface for final JCheckBoxMenuItem cbmi = new JCheckBoxMenuItem( - "Ignore Gaps In Consensus", + MessageManager.getString("label.ignore_gaps_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() { @@ -554,8 +709,8 @@ public class AnnotationLabels extends JPanel implements MouseListener, if (aaa.groupRef != null) { final JCheckBoxMenuItem chist = new JCheckBoxMenuItem( - "Show Group Histogram", aa[selectedRow].groupRef - .isShowConsensusHistogram()); + MessageManager.getString("label.show_group_histogram"), + aa[selectedRow].groupRef.isShowConsensusHistogram()); chist.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -572,10 +727,10 @@ public class AnnotationLabels extends JPanel implements MouseListener, } }); pop.add(chist); - final JCheckBoxMenuItem cprof = new JCheckBoxMenuItem( - "Show Group Logo", aa[selectedRow].groupRef - .isShowSequenceLogo()); - cprof.addActionListener(new ActionListener() + final JCheckBoxMenuItem cprofl = new JCheckBoxMenuItem( + MessageManager.getString("label.show_group_logo"), + aa[selectedRow].groupRef.isShowSequenceLogo()); + cprofl.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -585,17 +740,39 @@ public class AnnotationLabels extends JPanel implements MouseListener, // view // can be // updated. - aaa.groupRef.setIncludeAllConsSymbols(cprof.getState()); + aaa.groupRef.setshowSequenceLogo(cprofl.getState()); ap.repaint(); // ap.annotationPanel.paint(ap.annotationPanel.getGraphics()); } }); - pop.add(cprof); + pop.add(cprofl); + final JCheckBoxMenuItem cproflnorm = new JCheckBoxMenuItem( + MessageManager.getString("label.normalise_group_logo"), + aa[selectedRow].groupRef.isNormaliseSequenceLogo()); + cproflnorm.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + + // TODO: pass on reference + // to ap + // so the + // view + // can be + // updated. + aaa.groupRef.setNormaliseSequenceLogo(cproflnorm.getState()); + // automatically enable logo display if we're clicked + aaa.groupRef.setshowSequenceLogo(true); + ap.repaint(); + // ap.annotationPanel.paint(ap.annotationPanel.getGraphics()); + } + }); + pop.add(cproflnorm); } else { final JCheckBoxMenuItem chist = new JCheckBoxMenuItem( - "Show Histogram", av.isShowConsensusHistogram()); + MessageManager.getString("label.show_histogram"), av.isShowConsensusHistogram()); chist.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -607,13 +784,14 @@ public class AnnotationLabels extends JPanel implements MouseListener, // can be // updated. av.setShowConsensusHistogram(chist.getState()); + ap.alignFrame.setMenusForViewport(); ap.repaint(); // ap.annotationPanel.paint(ap.annotationPanel.getGraphics()); } }); pop.add(chist); final JCheckBoxMenuItem cprof = new JCheckBoxMenuItem( - "Show Logo", av.isShowSequenceLogo()); + MessageManager.getString("label.show_logo"), av.isShowSequenceLogo()); cprof.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -625,11 +803,32 @@ public class AnnotationLabels extends JPanel implements MouseListener, // can be // updated. av.setShowSequenceLogo(cprof.getState()); + ap.alignFrame.setMenusForViewport(); ap.repaint(); // ap.annotationPanel.paint(ap.annotationPanel.getGraphics()); } }); pop.add(cprof); + final JCheckBoxMenuItem cprofnorm = new JCheckBoxMenuItem( + MessageManager.getString("label.normalise_logo"), av.isNormaliseSequenceLogo()); + cprofnorm.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + // TODO: pass on reference + // to ap + // so the + // view + // can be + // updated. + av.setShowSequenceLogo(true); + av.setNormaliseSequenceLogo(cprofnorm.getState()); + ap.alignFrame.setMenusForViewport(); + ap.repaint(); + // ap.annotationPanel.paint(ap.annotationPanel.getGraphics()); + } + }); + pop.add(cprofnorm); } final JMenuItem consclipbrd = new JMenuItem(COPYCONS_SEQ); consclipbrd.addActionListener(this); @@ -661,7 +860,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, sq.setDatasetSequence(dseqs[0]); } Alignment ds = new Alignment(dseqs); - if (av.hasHiddenColumns) + if (av.hasHiddenColumns()) { omitHidden = av.getColumnSelection().getVisibleSequenceStrings(0, sq.getLength(), seqs); @@ -670,11 +869,11 @@ public class AnnotationLabels extends JPanel implements MouseListener, 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) + if (av.hasHiddenColumns()) { hiddenColumns = new Vector(); for (int i = 0; i < av.getColumnSelection().getHiddenColumns().size(); i++) @@ -715,18 +914,41 @@ public class AnnotationLabels extends JPanel implements MouseListener, RenderingHints.VALUE_ANTIALIAS_ON); } - drawComponent(g2, width); + drawComponent(g2, true, width); } /** - * DOCUMENT ME! + * Draw the full set of annotation Labels for the alignment at the given + * cursor * * @param g - * DOCUMENT ME! + * Graphics2D instance (needed for font scaling) + * @param width + * Width for scaling labels + * */ public void drawComponent(Graphics g, int width) { + drawComponent(g, false, width); + } + + private final boolean debugRedraw = false; + + /** + * Draw the full set of annotation Labels for the alignment at the given + * cursor + * + * @param g + * Graphics2D instance (needed for font scaling) + * @param clip + * - true indicates that only current visible area needs to be + * rendered + * @param width + * Width for scaling labels + */ + public void drawComponent(Graphics g, boolean clip, int width) + { if (av.getFont().getSize() < 10) { g.setFont(font); @@ -743,25 +965,71 @@ public class AnnotationLabels extends JPanel implements MouseListener, g.translate(0, scrollOffset); g.setColor(Color.black); - AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation(); + AlignmentAnnotation[] aa = av.getAlignment().getAlignmentAnnotation(); int fontHeight = g.getFont().getSize(); int y = 0; int x = 0; int graphExtras = 0; int offset = 0; - + Font baseFont = g.getFont(); + FontMetrics baseMetrics = fm; + int ofontH = fontHeight; + int sOffset = 0; + int visHeight = 0; + int[] visr = (ap != null && ap.annotationPanel != null) ? ap.annotationPanel + .getVisibleVRange() : null; + if (clip && visr != null) + { + sOffset = visr[0]; + visHeight = visr[1]; + } + boolean visible = true, before = false, after = false; if (aa != null) { + hasHiddenRows = false; + int olY = 0; for (int i = 0; i < aa.length; i++) { - g.setColor(Color.black); - + visible = true; if (!aa[i].visible) { + hasHiddenRows = true; continue; } - + olY = y; y += aa[i].height; + if (clip) + { + if (y < sOffset) + { + if (!before) + { + if (debugRedraw) + { + System.out.println("before vis: " + i); + } + before = true; + } + // don't draw what isn't visible + continue; + } + if (olY > visHeight) + { + + if (!after) + { + if (debugRedraw) + { + System.out.println("Scroll offset: " + sOffset + + " after vis: " + i); + } + after = true; + } + // don't draw what isn't visible + continue; + } + } + g.setColor(Color.black); offset = -aa[i].height / 2; @@ -771,13 +1039,17 @@ public class AnnotationLabels extends JPanel implements MouseListener, offset -= fm.getDescent(); } else + { offset += fm.getDescent(); + } x = width - fm.stringWidth(aa[i].label) - 3; if (aa[i].graphGroup > -1) { int groupSize = 0; + // TODO: JAL-1291 revise rendering model so the graphGroup map is + // computed efficiently for all visible labels for (int gg = 0; gg < aa.length; gg++) { if (aa[gg].graphGroup == aa[i].graphGroup) @@ -785,30 +1057,55 @@ public class AnnotationLabels extends JPanel implements MouseListener, groupSize++; } } - if (groupSize * (fontHeight + 8) < aa[i].height) { graphExtras = (aa[i].height - (groupSize * (fontHeight + 8))) / 2; } - - for (int gg = 0; gg < aa.length; gg++) + else { - if (aa[gg].graphGroup == aa[i].graphGroup) + // scale font to fit + float h = aa[i].height / (float) groupSize, s; + if (h < 9) + { + visible = false; + } + else { - x = width - fm.stringWidth(aa[gg].label) - 3; - g.drawString(aa[gg].label, x, y - graphExtras); - if (aa[gg].annotations[0] != null) + fontHeight = -8 + (int) h; + s = ((float) fontHeight) / (float) ofontH; + Font f = baseFont.deriveFont(AffineTransform + .getScaleInstance(s, s)); + g.setFont(f); + fm = g.getFontMetrics(); + graphExtras = (aa[i].height - (groupSize * (fontHeight + 8))) / 2; + } + } + if (visible) + { + for (int gg = 0; gg < aa.length; gg++) + { + if (aa[gg].graphGroup == aa[i].graphGroup) { - g.setColor(aa[gg].annotations[0].colour); - } + x = width - fm.stringWidth(aa[gg].label) - 3; + g.drawString(aa[gg].label, x, y - graphExtras); - g.drawLine(x, y - graphExtras - 3, x - + fm.stringWidth(aa[gg].label), y - graphExtras - 3); + if (aa[gg]._linecolour != null) + { - g.setColor(Color.black); - graphExtras += fontHeight + 8; + g.setColor(aa[gg]._linecolour); + g.drawLine(x, y - graphExtras + 3, + x + fm.stringWidth(aa[gg].label), y - graphExtras + + 3); + } + + g.setColor(Color.black); + graphExtras += fontHeight + 8; + } } } + g.setFont(baseFont); + fm = baseMetrics; + fontHeight = ofontH; } else { @@ -824,15 +1121,15 @@ public class AnnotationLabels extends JPanel implements MouseListener, 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)) + if (!av.wrapAlignment && ((aa == null) || (aa.length < 1))) { - g.drawString("Right click", 2, 8); - g.drawString("to add annotation", 2, 18); + g.drawString(MessageManager.getString("label.right_click"), 2, 8); + g.drawString(MessageManager.getString("label.to_add_annotation"), 2, + 18); } } }