X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FIdCanvas.java;h=7734f9affc6bc33489cd5ef21dedd8b0a8309e3d;hb=e33cdacd2ac2836504375c538574a0f1cafec7e3;hp=c2500c227f6a18c7d4c877af68013e9a3d66930b;hpb=bb72a052b1308e9d6d28fc97dd458c6e11f116e8;p=jalview.git diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java index c2500c2..7734f9a 100755 --- a/src/jalview/gui/IdCanvas.java +++ b/src/jalview/gui/IdCanvas.java @@ -65,8 +65,7 @@ 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 charHeight = av.charHeight; @@ -78,7 +77,7 @@ public class IdCanvas extends JPanel gg.setColor(Color.white); } else if ((av.getSelectionGroup() != null) && - av.getSelectionGroup().sequences.contains(s)) + av.getSelectionGroup().getSequences(false).contains(s)) { gg.setColor(Color.lightGray); gg.fillRect(0, ((i - starty) * charHeight) + ypos, getWidth(), @@ -96,6 +95,11 @@ public class IdCanvas extends JPanel gg.drawString( s.getDisplayId(av.getShowJVSuffix()), 0, (((i - starty + 1) * charHeight) + ypos) - (charHeight / 5)); + + if (av.hasHiddenRows && av.showHiddenMarkers) + drawMarker(i, starty, ypos); + + } /** @@ -169,6 +173,8 @@ public class IdCanvas extends JPanel return; } + int oldHeight = imgHeight; + imgHeight = getHeight(); imgHeight -= (imgHeight % av.charHeight); @@ -177,15 +183,17 @@ public class IdCanvas extends JPanel return; } - image = new BufferedImage(getWidth(), imgHeight, - BufferedImage.TYPE_INT_RGB); - gg = (Graphics2D) image.getGraphics(); + if(oldHeight!=imgHeight) + { + 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); @@ -201,6 +209,7 @@ public class IdCanvas extends JPanel { Font italic = new Font(av.getFont().getName(), Font.ITALIC, av.getFont().getSize()); + gg.setFont(italic); if (av.antiAlias) @@ -212,6 +221,12 @@ 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; @@ -226,63 +241,77 @@ public class IdCanvas extends JPanel 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++) + { + if (av.hasHiddenRows) { - SequenceI s = av.alignment.getSequenceAt(i); - gg.setFont(italic); - drawIdString(gg, s, i, 0, ypos); + setHiddenFont(i); } + else + gg.setFont(italic); + + SequenceI s = av.alignment.getSequenceAt(i); + drawIdString(gg, s, i, 0, ypos); + } if(labels!=null) { - 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 { + //Now draw the id strings + //Now draw the id strings for (int i = starty; i < endy; i++) { + if (av.hasHiddenRows) + { + setHiddenFont(i); + } + // Selected sequence colours - if ((searchResults != null) && - searchResults.contains(av.alignment.getSequenceAt(i))) + if ( (searchResults != null) && + searchResults.contains(av.alignment.getSequenceAt(i))) { - gg.setColor(Color.black); - 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(false).contains( + av.alignment.getSequenceAt(i))) { - currentColor = Color.lightGray; - currentTextColor = Color.black; + currentColor = Color.lightGray; + currentTextColor = Color.black; } else { - currentColor = av.alignment.getSequenceAt(i).getColor(); - currentTextColor = Color.black; + currentColor = av.alignment.getSequenceAt(i).getColor(); + currentTextColor = Color.black; } gg.setColor(currentColor); gg.fillRect(0, (i - starty) * av.charHeight, getWidth(), - av.charHeight); + av.charHeight); gg.setColor(currentTextColor); @@ -291,14 +320,67 @@ public class IdCanvas extends JPanel gg.drawString(string, 0, (((i - starty) * av.charHeight) + av.charHeight) - (av.charHeight / 5)); + + if(av.hasHiddenRows && av.showHiddenMarkers) + drawMarker(i, starty, 0); + } - // add a border - gg.setColor(Color.white); - gg.fillRect(getWidth() - 4, 0, 4, getHeight()); } } + void drawMarker(int i, int starty, int yoffset) + { + int hiddenIndex = av.adjustForHiddenSeqs(i); + int lastIndex = av.adjustForHiddenSeqs(i - 1); + int nextIndex = av.adjustForHiddenSeqs(i + 1); + + boolean below = (hiddenIndex > 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(int i) + { + Font italic = new Font(av.getFont().getName(), Font.ITALIC, + av.getFont().getSize()); + Font bold = new Font(av.getFont().getName(), Font.BOLD, + av.getFont().getSize()); + + if (av.alignment.getSequenceAt(i).getHiddenSequences() != null) + gg.setFont(bold); + else + gg.setFont(italic); + } + /** * DOCUMENT ME! *