X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fgui%2FIdCanvas.java;h=71cc48344d6380a0038dc8e8337b0aaee04245dd;hb=454688abf087254742210ace4c82bedc918e7590;hp=214f218c0294d16a65cecb7111c4c5669c5bf917;hpb=6ddf2d553aee329db44dd36b564211c3880563ec;p=jalview.git diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java index 214f218..71cc483 100755 --- a/src/jalview/gui/IdCanvas.java +++ b/src/jalview/gui/IdCanvas.java @@ -1,6 +1,6 @@ /* * Jalview - A Sequence Alignment Editor and Viewer - * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * Copyright (C) 2006 AM Waterhouse, J Procter, 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 @@ -43,6 +43,10 @@ public class IdCanvas extends JPanel int imgHeight = 0; boolean fastPaint = false; java.util.Vector searchResults; + FontMetrics fm; + AnnotationLabels labels = null; + AnnotationPanel ap; + Font idfont; /** * Creates a new IdCanvas object. @@ -53,7 +57,7 @@ public class IdCanvas extends JPanel { setLayout(new BorderLayout()); this.av = av; - PaintRefresher.Register(this, av.alignment); + PaintRefresher.Register(this, av.getSequenceSetId()); } /** @@ -65,9 +69,10 @@ public class IdCanvas extends JPanel * @param starty DOCUMENT ME! * @param ypos DOCUMENT ME! */ - public void drawIdString(Graphics2D gg, SequenceI s, int i, int starty, - int ypos) + public void drawIdString(Graphics2D gg, SequenceI s, int i, int starty, int ypos) { + int xPos = 0; + int panelWidth = getWidth(); int charHeight = av.charHeight; if ((searchResults != null) && searchResults.contains(s)) @@ -78,7 +83,7 @@ public class IdCanvas extends JPanel gg.setColor(Color.white); } else if ((av.getSelectionGroup() != null) && - av.getSelectionGroup().sequences.contains(s)) + av.getSelectionGroup().getSequences(null).contains(s)) { gg.setColor(Color.lightGray); gg.fillRect(0, ((i - starty) * charHeight) + ypos, getWidth(), @@ -87,15 +92,26 @@ public class IdCanvas extends JPanel } else { - gg.setColor(s.getColor()); + gg.setColor(av.getSequenceColour(s)); gg.fillRect(0, ((i - starty) * charHeight) + ypos, getWidth(), charHeight); gg.setColor(Color.black); } + if (av.rightAlignIds) + { + xPos = panelWidth - fm.stringWidth( + s.getDisplayId(av.getShowJVSuffix()) + ) - 4; + } gg.drawString( s.getDisplayId(av.getShowJVSuffix()), - 0, (((i - starty + 1) * charHeight) + ypos) - (charHeight / 5)); + xPos, (((i - starty + 1) * charHeight) + ypos) - (charHeight / 5)); + + if (av.hasHiddenRows && av.showHiddenMarkers) + drawMarker(i, starty, ypos); + + } /** @@ -169,6 +185,8 @@ public class IdCanvas extends JPanel return; } + int oldHeight = imgHeight; + imgHeight = getHeight(); imgHeight -= (imgHeight % av.charHeight); @@ -177,15 +195,18 @@ public class IdCanvas extends JPanel return; } - image = new BufferedImage(getWidth(), imgHeight, - BufferedImage.TYPE_INT_RGB); + if(oldHeight!=imgHeight || image.getWidth(this)!=getWidth()) + { + image = new BufferedImage(getWidth(), imgHeight, + BufferedImage.TYPE_INT_RGB); + } + gg = (Graphics2D) image.getGraphics(); //Fill in the background gg.setColor(Color.white); gg.fillRect(0, 0, getWidth(), imgHeight); - drawIds(av.getStartSeq(), av.endSeq); g.drawImage(image, 0, 0, this); @@ -199,9 +220,14 @@ public class IdCanvas extends JPanel */ void drawIds(int starty, int endy) { - Font italic = new Font(av.getFont().getName(), Font.ITALIC, + if(av.seqNameItalics) + idfont = new Font(av.getFont().getName(), Font.ITALIC, av.getFont().getSize()); - gg.setFont(italic); + else + idfont = av.getFont(); + + gg.setFont(idfont); + fm = gg.getFontMetrics(); if (av.antiAlias) gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING, @@ -212,92 +238,103 @@ public class IdCanvas extends JPanel if (av.getWrapAlignment()) { + int maxwidth = av.alignment.getWidth(); + int alheight = av.alignment.getHeight(); + + if (av.hasHiddenColumns) + maxwidth = av.getColumnSelection().findColumnPosition(maxwidth) - 1; + int annotationHeight = 0; - AnnotationLabels labels = null; + if(av.showAnnotation) { - AnnotationPanel ap = new AnnotationPanel(av); + if (ap == null) + ap = new AnnotationPanel(av); + annotationHeight = ap.adjustPanelHeight(); - labels = new AnnotationLabels(av); + if (labels == null) + labels = new AnnotationLabels(av); } int hgap = av.charHeight; if (av.scaleAboveWrapped) hgap += av.charHeight; - int cHeight = av.getAlignment().getHeight() * av.charHeight + int cHeight = alheight * av.charHeight + hgap + annotationHeight; - int rowSize = av.getEndRes() - av.getStartRes(); + int rowSize = av.getEndRes() - av.getStartRes(); + // Draw the rest of the panels for (int ypos = hgap, row = av.startRes; - (ypos <= getHeight()) && (row < av.alignment.getWidth()); + (ypos <= getHeight()) && (row < maxwidth); ypos += cHeight, row += rowSize) { - for (int i = starty; i < av.alignment.getHeight(); i++) + for (int i = starty; i < alheight; i++) + { + SequenceI s = av.alignment.getSequenceAt(i); + if (av.hasHiddenRows) { - - SequenceI s = av.alignment.getSequenceAt(i); - gg.setFont(italic); - drawIdString(gg, s, i, 0, ypos); + setHiddenFont(s); } + else + gg.setFont(idfont); + + drawIdString(gg, s, i, 0, ypos); + } - if(labels!=null) + if(labels!=null && av.showAnnotation) { - gg.translate(0, ypos+(av.getAlignment().getHeight() * av.charHeight)); + gg.translate(0, ypos+(alheight * av.charHeight)); labels.drawComponent(gg, getWidth()); - gg.translate(0, -ypos-(av.getAlignment().getHeight() * av.charHeight)); - + gg.translate(0, -ypos-(alheight * av.charHeight)); } } } else { + //No need to hang on to labels if we're not wrapped + labels = null; + + //Now draw the id strings + int panelWidth = getWidth(); + int xPos = 0; + + SequenceI sequence; //Now draw the id strings - int tmp, hiddenIndex = starty; - boolean markHidden = false; for (int i = starty; i < endy; i++) { - if (av.hasHiddenRows) - { - tmp = av.adjustForHiddenSeqs(i); - if(hiddenIndex != tmp) - { - hiddenIndex = tmp; - markHidden = true; - } - else - markHidden = false; + sequence = av.alignment.getSequenceAt(i); - hiddenIndex++; - } + if(sequence==null) + continue; - if(av.hasHiddenRows && av.alignment.getSequenceAt(i).getHiddenSequences()!=null) + if (av.hasHiddenRows) { - currentTextColor = Color.blue; + setHiddenFont(sequence); } - else + // Selected sequence colours - if ((searchResults != null) && - searchResults.contains(av.alignment.getSequenceAt(i))) + if ( (searchResults != null) && + searchResults.contains(sequence)) { - currentColor = Color.black; - currentTextColor = Color.white; + currentColor = Color.black; + currentTextColor = Color.white; } - else if ((av.getSelectionGroup() != null) && - av.getSelectionGroup().sequences.contains( - av.alignment.getSequenceAt(i))) + else if ( (av.getSelectionGroup() != null) && + av.getSelectionGroup().getSequences(null).contains( + sequence)) { - currentColor = Color.lightGray; - currentTextColor = Color.black; + currentColor = Color.lightGray; + currentTextColor = Color.black; } else { - currentColor = av.alignment.getSequenceAt(i).getColor(); - currentTextColor = Color.black; + currentColor = av.getSequenceColour(sequence); + currentTextColor = Color.black; } gg.setColor(currentColor); @@ -305,37 +342,100 @@ public class IdCanvas extends JPanel gg.fillRect(0, (i - starty) * av.charHeight, getWidth(), av.charHeight); - if (markHidden) - { - gg.setColor(Color.blue); - // gg.drawLine(0, (i-starty)*av.charHeight, getWidth(),(i-starty)*av.charHeight); - gg.fillPolygon(new int[] { getWidth() - av.charHeight, - getWidth() - av.charHeight, - getWidth() }, - new int[] - { - (i-starty)*av.charHeight -av.charHeight/4, - (i-starty)*av.charHeight +av.charHeight/4, - (i-starty)*av.charHeight - }, 3); + gg.setColor(currentTextColor); - } + String string = sequence.getDisplayId( av.getShowJVSuffix()); - gg.setColor(currentTextColor); - String string = av.alignment.getSequenceAt(i).getDisplayId( av.getShowJVSuffix()); + if(av.rightAlignIds) + { + xPos = panelWidth - fm.stringWidth(string) - 4; + } - gg.drawString(string, 0, + gg.drawString(string, xPos, (((i - starty) * av.charHeight) + av.charHeight) - (av.charHeight / 5)); + + if(av.hasHiddenRows && av.showHiddenMarkers) + drawMarker(i, starty, 0); + } - // add a border - // gg.setColor(Color.cyan); - // gg.fillRect(getWidth() - 4, 0, 4, getHeight()); } } + void drawMarker(int i, int starty, int yoffset) + { + + SequenceI [] hseqs = av.alignment.getHiddenSequences().hiddenSequences; + //Use this method here instead of calling hiddenSeq adjust + //3 times. + int hSize = hseqs.length; + + int hiddenIndex = i; + int lastIndex = i - 1; + int nextIndex = i + 1; + + for(int j=0; j lastIndex + 1); + boolean above = (nextIndex > hiddenIndex+1); + + + gg.setColor(Color.blue); + if(below) + { + gg.fillPolygon(new int[] + {getWidth()- av.charHeight, + getWidth()- av.charHeight, + getWidth()}, + new int[] + { + (i - starty) * av.charHeight +yoffset, + (i - starty) * av.charHeight +yoffset+ av.charHeight / 4, + (i - starty) * av.charHeight+yoffset + }, 3); + } + if(above) + { + gg.fillPolygon(new int[] + {getWidth()- av.charHeight, + getWidth()- av.charHeight, + getWidth() }, + new int[] + { + (i - starty+1) * av.charHeight +yoffset, + (i - starty+1) * av.charHeight +yoffset- av.charHeight / 4, + (i - starty+1) * av.charHeight +yoffset + }, 3); + + } + } + + void setHiddenFont(SequenceI seq) + { + Font bold = new Font(av.getFont().getName(), Font.BOLD, + av.getFont().getSize()); + + + if (av.hiddenRepSequences!=null && + av.hiddenRepSequences.containsKey(seq)) + gg.setFont(bold); + else + gg.setFont(idfont); + } + /** * DOCUMENT ME! *