X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationLabels.java;h=1577477d78d94a203cfeb18658bd56cb8a78343d;hb=59d682209891099d46b960509907c79e3fb276fe;hp=3ea788b785fd69aa78846e3aa6b751bf0019613a;hpb=a4901ca07503a428587e768dc42d86b5d6997af8;p=jalview.git diff --git a/src/jalview/gui/AnnotationLabels.java b/src/jalview/gui/AnnotationLabels.java index 3ea788b..1577477 100755 --- a/src/jalview/gui/AnnotationLabels.java +++ b/src/jalview/gui/AnnotationLabels.java @@ -1,28 +1,29 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1) - * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8) + * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, 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. + * + * 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 this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * You should have received a copy of the GNU General Public License along with Jalview. If not, see . */ package jalview.gui; import java.util.*; +import java.util.regex.Pattern; import java.awt.*; import java.awt.datatransfer.*; import java.awt.event.*; +import java.awt.geom.AffineTransform; import java.awt.image.*; import javax.swing.*; @@ -74,11 +75,13 @@ public class AnnotationLabels extends JPanel implements MouseListener, Font font = new Font("Arial", Font.PLAIN, 11); + private boolean hasHiddenRows; + /** * Creates a new AnnotationLabels object. * * @param ap - * DOCUMENT ME! + * DOCUMENT ME! */ public AnnotationLabels(AlignmentPanel ap) { @@ -103,8 +106,8 @@ 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); @@ -112,6 +115,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, addMouseListener(this); addMouseMotionListener(this); + addMouseWheelListener(ap.annotationPanel); } public AnnotationLabels(AlignViewport av) @@ -123,7 +127,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, * DOCUMENT ME! * * @param y - * DOCUMENT ME! + * DOCUMENT ME! */ public void setScrollOffset(int y) { @@ -131,15 +135,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; @@ -161,24 +174,25 @@ public class AnnotationLabels extends JPanel implements MouseListener, * DOCUMENT ME! * * @param evt - * DOCUMENT ME! + * DOCUMENT ME! */ 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)) { @@ -188,15 +202,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)) { @@ -217,10 +226,12 @@ public class AnnotationLabels extends JPanel implements MouseListener, else if (evt.getActionCommand().equals(COPYCONS_SEQ)) { SequenceI cons = null; - if (aa[selectedRow].groupRef!=null) + if (aa[selectedRow].groupRef != null) { cons = aa[selectedRow].groupRef.getConsensusSeq(); - } else { + } + else + { cons = av.getConsensusSeq(); } if (cons != null) @@ -231,25 +242,28 @@ public class AnnotationLabels extends JPanel implements MouseListener, } else if (evt.getActionCommand().equals(TOGGLE_LABELSCALE)) { - aa[selectedRow].scaleColLabel = !aa[selectedRow].scaleColLabel; + 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); } /** * DOCUMENT ME! * * @param e - * DOCUMENT ME! + * DOCUMENT ME! */ boolean editLabelDescription(AlignmentAnnotation annotation) { 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) { @@ -272,7 +286,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, * DOCUMENT ME! * * @param evt - * DOCUMENT ME! + * DOCUMENT ME! */ public void mousePressed(MouseEvent evt) { @@ -284,7 +298,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, * DOCUMENT ME! * * @param evt - * DOCUMENT ME! + * DOCUMENT ME! */ public void mouseReleased(MouseEvent evt) { @@ -295,12 +309,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; @@ -313,7 +332,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, * DOCUMENT ME! * * @param evt - * DOCUMENT ME! + * DOCUMENT ME! */ public void mouseEntered(MouseEvent evt) { @@ -328,7 +347,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, * DOCUMENT ME! * * @param evt - * DOCUMENT ME! + * DOCUMENT ME! */ public void mouseExited(MouseEvent evt) { @@ -343,7 +362,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, * DOCUMENT ME! * * @param evt - * DOCUMENT ME! + * DOCUMENT ME! */ public void mouseDragged(MouseEvent evt) { @@ -379,7 +398,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, * DOCUMENT ME! * * @param evt - * DOCUMENT ME! + * DOCUMENT ME! */ public void mouseMoved(MouseEvent evt) { @@ -388,25 +407,57 @@ 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("
"); + } + + } + else + { + // begin the tooltip's html fragment + desc.append(""); } 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(""); this.setToolTipText(desc.toString()); @@ -421,43 +472,56 @@ public class AnnotationLabels extends JPanel implements MouseListener, * DOCUMENT ME! * * @param evt - * DOCUMENT ME! + * DOCUMENT ME! */ public void mouseClicked(MouseEvent evt) { - AlignmentAnnotation[] aa = ap.av.alignment.getAlignmentAnnotation(); + AlignmentAnnotation[] aa = ap.av.getAlignment() + .getAlignmentAnnotation(); if (SwingUtilities.isLeftMouseButton(evt)) { - if (selectedRow < aa.length) - { - if (aa[selectedRow].groupRef!=null) + if (selectedRow > -1 && selectedRow < aa.length) + { + if (aa[selectedRow].groupRef != null) { - ap.seqPanel.ap.idPanel.highlightSearchResults(aa[selectedRow].groupRef.getSequences(null)); - if (evt.getClickCount()>=2) + if (evt.getClickCount() >= 2) { - // todo: make the ap scroll to the selection - ap.av.setSelectionGroup(new SequenceGroup(aa[selectedRow].groupRef)); + // 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.paintAlignment(false); + PaintRefresher.Refresh(ap, ap.av.getSequenceSetId()); + ap.av.sendSelection(); + } + else + { + ap.seqPanel.ap.idPanel + .highlightSearchResults(aa[selectedRow].groupRef + .getSequences(null)); } return; - } else - if (aa[selectedRow].sequenceRef!=null){ + } + else if (aa[selectedRow].sequenceRef != null) + { Vector sr = new Vector(); sr.addElement(aa[selectedRow].sequenceRef); - if (evt.getClickCount()==1) + if (evt.getClickCount() == 1) { - ap.seqPanel.ap.idPanel.highlightSearchResults(sr); - } else - if (evt.getClickCount()>=2) + ap.seqPanel.ap.idPanel.highlightSearchResults(sr); + } + else if (evt.getClickCount() >= 2) { - ap.seqPanel.ap.idPanel.highlightSearchResults(null); - SequenceGroup sg = new SequenceGroup(); - sg.addSequence(aa[selectedRow].sequenceRef,false); + ap.seqPanel.ap.idPanel.highlightSearchResults(null); + SequenceGroup sg = new SequenceGroup(); + sg.addSequence(aa[selectedRow].sequenceRef, false); ap.av.setSelectionGroup(sg); + ap.av.sendSelection(); ap.paintAlignment(false); PaintRefresher.Refresh(ap, ap.av.getSequenceSetId()); } - + } } } @@ -466,21 +530,21 @@ public class AnnotationLabels extends JPanel implements MouseListener, return; } - JPopupMenu pop = new JPopupMenu("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); @@ -490,24 +554,31 @@ public class AnnotationLabels extends JPanel implements MouseListener, 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); - // TODO: annotation object should be typed for autocalculated/derived property methods + // TODO: annotation object should be typed for autocalculated/derived + // property methods if (selectedRow < aa.length) { if (!aa[selectedRow].autoCalculated) { - // display settings for this row. - pop.addSeparator(); - // av and sequencegroup need to implement same interface for - item = new JCheckBoxMenuItem(TOGGLE_LABELSCALE, - aa[selectedRow].scaleColLabel); - item.addActionListener(this); - pop.add(item); + if (aa[selectedRow].graph == AlignmentAnnotation.NO_GRAPH) + { + // display formatting settings for this row. + pop.addSeparator(); + // av and sequencegroup need to implement same interface for + item = new JCheckBoxMenuItem(TOGGLE_LABELSCALE, + aa[selectedRow].scaleColLabel); + item.addActionListener(this); + pop.add(item); + } } else if (aa[selectedRow].label.indexOf("Consensus") > -1) { @@ -516,8 +587,8 @@ public class AnnotationLabels extends JPanel implements MouseListener, 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() { @@ -525,8 +596,8 @@ public class AnnotationLabels extends JPanel implements MouseListener, { if (aaa.groupRef != null) { - // TODO: pass on reference to ap so the view can be updated. - aaa.groupRef.setIgnoreGapsConsensus(cbmi.getState()); + // TODO: pass on reference to ap so the view can be updated. + aaa.groupRef.setIgnoreGapsConsensus(cbmi.getState()); ap.annotationPanel.paint(ap.annotationPanel.getGraphics()); } else @@ -539,9 +610,90 @@ public class AnnotationLabels extends JPanel implements MouseListener, // av and sequencegroup need to implement same interface for if (aaa.groupRef != null) { + final JCheckBoxMenuItem chist = new JCheckBoxMenuItem( + "Show Group Histogram", + aa[selectedRow].groupRef.isShowConsensusHistogram()); + chist.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + // TODO: pass on reference + // to ap + // so the + // view + // can be + // updated. + aaa.groupRef.setShowConsensusHistogram(chist.getState()); + ap.repaint(); + // ap.annotationPanel.paint(ap.annotationPanel.getGraphics()); + } + }); + pop.add(chist); + final JCheckBoxMenuItem cprofl = new JCheckBoxMenuItem( + "Show Group Logo", + aa[selectedRow].groupRef.isShowSequenceLogo()); + cprofl.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + // TODO: pass on reference + // to ap + // so the + // view + // can be + // updated. + aaa.groupRef.setshowSequenceLogo(cprofl.getState()); + ap.repaint(); + // ap.annotationPanel.paint(ap.annotationPanel.getGraphics()); + } + }); + pop.add(cprofl); + final JCheckBoxMenuItem cproflnorm = new JCheckBoxMenuItem( + "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()); + chist.addActionListener(new ActionListener() + { + public void actionPerformed(ActionEvent e) + { + // TODO: pass on reference + // to ap + // so the + // view + // 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 Full Profile", aa[selectedRow].groupRef - .isIncludeAllConsSymbols()); + "Show Logo", av.isShowSequenceLogo()); cprof.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -552,11 +704,33 @@ public class AnnotationLabels extends JPanel implements MouseListener, // view // can be // updated. - aaa.groupRef.setIncludeAllConsSymbols(cprof.getState()); - ap.annotationPanel.paint(ap.annotationPanel.getGraphics()); + av.setShowSequenceLogo(cprof.getState()); + ap.alignFrame.setMenusForViewport(); + ap.repaint(); + // ap.annotationPanel.paint(ap.annotationPanel.getGraphics()); } }); pop.add(cprof); + final JCheckBoxMenuItem cprofnorm = new JCheckBoxMenuItem( + "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); @@ -570,7 +744,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, * do a single sequence copy to jalview and the system clipboard * * @param sq - * sequence to be copied to clipboard + * sequence to be copied to clipboard */ protected void copy_annotseqtoclipboard(SequenceI sq) { @@ -588,7 +762,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); @@ -597,11 +771,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++) @@ -616,7 +790,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, Desktop.jalviewClipboard = new Object[] { seqs, ds, // what is the dataset of a consensus sequence ? need to flag - // sequence as special. + // sequence as special. hiddenColumns }; } @@ -624,7 +798,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, * DOCUMENT ME! * * @param g1 - * DOCUMENT ME! + * DOCUMENT ME! */ public void paintComponent(Graphics g) { @@ -650,7 +824,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, * DOCUMENT ME! * * @param g - * DOCUMENT ME! + * DOCUMENT ME! */ public void drawComponent(Graphics g, int width) { @@ -670,21 +844,27 @@ 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; + boolean visible = true; if (aa != null) { + hasHiddenRows = false; for (int i = 0; i < aa.length; i++) { + visible = true; g.setColor(Color.black); if (!aa[i].visible) { + hasHiddenRows = true; continue; } @@ -712,30 +892,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) { - x = width - fm.stringWidth(aa[gg].label) - 3; - g.drawString(aa[gg].label, x, y - graphExtras); - if (aa[gg].annotations[0] != null) + visible = false; + } + else + { + 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 { @@ -751,9 +956,8 @@ 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))