X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationLabels.java;h=3112fe1b546c2ee70d7ee9ee00695eb40f666fd6;hb=7d950017bb9262f2eff563192071b5ed9ccc76b4;hp=3e23ac02e0d461bd2f28abfa0a876aa77bfbd38a;hpb=fdda06e4e3b668fb08532ba9192c199bb57fb5bd;p=jalview.git diff --git a/src/jalview/gui/AnnotationLabels.java b/src/jalview/gui/AnnotationLabels.java index 3e23ac0..3112fe1 100755 --- a/src/jalview/gui/AnnotationLabels.java +++ b/src/jalview/gui/AnnotationLabels.java @@ -20,6 +20,7 @@ */ package jalview.gui; +import jalview.analysis.AlignSeq; import jalview.analysis.AlignmentUtils; import jalview.datamodel.Alignment; import jalview.datamodel.AlignmentAnnotation; @@ -29,9 +30,13 @@ 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 jalview.workers.InformationThread; import java.awt.Color; +import java.awt.Cursor; import java.awt.Dimension; import java.awt.Font; import java.awt.FontMetrics; @@ -52,7 +57,6 @@ 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 javax.swing.JCheckBoxMenuItem; @@ -63,63 +67,71 @@ 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 { + // width in pixels within which height adjuster arrows are shown and active + private static final int HEIGHT_ADJUSTER_WIDTH = 50; + private static final Pattern LEFT_ANGLE_BRACKET_PATTERN = Pattern .compile("<"); - 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; + private static Image adjusterImage; + + private static int adjusterImageHeight; - 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) { @@ -127,12 +139,32 @@ public class AnnotationLabels extends JPanel implements MouseListener, av = ap.av; ToolTipManager.sharedInstance().registerComponent(this); + if (adjusterImage == null) + { + loadAdjusterImage(); + } + + addMouseListener(this); + addMouseMotionListener(this); + addMouseWheelListener(ap.getAnnotationPanel()); + } + + public AnnotationLabels(AlignViewport av) + { + this.av = av; + } + + /** + * Loads the gif for the panel height adjustment + */ + protected void loadAdjusterImage() + { java.net.URL url = getClass().getResource("/images/idwidth.gif"); Image temp = null; if (url != null) { - temp = java.awt.Toolkit.getDefaultToolkit().createImage(url); + temp = Toolkit.getDefaultToolkit().createImage(url); } try @@ -149,16 +181,8 @@ public class AnnotationLabels extends JPanel implements MouseListener, 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()); - } - - public AnnotationLabels(AlignViewport av) - { - this.av = av; + adjusterImage = bi; + adjusterImageHeight = bi.getHeight(); } /** @@ -267,8 +291,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, } 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)) { @@ -421,8 +444,9 @@ public class AnnotationLabels extends JPanel implements MouseListener, if (selectedRow < aa.length) { final String label = aa[selectedRow].label; - if (!(aa[selectedRow].autoCalculated - || label.indexOf("Information Content") > -1)) + if (!(aa[selectedRow].autoCalculated) + && !(InformationThread.HMM_CALC_ID + .equals(aa[selectedRow].getCalcId()))) { if (aa[selectedRow].graph == AlignmentAnnotation.NO_GRAPH) { @@ -435,16 +459,18 @@ public class AnnotationLabels extends JPanel implements MouseListener, pop.add(item); } } - else if (label.indexOf("Consensus") > -1 - || label.indexOf("Information Content") > -1) + else if (label.indexOf("Consensus") > -1) { + + pop.addSeparator(); // 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() { @@ -455,8 +481,8 @@ 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 { @@ -550,7 +576,6 @@ 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()); } @@ -571,7 +596,6 @@ 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()); } @@ -593,7 +617,6 @@ public class AnnotationLabels extends JPanel implements MouseListener, // updated. av.setShowSequenceLogo(true); av.setNormaliseSequenceLogo(cprofnorm.getState()); - ap.alignFrame.setMenusForViewport(); ap.repaint(); // ap.annotationPanel.paint(ap.annotationPanel.getGraphics()); } @@ -604,15 +627,219 @@ public class AnnotationLabels extends JPanel implements MouseListener, consclipbrd.addActionListener(this); pop.add(consclipbrd); } + else if (InformationThread.HMM_CALC_ID + .equals(aa[selectedRow].getCalcId())) + { + pop.addSeparator(); + final AlignmentAnnotation aaa = aa[selectedRow]; + + final JCheckBoxMenuItem cbmi = new JCheckBoxMenuItem( + MessageManager.getString( + "label.ignore_below_background_frequency"), + (aa[selectedRow].groupRef != null) + ? aa[selectedRow].groupRef + .getIgnoreBelowBackground() + : ap.av.isIgnoreBelowBackground()); + + cbmi.addActionListener(new ActionListener() + { + @Override + public void actionPerformed(ActionEvent e) + { + + if (aaa.groupRef != null) + { + // TODO: pass on reference to ap so the view can be updated. + if (aaa.groupRef.getInfoLetterHeight() == false) + { + aaa.groupRef.setIgnoreBelowBackground(cbmi.getState()); + ap.getAnnotationPanel() + .paint(ap.getAnnotationPanel().getGraphics()); + } + } + else if (ap.av.isInfoLetterHeight() == false) + { + ap.av.setIgnoreBelowBackground(cbmi.getState(), ap); + } + ap.alignmentChanged(); + } + }); + pop.add(cbmi); + final JCheckBoxMenuItem letteHeight = new JCheckBoxMenuItem( + MessageManager.getString("label.use_info_for_height"), + (aa[selectedRow].groupRef != null) + ? aa[selectedRow].groupRef.getInfoLetterHeight() + : ap.av.isInfoLetterHeight()); + + letteHeight.addActionListener(new ActionListener() + { + @Override + public void actionPerformed(ActionEvent e) + { + if (aaa.groupRef != null) + { + // TODO: pass on reference to ap so the view can be updated. + aaa.groupRef.setInfoLetterHeight((letteHeight.getState())); + if (aaa.groupRef.getIgnoreBelowBackground() == false) + { + aaa.groupRef.setIgnoreBelowBackground(true); + } + ap.getAnnotationPanel() + .paint(ap.getAnnotationPanel().getGraphics()); + } + else + { + ap.av.setInfoLetterHeight(letteHeight.getState(), ap); + if (ap.av.isIgnoreBelowBackground() == false) + { + ap.av.setIgnoreBelowBackground(true, ap); + } + } + ap.alignmentChanged(); + } + }); + pop.add(letteHeight); + if (aaa.groupRef != null) + { + final JCheckBoxMenuItem chist = new JCheckBoxMenuItem( + MessageManager.getString("label.show_group_histogram"), + aa[selectedRow].groupRef.isShowInformationHistogram()); + chist.addActionListener(new ActionListener() + { + @Override + public void actionPerformed(ActionEvent e) + { + // TODO: pass on reference + // to ap + // so the + // view + // can be + // updated. + aaa.groupRef.setShowInformationHistogram(chist.getState()); + ap.repaint(); + // ap.annotationPanel.paint(ap.annotationPanel.getGraphics()); + } + }); + pop.add(chist); + final JCheckBoxMenuItem cprofl = new JCheckBoxMenuItem( + MessageManager.getString("label.show_group_logo"), + aa[selectedRow].groupRef.isShowHMMSequenceLogo()); + cprofl.addActionListener(new ActionListener() + { + @Override + public void actionPerformed(ActionEvent e) + { + // TODO: pass on reference + // to ap + // so the + // view + // can be + // updated. + aaa.groupRef.setshowHMMSequenceLogo(cprofl.getState()); + ap.repaint(); + // ap.annotationPanel.paint(ap.annotationPanel.getGraphics()); + } + }); + pop.add(cprofl); + final JCheckBoxMenuItem cproflnorm = new JCheckBoxMenuItem( + MessageManager.getString("label.normalise_group_logo"), + aa[selectedRow].groupRef.isNormaliseHMMSequenceLogo()); + cproflnorm.addActionListener(new ActionListener() + { + @Override + public void actionPerformed(ActionEvent e) + { + + // TODO: pass on reference + // to ap + // so the + // view + // can be + // updated. + aaa.groupRef + .setNormaliseHMMSequenceLogo(cproflnorm.getState()); + // automatically enable logo display if we're clicked + aaa.groupRef.setshowHMMSequenceLogo(true); + ap.repaint(); + // ap.annotationPanel.paint(ap.annotationPanel.getGraphics()); + } + }); + pop.add(cproflnorm); + } + else + { + final JCheckBoxMenuItem chist = new JCheckBoxMenuItem( + MessageManager.getString("label.show_histogram"), + av.isShowInformationHistogram()); + chist.addActionListener(new ActionListener() + { + @Override + public void actionPerformed(ActionEvent e) + { + // TODO: pass on reference + // to ap + // so the + // view + // can be + // updated. + av.setShowInformationHistogram(chist.getState()); + ap.repaint(); + // ap.annotationPanel.paint(ap.annotationPanel.getGraphics()); + } + }); + pop.add(chist); + final JCheckBoxMenuItem cprof = new JCheckBoxMenuItem( + MessageManager.getString("label.show_logo"), + av.isShowHMMSequenceLogo()); + cprof.addActionListener(new ActionListener() + { + @Override + public void actionPerformed(ActionEvent e) + { + // TODO: pass on reference + // to ap + // so the + // view + // can be + // updated. + av.updateInformation(ap); + av.setShowHMMSequenceLogo(cprof.getState()); + ap.repaint(); + // ap.annotationPanel.paint(ap.annotationPanel.getGraphics()); + } + }); + pop.add(cprof); + final JCheckBoxMenuItem cprofnorm = new JCheckBoxMenuItem( + MessageManager.getString("label.normalise_logo"), + av.isNormaliseHMMSequenceLogo()); + cprofnorm.addActionListener(new ActionListener() + { + @Override + public void actionPerformed(ActionEvent e) + { + // TODO: pass on reference + // to ap + // so the + // view + // can be + // updated. + av.setShowHMMSequenceLogo(true); + av.setNormaliseHMMSequenceLogo(cprofnorm.getState()); + ap.repaint(); + // ap.annotationPanel.paint(ap.annotationPanel.getGraphics()); + } + }); + pop.add(cprofnorm); + } + } } pop.show(this, evt.getX(), evt.getY()); } /** - * DOCUMENT ME! + * Reorders annotation rows after a drag of a label * * @param evt - * DOCUMENT ME! */ @Override public void mouseReleased(MouseEvent evt) @@ -627,6 +854,9 @@ public class AnnotationLabels extends JPanel implements MouseListener, getSelectedRow(evt.getY() - getScrollOffset()); int end = selectedRow; + /* + * if dragging to resize instead, start == end + */ if (start != end) { // Swap these annotations @@ -650,31 +880,13 @@ public class AnnotationLabels extends JPanel implements MouseListener, } /** - * DOCUMENT ME! - * - * @param evt - * DOCUMENT ME! - */ - @Override - public void mouseEntered(MouseEvent evt) - { - if (evt.getY() < 10) - { - resizePanel = true; - repaint(); - } - } - - /** - * DOCUMENT ME! - * - * @param evt - * DOCUMENT ME! + * Removes the height adjuster image on leaving the panel, unless currently + * dragging it */ @Override public void mouseExited(MouseEvent evt) { - if (dragEvent == null) + if (resizePanel && dragEvent == null) { resizePanel = false; repaint(); @@ -682,10 +894,11 @@ public class AnnotationLabels extends JPanel implements MouseListener, } /** - * DOCUMENT ME! + * 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 - * DOCUMENT ME! */ @Override public void mouseDragged(MouseEvent evt) @@ -702,12 +915,12 @@ public class AnnotationLabels extends JPanel implements MouseListener, if ((d.height - dif) > 20) { - ap.annotationScroller.setPreferredSize(new Dimension(d.width, - d.height - dif)); + 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.annotationSpaceFillerHolder + .setPreferredSize(new Dimension(d.width, d.height - dif)); + ap.paintAlignment(true, false); } ap.addNotify(); @@ -719,20 +932,19 @@ public class AnnotationLabels extends JPanel implements MouseListener, } /** - * DOCUMENT ME! + * Updates the tooltip as the mouse moves over the labels * * @param evt - * DOCUMENT ME! */ @Override public void mouseMoved(MouseEvent evt) { - resizePanel = evt.getY() < 10; + showOrHideAdjuster(evt); getSelectedRow(evt.getY() - getScrollOffset()); - if (selectedRow > -1 - && ap.av.getAlignment().getAlignmentAnnotation().length > selectedRow) + if (selectedRow > -1 && ap.av.getAlignment() + .getAlignmentAnnotation().length > selectedRow) { AlignmentAnnotation aa = ap.av.getAlignment() .getAlignmentAnnotation()[selectedRow]; @@ -746,8 +958,8 @@ public class AnnotationLabels extends JPanel implements MouseListener, // 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)) + 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) @@ -803,6 +1015,26 @@ public class AnnotationLabels extends JPanel implements MouseListener, } } + /** + * 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() < adjusterImageHeight && 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) { @@ -821,17 +1053,14 @@ public class AnnotationLabels extends JPanel implements MouseListener, ap.getSeqPanel().ap.getIdPanel().highlightSearchResults(null); // process modifiers SequenceGroup sg = ap.av.getSelectionGroup(); - if (sg == null - || sg == aa[selectedRow].groupRef - || !(jalview.util.Platform.isControlDown(evt) || evt - .isShiftDown())) + if (sg == null || sg == aa[selectedRow].groupRef + || !(Platform.isControlDown(evt) || evt.isShiftDown())) { - if (jalview.util.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)); + ap.av.setSelectionGroup( + new SequenceGroup(aa[selectedRow].groupRef)); } else { @@ -858,7 +1087,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, } } - ap.paintAlignment(false); + ap.paintAlignment(false, false); PaintRefresher.Refresh(ap, ap.av.getSequenceSetId()); ap.av.sendSelection(); } @@ -873,10 +1102,9 @@ public class AnnotationLabels extends JPanel implements MouseListener, { if (evt.getClickCount() == 1) { - ap.getSeqPanel().ap - .getIdPanel() - .highlightSearchResults( - Arrays.asList(new SequenceI[] { aa[selectedRow].sequenceRef })); + ap.getSeqPanel().ap.getIdPanel() + .highlightSearchResults(Arrays.asList(new SequenceI[] + { aa[selectedRow].sequenceRef })); } else if (evt.getClickCount() >= 2) { @@ -887,8 +1115,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, // we make a copy rather than edit the current selection if no // modifiers pressed // see Enhancement JAL-1557 - if (!(jalview.util.Platform.isControlDown(evt) || evt - .isShiftDown())) + if (!(Platform.isControlDown(evt) || evt.isShiftDown())) { sg = new SequenceGroup(sg); sg.clear(); @@ -896,7 +1123,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, } else { - if (jalview.util.Platform.isControlDown(evt)) + if (Platform.isControlDown(evt)) { sg.addOrRemove(aa[selectedRow].sequenceRef, true); } @@ -916,7 +1143,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, sg.addSequence(aa[selectedRow].sequenceRef, false); } ap.av.setSelectionGroup(sg); - ap.paintAlignment(false); + ap.paintAlignment(false, false); PaintRefresher.Refresh(ap, ap.av.getSequenceSetId()); ap.av.sendSelection(); } @@ -941,8 +1168,8 @@ 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]); } @@ -950,18 +1177,16 @@ public class AnnotationLabels extends JPanel implements MouseListener, if (av.hasHiddenColumns()) { omitHidden = av.getAlignment().getHiddenColumns() - .getVisibleSequenceStrings(0, - sq.getLength(), seqs); + .getVisibleSequenceStrings(0, sq.getLength(), seqs); } int[] alignmentStartEnd = new int[] { 0, ds.getWidth() - 1 }; - List hiddenCols = av.getAlignment().getHiddenColumns() - .getHiddenRegions(); - if (hiddenCols != null) + if (av.hasHiddenColumns()) { - alignmentStartEnd = av.getAlignment().getVisibleStartAndEndIndex( - hiddenCols); + alignmentStartEnd = av.getAlignment().getHiddenColumns() + .getVisibleStartAndEndIndex(av.getAlignment().getWidth()); } + String output = new FormatAdapter().formatSequences(FileFormat.Fasta, seqs, omitHidden, alignmentStartEnd); @@ -969,14 +1194,13 @@ public class AnnotationLabels extends JPanel implements MouseListener, .setContents(new StringSelection(output), Desktop.instance); ArrayList hiddenColumns = null; + if (av.hasHiddenColumns()) { - hiddenColumns = new ArrayList<>(); - for (int[] region : av.getAlignment().getHiddenColumns() - .getHiddenRegions()) - { - hiddenColumns.add(new int[] { region[0], region[1] }); - } + + hiddenColumns = av.getAlignment().getHiddenColumns() + .getHiddenColumnsCopy(); + } Desktop.jalviewClipboard = new Object[] { seqs, ds, // what is the dataset @@ -1029,8 +1253,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 @@ -1072,8 +1294,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]; @@ -1116,8 +1339,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; } @@ -1155,7 +1378,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 { @@ -1169,11 +1393,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) @@ -1190,8 +1415,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); @@ -1212,7 +1437,7 @@ public class AnnotationLabels extends JPanel implements MouseListener, if (resizePanel) { - g.drawImage(image, 2, 0 - getScrollOffset(), this); + // g.drawImage(adjusterImage, 2, 0 - getScrollOffset(), this); } else if (dragEvent != null && aa != null) { @@ -1233,4 +1458,9 @@ public class AnnotationLabels extends JPanel implements MouseListener, { return scrollOffset; } + + @Override + public void mouseEntered(MouseEvent e) + { + } }