X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationPanel.java;h=8a93f790346d79debe5e8a0b8fca44f85d48fd13;hb=f149a335b5467a4802eded5da0ca2fc732d7caf7;hp=281d5dcf413052ff6df7f563b11966c0f1c4cd55;hpb=68f3a1f48c2c7c587bcf807bce5c335d8bb77573;p=jalview.git diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java index 281d5dc..8a93f79 100755 --- a/src/jalview/gui/AnnotationPanel.java +++ b/src/jalview/gui/AnnotationPanel.java @@ -1,20 +1,19 @@ /* - * 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.6) + * Copyright (C) 2010 J Procter, AM Waterhouse, 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. * - * 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 + * 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 . */ package jalview.gui; @@ -90,7 +89,7 @@ public class AnnotationPanel extends JPanel implements MouseListener, * Creates a new AnnotationPanel object. * * @param ap - * DOCUMENT ME! + * DOCUMENT ME! */ public AnnotationPanel(AlignmentPanel ap) { @@ -118,7 +117,7 @@ public class AnnotationPanel extends JPanel implements MouseListener, * DOCUMENT ME! * * @param evt - * DOCUMENT ME! + * DOCUMENT ME! */ public void adjustmentValueChanged(AdjustmentEvent evt) { @@ -126,13 +125,31 @@ public class AnnotationPanel extends JPanel implements MouseListener, } /** - * Calculates the height of the annotation displayed in the annotation panel. - * Callers should normally call the ap.adjustAnnotationHeight method to ensure all - * annotation associated components are updated correctly. - * + * Calculates the height of the annotation displayed in the annotation panel. + * Callers should normally call the ap.adjustAnnotationHeight method to ensure + * all annotation associated components are updated correctly. + * */ public int adjustPanelHeight() { + int height=calcPanelHeight(); + this.setPreferredSize(new Dimension(1, height)); + if (ap != null) + { + // revalidate only when the alignment panel is fully constructed + ap.validate(); + } + + return height; + } + + /** + * calculate the height for visible annotation, revalidating bounds where necessary + * ABSTRACT GUI METHOD + * @return total height of annotation + */ + public int calcPanelHeight() + { // setHeight of panels AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation(); int height = 0; @@ -141,6 +158,11 @@ public class AnnotationPanel extends JPanel implements MouseListener, { for (int i = 0; i < aa.length; i++) { + if (aa[i] == null) + { + System.err.println("Null annotation row: ignoring."); + continue; + } if (!aa[i].visible) { continue; @@ -171,14 +193,11 @@ public class AnnotationPanel extends JPanel implements MouseListener, height += aa[i].height; } } - else + if (height == 0) { + // set minimum height = 20; } - - this.setPreferredSize(new Dimension(1, height)); - ap.alabels.validate(); - return height; } @@ -186,11 +205,15 @@ public class AnnotationPanel extends JPanel implements MouseListener, * DOCUMENT ME! * * @param evt - * DOCUMENT ME! + * DOCUMENT ME! */ public void actionPerformed(ActionEvent evt) { AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation(); + if (aa == null) + { + return; + } Annotation[] anot = aa[activeRow].annotations; if (anot.length < av.getColumnSelection().getMax()) @@ -234,9 +257,9 @@ public class AnnotationPanel extends JPanel implements MouseListener, if (anot[index] == null) { anot[index] = new Annotation(label, "", ' ', 0); // TODO: verify that - // null exceptions - // aren't raised - // elsewhere. + // null exceptions + // aren't raised + // elsewhere. } else { @@ -339,7 +362,7 @@ public class AnnotationPanel extends JPanel implements MouseListener, || label2.equals(LABEL)) { tlabel = anot[index].description; - if (tlabel == null || tlabel.length()<1) + if (tlabel == null || tlabel.length() < 1) { if (label2.equals(HELIX) || label2.equals(SHEET)) { @@ -368,7 +391,7 @@ public class AnnotationPanel extends JPanel implements MouseListener, * DOCUMENT ME! * * @param evt - * DOCUMENT ME! + * DOCUMENT ME! */ public void mousePressed(MouseEvent evt) { @@ -447,7 +470,7 @@ public class AnnotationPanel extends JPanel implements MouseListener, * DOCUMENT ME! * * @param evt - * DOCUMENT ME! + * DOCUMENT ME! */ public void mouseReleased(MouseEvent evt) { @@ -461,7 +484,7 @@ public class AnnotationPanel extends JPanel implements MouseListener, * DOCUMENT ME! * * @param evt - * DOCUMENT ME! + * DOCUMENT ME! */ public void mouseEntered(MouseEvent evt) { @@ -472,7 +495,7 @@ public class AnnotationPanel extends JPanel implements MouseListener, * DOCUMENT ME! * * @param evt - * DOCUMENT ME! + * DOCUMENT ME! */ public void mouseExited(MouseEvent evt) { @@ -483,7 +506,7 @@ public class AnnotationPanel extends JPanel implements MouseListener, * DOCUMENT ME! * * @param evt - * DOCUMENT ME! + * DOCUMENT ME! */ public void mouseDragged(MouseEvent evt) { @@ -509,7 +532,7 @@ public class AnnotationPanel extends JPanel implements MouseListener, * DOCUMENT ME! * * @param evt - * DOCUMENT ME! + * DOCUMENT ME! */ public void mouseMoved(MouseEvent evt) { @@ -552,7 +575,7 @@ public class AnnotationPanel extends JPanel implements MouseListener, res = av.getColumnSelection().adjustForHiddenColumns(res); } - if (aa[row].annotations != null && row > -1 + if (row > -1 && aa[row].annotations != null && res < (int) aa[row].annotations.length) { if (aa[row].graphGroup > -1) @@ -574,10 +597,16 @@ public class AnnotationPanel extends JPanel implements MouseListener, } } else if (aa[row].annotations[res] != null - && aa[row].annotations[res].description != null) + && aa[row].annotations[res].description != null + && aa[row].annotations[res].description.length() > 0) { this.setToolTipText(aa[row].annotations[res].description); } + else + { + // clear the tooltip. + this.setToolTipText(null); + } if (aa[row].annotations[res] != null) { @@ -602,7 +631,7 @@ public class AnnotationPanel extends JPanel implements MouseListener, * DOCUMENT ME! * * @param evt - * DOCUMENT ME! + * DOCUMENT ME! */ public void mouseClicked(MouseEvent evt) { @@ -612,7 +641,7 @@ public class AnnotationPanel extends JPanel implements MouseListener, * DOCUMENT ME! * * @param g - * DOCUMENT ME! + * DOCUMENT ME! */ public void paintComponent(Graphics g) { @@ -659,7 +688,7 @@ public class AnnotationPanel extends JPanel implements MouseListener, * non-Thread safe repaint * * @param horizontal - * repaint with horizontal shift in alignment + * repaint with horizontal shift in alignment */ public void fastPaint(int horizontal) { @@ -703,11 +732,11 @@ public class AnnotationPanel extends JPanel implements MouseListener, * DOCUMENT ME! * * @param g - * DOCUMENT ME! + * DOCUMENT ME! * @param startRes - * DOCUMENT ME! + * DOCUMENT ME! * @param endRes - * DOCUMENT ME! + * DOCUMENT ME! */ public void drawComponent(Graphics g, int startRes, int endRes) { @@ -776,11 +805,13 @@ public class AnnotationPanel extends JPanel implements MouseListener, boolean validRes = false; boolean validEnd = false; boolean labelAllCols = false; - boolean centreColLabels,centreColLabelsDef = av.getCentreColumnLabels(); - boolean scaleColLabel=false; + boolean centreColLabels, centreColLabelsDef = av + .getCentreColumnLabels(); + boolean scaleColLabel = false; boolean[] graphGroupDrawn = new boolean[aa.length]; int charOffset = 0; // offset for a label - float fmWidth, fmScaling = 1f; // scaling for a label to fit it into a column. + float fmWidth, fmScaling = 1f; // scaling for a label to fit it into a + // column. Font ofont = g.getFont(); // \u03B2 \u03B1 for (int i = 0; i < aa.length; i++) @@ -898,9 +929,7 @@ public class AnnotationPanel extends JPanel implements MouseListener, if (v == column) { - g - .fillRect(x * av.charWidth, y, av.charWidth, - av.charHeight); + g.fillRect(x * av.charWidth, y, av.charWidth, av.charHeight); } } } @@ -910,31 +939,36 @@ public class AnnotationPanel extends JPanel implements MouseListener, && row.annotations[column].displayCharacter != null && (row.annotations[column].displayCharacter.length() > 0)) { - + if (centreColLabels || scaleColLabel) { - fmWidth = (float) fm - .charsWidth(row.annotations[column].displayCharacter - .toCharArray(), 0, - row.annotations[column].displayCharacter.length()); + fmWidth = (float) fm.charsWidth( + row.annotations[column].displayCharacter.toCharArray(), + 0, row.annotations[column].displayCharacter.length()); - if ( scaleColLabel ) { + if (scaleColLabel) + { // justify the label and scale to fit in column - if (fmWidth > av.charWidth) { + if (fmWidth > av.charWidth) + { // scale only if the current font isn't already small enough fmScaling = av.charWidth; fmScaling /= fmWidth; - g.setFont(ofont.deriveFont(AffineTransform.getScaleInstance(fmScaling, 1.0))); + g.setFont(ofont.deriveFont(AffineTransform + .getScaleInstance(fmScaling, 1.0))); // and update the label's width to reflect the scaling. fmWidth = av.charWidth; } } - } else { + } + else + { fmWidth = (float) fm - .charWidth(row.annotations[column].displayCharacter.charAt(0)); + .charWidth(row.annotations[column].displayCharacter + .charAt(0)); } - charOffset = (int) ((av.charWidth - fmWidth) / 2f); - + charOffset = (int) ((av.charWidth - fmWidth) / 2f); + if (row.annotations[column].colour == null) g.setColor(Color.black); else @@ -946,8 +980,9 @@ public class AnnotationPanel extends JPanel implements MouseListener, (x * av.charWidth) + charOffset, y + iconOffset); } else if (row.annotations[column - 1] == null - || (labelAllCols||!row.annotations[column].displayCharacter - .equals(row.annotations[column - 1].displayCharacter) || (row.annotations[column].displayCharacter + || (labelAllCols + || !row.annotations[column].displayCharacter + .equals(row.annotations[column - 1].displayCharacter) || (row.annotations[column].displayCharacter .length() < 2 && row.annotations[column].secondaryStructure == ' '))) { g.drawString(row.annotations[column].displayCharacter, x @@ -1069,9 +1104,7 @@ public class AnnotationPanel extends JPanel implements MouseListener, if (sCol == 0 || row.annotations[sCol - 1] == null || row.annotations[sCol - 1].secondaryStructure != 'H') { - g - .fillArc(lastSSX, y + 4 + iconOffset, av.charWidth, 8, - 90, 180); + g.fillArc(lastSSX, y + 4 + iconOffset, av.charWidth, 8, 90, 180); x1 += av.charWidth / 2; } @@ -1274,7 +1307,7 @@ public class AnnotationPanel extends JPanel implements MouseListener, int eRes, float min, float max, int y) { ColourSchemeI profcolour = av.getGlobalColourScheme(); - if (profcolour==null) + if (profcolour == null) { profcolour = new jalview.schemes.ZappoColourScheme(); } @@ -1300,7 +1333,21 @@ public class AnnotationPanel extends JPanel implements MouseListener, int column; int aaMax = aa.annotations.length - 1; - + boolean renderHistogram = true, renderProfile = true; + if (aa.autoCalculated && aa.label.startsWith("Consensus")) + { + // TODO: generalise this to have render styles for consensus/profile data + if (aa.groupRef != null) + { + renderHistogram = aa.groupRef.isShowConsensusHistogram(); + renderProfile = aa.groupRef.isShowSequenceLogo(); + } + else + { + renderHistogram = av.isShowConsensusHistogram(); + renderProfile = av.isShowSequenceLogo(); + } + } while (x < eRes - sRes) { column = sRes + x; @@ -1319,7 +1366,6 @@ public class AnnotationPanel extends JPanel implements MouseListener, x++; continue; } - if (aa.annotations[column].colour == null) g.setColor(Color.black); else @@ -1328,49 +1374,60 @@ public class AnnotationPanel extends JPanel implements MouseListener, y1 = y - (int) (((aa.annotations[column].value - min) / (range)) * aa.graphHeight); - if (y1 - y2 > 0) + if (renderHistogram) { - g.fillRect(x * av.charWidth, y2, av.charWidth, y1 - y2); - } - else - { - g.fillRect(x * av.charWidth, y1, av.charWidth, y2 - y1); + if (y1 - y2 > 0) + { + g.fillRect(x * av.charWidth, y2, av.charWidth, y1 - y2); + } + else + { + g.fillRect(x * av.charWidth, y1, av.charWidth, y2 - y1); + } } // draw profile if available - if (aa.annotations[column].value!=0) + if (renderProfile && aa.annotations[column].value != 0) { - int profl[] = getProfileFor(aa,column); - int ht = y1,htn=y2-y1;//aa.graphHeight; - float wdth; - double ht2=0; - char[] dc = new char[1]; - LineMetrics lm; - for (int c=1;profl!=null && c 2) { - dc[0] = (char) profl[c++]; - wdth = av.charWidth; - wdth/=(float) fm - .charsWidth(dc,0,1); - - if (c>2) - { - ht+=(int)ht2; - } - { - //if (aa.annotations[column].value==0) { - // g.setFont(ofont.deriveFont(AffineTransform.getScaleInstance(wdth, (ht2=(aa.graphHeight*0.1/av.charHeight))))); - // ht = y2-(int)ht2; - //} else { - g.setFont(ofont.deriveFont(AffineTransform.getScaleInstance(wdth, (ht2=(htn*((double)profl[c++])/100.0))/av.charHeight))); - lm = g.getFontMetrics().getLineMetrics(dc,0,1, g); - //htn -=ht2; - //} - g.setColor(profcolour.findColour(dc[0])); // (av.globalColourScheme!=null) ? );// try to get a colourscheme for the group(aa.groupRef.cs==null) ? av.textColour2 : cs.findColour(dc)); - g.drawChars(dc,0,1,x*av.charWidth, (int) (ht+lm.getHeight())); - // ht+=g.getFontMetrics().getAscent()-g.getFontMetrics().getDescent(); - } + ht += (int) ht2; } - g.setFont(ofont); + { + // if (aa.annotations[column].value==0) { + // g.setFont(ofont.deriveFont(AffineTransform.getScaleInstance(wdth, + // (ht2=(aa.graphHeight*0.1/av.charHeight))))); + // ht = y2-(int)ht2; + // } else { + g.setFont(ofont.deriveFont(AffineTransform.getScaleInstance( + wdth, (ht2 = (htn * ((double) profl[c++]) / 100.0)) + / av.charHeight))); + lm = g.getFontMetrics().getLineMetrics(dc, 0, 1, g); + // htn -=ht2; + // } + g.setColor(profcolour.findColour(dc[0])); // (av.globalColourScheme!=null) + // ? );// try to get a + // colourscheme for the + // group(aa.groupRef.cs==null) + // ? av.textColour2 : + // cs.findColour(dc)); + g.drawChars(dc, 0, 1, x * av.charWidth, + (int) (ht + lm.getHeight())); + // ht+=g.getFontMetrics().getAscent()-g.getFontMetrics().getDescent(); + } + } + g.setFont(ofont); } x++; } @@ -1390,15 +1447,23 @@ public class AnnotationPanel extends JPanel implements MouseListener, private int[] getProfileFor(AlignmentAnnotation aa, int column) { - if (aa.autoCalculated && aa.label.startsWith("Consensus")) { - if (aa.groupRef!=null && aa.groupRef.consensusData!=null) { - return AAFrequency.extractProfile(aa.groupRef.consensusData[column],aa.groupRef.getIgnoreGapsConsensus()); - } - // TODO extend annotation row to enable dynamic and static profile data to be stored - if (aa.groupRef==null && aa.sequenceRef==null) + if (aa.autoCalculated && aa.label.startsWith("Consensus")) { - return AAFrequency.extractProfile(av.hconsensus[column],av.getIgnoreGapsConsensus()); - } + if (aa.groupRef != null && aa.groupRef.consensusData != null + && aa.groupRef.isShowSequenceLogo()) + { + return AAFrequency.extractProfile( + aa.groupRef.consensusData[column], + aa.groupRef.getIgnoreGapsConsensus()); + } + // TODO extend annotation row to enable dynamic and static profile data to + // be stored + if (aa.groupRef == null && aa.sequenceRef == null + && av.isShowSequenceLogo()) + { + return AAFrequency.extractProfile(av.hconsensus[column], + av.getIgnoreGapsConsensus()); + } } return null; }