X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSeqCanvas.java;h=45bcf66d4c7bbb62c62229db86ad53007fe25719;hb=3e6b14950a06bb87c147493e4dfff0c4491ea25b;hp=2b5995c7e3b72b74580c9bfda4e3f6aadb3a2985;hpb=8721f6e9e9c1df94142e2513236ffff084349fd3;p=jalview.git diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java index 2b5995c..45bcf66 100755 --- a/src/jalview/gui/SeqCanvas.java +++ b/src/jalview/gui/SeqCanvas.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 @@ -34,8 +34,8 @@ import javax.swing.*; */ public class SeqCanvas extends JComponent { - FeatureRenderer fr; - SequenceRenderer sr; + final FeatureRenderer fr; + final SequenceRenderer sr; BufferedImage img; Graphics2D gg; int imgWidth; @@ -46,6 +46,11 @@ public class SeqCanvas extends JComponent int LABEL_WEST; int LABEL_EAST; + + int cursorX = 0; + int cursorY = 0; + + /** * Creates a new SeqCanvas object. * @@ -57,7 +62,7 @@ public class SeqCanvas extends JComponent fr = new FeatureRenderer(av); sr = new SequenceRenderer(av); setLayout(new BorderLayout()); - PaintRefresher.Register(this, av.alignment); + PaintRefresher.Register(this, av.getSequenceSetId()); setBackground(Color.white); } @@ -128,9 +133,16 @@ public class SeqCanvas extends JComponent ypos += av.charHeight; if(av.hasHiddenColumns) - startx = av.getColumnSelection().adjustForHiddenColumns(startx); + { + startx = av.getColumnSelection().adjustForHiddenColumns(startx); + endx = av.getColumnSelection().adjustForHiddenColumns(endx); + } - // EAST SCALE + int maxwidth = av.alignment.getWidth(); + if (av.hasHiddenColumns) + maxwidth = av.getColumnSelection().findColumnPosition(maxwidth) - 1; + + // WEST SCALE for (int i = 0; i < av.alignment.getHeight(); i++) { SequenceI seq = av.alignment.getSequenceAt(i); @@ -175,15 +187,14 @@ public class SeqCanvas extends JComponent if(av.hasHiddenColumns) endx = av.getColumnSelection().adjustForHiddenColumns(endx); + SequenceI seq; // EAST SCALE for (int i = 0; i < av.alignment.getHeight(); i++) { - SequenceI seq = av.alignment.getSequenceAt(i); + seq = av.alignment.getSequenceAt(i); int index = endx; int value = -1; - - while (index > startx) { if (jalview.util.Comparison.isGap(seq.getCharAt(index))) @@ -193,7 +204,7 @@ public class SeqCanvas extends JComponent continue; } - value = av.alignment.getSequenceAt(i).findPosition(index); + value = seq.findPosition(index); break; } @@ -317,9 +328,34 @@ public class SeqCanvas extends JComponent return; } - img = new BufferedImage(imgWidth, imgHeight, BufferedImage.TYPE_INT_RGB); - gg = (Graphics2D) img.getGraphics(); - gg.setFont(av.getFont()); + if (img == null || imgWidth != img.getWidth() || imgHeight != img.getHeight()) + { + try{ + img = new BufferedImage(imgWidth, imgHeight, + BufferedImage.TYPE_INT_RGB); + gg = (Graphics2D) img.getGraphics(); + gg.setFont(av.getFont()); + }catch(OutOfMemoryError er) + { + System.gc(); + System.out.println(er +" making image, SeqCanvas"); + javax.swing.SwingUtilities.invokeLater(new Runnable() + { + public void run() + { + javax.swing.JOptionPane.showInternalMessageDialog(Desktop. + desktop, + "Out of memory creating alignment image!!" + + + "\nSee help files for increasing Java Virtual Machine memory." + , "Out of memory", + javax.swing.JOptionPane.WARNING_MESSAGE); + } + }); + + return; + } + } if (av.antiAlias) gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING, @@ -342,7 +378,7 @@ public class SeqCanvas extends JComponent if (pdbCanvas != null) { - pdbCanvas.updateSeqColours(); + pdbCanvas.updateSeqColours(); } } @@ -382,7 +418,16 @@ public class SeqCanvas extends JComponent String getMask() { String mask = "00"; - for (int i = av.alignment.getWidth(); i > 0; i /= 10) + int maxWidth = 0; + int tmp; + for(int i=0; imaxWidth) + maxWidth = tmp; + } + + for (int i = maxWidth; i > 0; i /= 10) { mask += "0"; } @@ -400,19 +445,16 @@ public class SeqCanvas extends JComponent public void drawWrappedPanel(Graphics g, int canvasWidth, int canvasHeight, int startRes) { - AlignmentI al = av.getAlignment(); FontMetrics fm = getFontMetrics(av.getFont()); - int LABEL_EAST = 0; if (av.scaleRightWrapped) { LABEL_EAST = fm.stringWidth(getMask()); } - int LABEL_WEST = 0; if (av.scaleLeftWrapped) { @@ -431,11 +473,22 @@ public class SeqCanvas extends JComponent av.endRes = av.startRes + cWidth; - int endx = (startRes + cWidth) - 1; + int endx; int ypos = hgap; + int maxwidth = av.alignment.getWidth()-1; + + if(av.hasHiddenColumns) + maxwidth = av.getColumnSelection().findColumnPosition(maxwidth)-1; - while ((ypos <= canvasHeight) && (startRes < av.alignment.getWidth())) + while ((ypos <= canvasHeight) && (startRes < maxwidth)) { + endx = startRes + cWidth -1; + + if (endx > maxwidth) + { + endx = maxwidth; + } + g.setFont(av.getFont()); g.setColor(Color.black); @@ -458,6 +511,35 @@ public class SeqCanvas extends JComponent drawNorthScale(g, startRes, endx, ypos); } + if (av.hasHiddenColumns && av.showHiddenMarkers) + { + g.setColor(Color.blue); + int res; + for (int i = 0; i < av.getColumnSelection().getHiddenColumns().size(); + i++) + { + res = av.getColumnSelection().findHiddenRegionPosition(i) - + startRes; + + if (res < 0 || res > endx - startRes) + continue; + + gg.fillPolygon(new int[] + {res * av.charWidth - av.charHeight / 4, + res * av.charWidth + av.charHeight / 4, + res * av.charWidth}, + new int[] + { + ypos - (av.charHeight / 2), + ypos - (av.charHeight / 2), + ypos - (av.charHeight / 2) + 8 + }, 3); + + } + } + + + // When printing we have an extra clipped region, // the Printable page which we need to account for here Shape clip = g.getClip(); @@ -472,12 +554,6 @@ public class SeqCanvas extends JComponent cWidth * av.charWidth, (int) clip.getBounds().getHeight()); } - if (av.vconsensus!=null && av.alignment.getWidth() >= av.vconsensus.size()) - { - endx = av.vconsensus.size() - 2; - } - - drawPanel(g, startRes, endx, 0, al.getHeight(), ypos); if(av.showAnnotation) @@ -486,23 +562,15 @@ public class SeqCanvas extends JComponent if(annotations==null) annotations = new AnnotationPanel(av); - annotations.drawComponent( (Graphics2D) g, startRes, endx + 1); - g.translate(0, -cHeight - ypos); + annotations.drawComponent( (Graphics2D) g, startRes, endx+1); + g.translate(0, -cHeight - ypos -3); } g.setClip(clip); g.translate(-LABEL_WEST, 0); ypos += cHeight+getAnnotationHeight()+hgap; - if(av.showAnnotation) - ypos -= 3; startRes += cWidth; - endx = (startRes + cWidth) - 1; - - if (endx > al.getWidth()) - { - endx = al.getWidth(); - } } } @@ -522,35 +590,12 @@ public class SeqCanvas extends JComponent * DOCUMENT ME! * * @param g1 DOCUMENT ME! - * @param x1 DOCUMENT ME! - * @param x2 DOCUMENT ME! - * @param y1 DOCUMENT ME! - * @param y2 DOCUMENT ME! - * @param startx DOCUMENT ME! - * @param starty DOCUMENT ME! + * @param startRes DOCUMENT ME! + * @param endRes DOCUMENT ME! + * @param startSeq DOCUMENT ME! + * @param endSeq DOCUMENT ME! * @param offset DOCUMENT ME! */ - - float aaRatio = 2f/3f; - public void increaseAARatio() - { - aaRatio += .025; - if(aaRatio>1) - aaRatio = 1; - - repaint(); - } - - public void decreaseAARation() - { - aaRatio -= .025; - if(aaRatio<0) - aaRatio = 0; - - repaint(); - } - - void drawPanel(Graphics g1, int startRes, int endRes, int startSeq, int endSeq, int offset) { @@ -584,15 +629,15 @@ public class SeqCanvas extends JComponent draw(g1, blockStart, blockEnd, startSeq, endSeq, offset); - g1.setColor(Color.blue); - g1.drawLine( (blockEnd - blockStart + 1) * av.charWidth - 1, - startSeq + offset, - (blockEnd - blockStart + 1) * av.charWidth - 1, - startSeq + (endSeq - startSeq) * av.charHeight + offset); - g1.drawLine( (blockEnd - blockStart + 1) * av.charWidth, - startSeq + offset, - (blockEnd - blockStart + 1) * av.charWidth, - startSeq + (endSeq - startSeq) * av.charHeight + offset); + if(av.getShowHiddenMarkers()) + { + g1.setColor(Color.blue); + + g1.drawLine( (blockEnd - blockStart + 1) * av.charWidth - 1, + 0 + offset, + (blockEnd - blockStart + 1) * av.charWidth - 1, + (endSeq - startSeq) * av.charHeight + offset); + } g1.translate( -screenY * av.charWidth, 0); screenY += blockEnd - blockStart + 1; @@ -604,6 +649,7 @@ public class SeqCanvas extends JComponent blockEnd = blockStart + (endRes - startRes) - screenY; g1.translate(screenY * av.charWidth, 0); draw(g1, blockStart, blockEnd, startSeq, endSeq, offset); + g1.translate( -screenY * av.charWidth, 0); } } @@ -615,15 +661,13 @@ public class SeqCanvas extends JComponent //int startRes, int endRes, int startSeq, int endSeq, int x, int y, // int x1, int x2, int y1, int y2, int startx, int starty, - void draw(Graphics g1, + void draw(Graphics g, int startRes, int endRes, int startSeq, int endSeq, int offset) { - - sr.renderGaps(av.renderGaps); - Graphics2D g = (Graphics2D) g1; g.setFont(av.getFont()); + sr.prepare(g, av.renderGaps); SequenceI nextSeq; @@ -633,15 +677,14 @@ public class SeqCanvas extends JComponent { nextSeq = av.alignment.getSequenceAt(i); - sr.drawSequence(g, nextSeq, av.alignment.findAllGroups(nextSeq), + sr.drawSequence(nextSeq, av.alignment.findAllGroups(nextSeq), startRes, endRes, offset + ( (i - startSeq) * av.charHeight)); if (av.showSequenceFeatures) { - fr.drawSequence(g1, nextSeq, startRes, endRes, - offset + ((i - startSeq) * av.charHeight), av.charWidth, - av.charHeight); + fr.drawSequence(g, nextSeq, startRes, endRes, + offset + ((i - startSeq) * av.charHeight)); } /// Highlight search Results once all sequences have been drawn @@ -655,12 +698,29 @@ public class SeqCanvas extends JComponent sr.drawHighlightedText(nextSeq, visibleResults[r], visibleResults[r + 1], (visibleResults[r] - startRes) * av.charWidth, - offset + ( (i - startSeq) * av.charHeight), - av.charWidth, av.charHeight); + offset + ( (i - startSeq) * av.charHeight)); } } + + if(av.cursorMode && cursorY==i + && cursorX>=startRes && cursorX<=endRes) + { + sr.drawCursor(nextSeq, cursorX, (cursorX - startRes) * av.charWidth, + offset + ( (i - startSeq) * av.charHeight)); + } } + if(av.getSelectionGroup()!=null || av.alignment.getGroups().size()>0) + drawGroupsBoundaries(g, startRes, endRes, startSeq, endSeq, offset); + + } + + void drawGroupsBoundaries(Graphics g1, + int startRes, int endRes, + int startSeq, int endSeq, + int offset) + { + Graphics2D g = (Graphics2D)g1; // ///////////////////////////////////// // Now outline any areas if necessary @@ -671,6 +731,7 @@ public class SeqCanvas extends JComponent int sy = -1; int ex = -1; int groupIndex = -1; + int visWidth = (endRes - startRes +1) * av.charWidth; if ((group == null) && (av.alignment.getGroups().size() > 0)) { @@ -678,6 +739,7 @@ public class SeqCanvas extends JComponent groupIndex = 0; } + if (group != null) { do @@ -695,17 +757,17 @@ public class SeqCanvas extends JComponent ex = (((group.getEndRes() + 1) - group.getStartRes()) * av.charWidth) - 1; - if(sx+ex<0 || sx>imgWidth) + if(sx+ex<0 || sx>visWidth) { continue; } if ( (sx <= (endRes-startRes)*av.charWidth) && - group.sequences.contains(av.alignment.getSequenceAt( - i))) + group.getSequences(null). + contains(av.alignment.getSequenceAt(i))) { if ((bottom == -1) && - !group.sequences.contains( + !group.getSequences(null).contains( av.alignment.getSequenceAt(i + 1))) { bottom = sy + av.charHeight; @@ -714,7 +776,7 @@ public class SeqCanvas extends JComponent if (!inGroup) { if (((top == -1) && (i == 0)) || - !group.sequences.contains( + !group.getSequences(null).contains( av.alignment.getSequenceAt(i - 1))) { top = sy; @@ -742,10 +804,10 @@ public class SeqCanvas extends JComponent { if (inGroup) { - if (sx >= 0 && sx < imgWidth) + if (sx >= 0 && sx < visWidth) g.drawLine(sx, oldY, sx, sy); - if (sx + ex < imgWidth) + if (sx + ex < visWidth) g.drawLine(sx + ex, oldY, sx + ex, sy); if (sx < 0) @@ -754,8 +816,8 @@ public class SeqCanvas extends JComponent sx = 0; } - if (sx + ex > imgWidth) - ex = imgWidth; + if (sx + ex > visWidth) + ex = visWidth; else if (sx + ex >= (endRes - startRes + 1) * av.charWidth) ex = (endRes - startRes + 1) * av.charWidth; @@ -780,10 +842,10 @@ public class SeqCanvas extends JComponent if (inGroup) { sy = offset + ( (i - startSeq) * av.charHeight); - if (sx >= 0 && sx < imgWidth) + if (sx >= 0 && sx < visWidth) g.drawLine(sx, oldY, sx, sy); - if (sx + ex < imgWidth) + if (sx + ex < visWidth) g.drawLine(sx + ex, oldY, sx + ex, sy); if (sx < 0) @@ -792,8 +854,8 @@ public class SeqCanvas extends JComponent sx = 0; } - if (sx + ex > imgWidth) - ex = imgWidth; + if (sx + ex > visWidth) + ex = visWidth; else if (sx + ex >= (endRes - startRes + 1) * av.charWidth) ex = (endRes - startRes + 1) * av.charWidth; @@ -814,15 +876,21 @@ public class SeqCanvas extends JComponent groupIndex++; + g.setStroke(new BasicStroke()); + if (groupIndex >= av.alignment.getGroups().size()) { break; } group = (SequenceGroup) av.alignment.getGroups().elementAt(groupIndex); + + } while (groupIndex < av.alignment.getGroups().size()); + } + } /**