X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOverviewPanel.java;h=a35966d7f1dc4ddbb18da52d81ad486a9700f7ba;hb=a87f4c6fd568ccf29aaf3af0ad528da442ea921d;hp=c80a830162ff6714aa0c12fd8bb7b13d28b0c3d8;hpb=1c37c329efcec099e7af2eb3db81fc7182e5a51d;p=jalview.git diff --git a/src/jalview/gui/OverviewPanel.java b/src/jalview/gui/OverviewPanel.java index c80a830..a35966d 100755 --- a/src/jalview/gui/OverviewPanel.java +++ b/src/jalview/gui/OverviewPanel.java @@ -40,13 +40,18 @@ public class OverviewPanel extends JPanel implements Runnable float scaleh = 1f; int width; int sequencesHeight; - int graphHeight = 30; + int graphHeight = 20; int boxX = -1; int boxY = -1; int boxWidth = -1; int boxHeight = -1; boolean resizing = false; + // Can set different properties in this seqCanvas than + // main visible SeqCanvas + SequenceRenderer sr; + FeatureRenderer fr; + /** * Creates a new OverviewPanel object. * @@ -58,14 +63,26 @@ public class OverviewPanel extends JPanel implements Runnable this.ap = ap; setLayout(null); + sr = new SequenceRenderer(av); + sr.renderGaps( false ); + fr = new FeatureRenderer(av); + fr.transparency = ap.seqPanel.seqCanvas.getFeatureRenderer().transparency; + fr.featuresDisplayed = ap.seqPanel.seqCanvas.getFeatureRenderer().featuresDisplayed; + // scale the initial size of overviewpanel to shape of alignment float initialScale = (float) av.alignment.getWidth() / (float) av.alignment.getHeight(); + if(av.conservation==null) + graphHeight = 0; + + if (av.alignment.getWidth() > av.alignment.getHeight()) { // wider width = 400; sequencesHeight = (int) (400f / initialScale); + if(sequencesHeight<40) + sequencesHeight = 40; } else { @@ -95,6 +112,7 @@ public class OverviewPanel extends JPanel implements Runnable { public void mouseDragged(MouseEvent evt) { + if(!av.wrapAlignment) doMouseDragged(evt); } }); @@ -103,11 +121,13 @@ public class OverviewPanel extends JPanel implements Runnable { public void mousePressed(MouseEvent evt) { + if(!av.wrapAlignment) doMousePressed(evt); } public void mouseReleased(MouseEvent evt) { + if(!av.wrapAlignment) doMouseReleased(evt); } }); @@ -204,6 +224,7 @@ public class OverviewPanel extends JPanel implements Runnable width = getWidth(); sequencesHeight = getHeight() - graphHeight; } + setPreferredSize(new Dimension(width, sequencesHeight + graphHeight)); setBoxPosition(); @@ -238,117 +259,55 @@ public class OverviewPanel extends JPanel implements Runnable BufferedImage.TYPE_INT_RGB); - Graphics mg = miniMe.getGraphics(); - BufferedImage consensus; - Graphics cg; - Graphics g ; - - mg.setColor(Color.white); - mg.fillRect(0, 0, getWidth(), getHeight()); - mg.setColor(Color.black); - mg.setFont(new Font("Verdana", Font.BOLD, 15)); - mg.drawString("Recalculating", 5, sequencesHeight / 2); - mg.drawString("Overview.....", 5, (sequencesHeight / 2) + 20); + mg.setColor(Color.orange); + mg.fillRect(0,0,width, miniMe.getHeight()); - boolean oldRenderGaps = av.renderGaps; + float sampleCol = (float) alwidth / (float) width; + float sampleRow = (float) alheight / (float) sequencesHeight; - try + int lastcol=-1, lastrow=-1; + Color color = Color.white; + for (int col = 0; col < width; col++) { - // We'll have to draw the full size alignment in chunks, as an image of the - // whole alignment requires too much memory - // Max size depends on the font size, the following is a - // guess at a size which works - int maxSize = 2000 / av.getFont().getSize(); - BufferedImage block; - int blockx = 0; - int blocky = 0; - int blockw = 0; - int blockh = 0; - int eRes = 0; - int eSeq = 0; - - av.setRenderGaps(false); - - for (int sRes = 0, chunkx = 0; sRes < alwidth; - sRes += maxSize, chunkx++) + for (int row = 0; row < sequencesHeight; row++) + { + if((int)(col*sampleCol) == lastcol && (int)(row*sampleRow)==lastrow) { - if(resizeAgain) - break; - - eSeq = 0; - eRes += maxSize; - - if (eRes > alwidth) - { - eRes = alwidth; - } - - for (int sSeq = 0, chunky = 0; sSeq < alheight; - sSeq += maxSize, chunky++) - { - if (resizeAgain) - break; - eSeq += maxSize; - - if (eSeq > alheight) - { - eSeq = alheight; - } - - blocky = 0; - blockx = (int) ((float) sRes / (float) alwidth * width); - - block = new BufferedImage((eRes - sRes) * av.charWidth, - (eSeq - sSeq) * av.charHeight, - BufferedImage.TYPE_3BYTE_BGR); - g = block.getGraphics(); - - ap.seqPanel.seqCanvas.drawPanel(g, sRes, eRes, sSeq, eSeq, - sRes, sSeq, 0); - - blockh = (int) ((float) (eSeq - sSeq) / (float) alheight * sequencesHeight) + - 1; - blockw = (int) ((float) (eRes - sRes) / (float) alwidth * width) + - 1; - - blocky += (int) ((float) sSeq / (float) alheight * sequencesHeight); - - if(av.conservation!=null) - { - consensus = new BufferedImage( (eRes - sRes) * av.charWidth, 60, - BufferedImage.TYPE_3BYTE_BGR); - cg = consensus.getGraphics(); - - ap.annotationPanel.drawGraph(cg, av.conservation, - (eRes - sRes) * av.charWidth, 60, sRes, eRes); + miniMe.setRGB(col,row,color.getRGB()); + continue; + } - mg.drawImage(consensus, blockx, sequencesHeight, blockx + blockw, + lastrow = (int)(row*sampleRow); + lastcol = (int)(col*sampleCol); - sequencesHeight + graphHeight, 0, 0, - (eRes - sRes) * av.charWidth, 60, this); - } - - mg.drawImage(block, blockx, blocky, blockx + blockw, - blocky + blockh, 0, 0, block.getWidth(), - block.getHeight(), null); + if(av.alignment.getSequenceAt(lastrow).getLength()>lastcol) + { + color = sr.getResidueBoxColour( + av.alignment.getSequenceAt(lastrow), lastcol); - block = null; - repaint(); - } + if(av.showSequenceFeatures) + color = fr.findFeatureColour(color, av.alignment.getSequenceAt(lastrow), + lastcol); + } + miniMe.setRGB(col,row,color.getRGB()); + if (av.conservation != null) + { + mg.translate(col, sequencesHeight); + ap.annotationPanel.drawGraph(mg, av.conservation, + (int) (sampleCol) + 1, + graphHeight, + (int) (col * sampleCol), + (int) (col * sampleCol) + 1); + mg.translate(-col, -sequencesHeight); } - } - catch (OutOfMemoryError error) - { - System.err.println( - "Out of memory when trying to calculate the overview window image!"); + } } System.gc(); - av.setRenderGaps(oldRenderGaps); resizing = false; setBoxPosition(); @@ -386,7 +345,7 @@ public class OverviewPanel extends JPanel implements Runnable */ public void paintComponent(Graphics g) { - if (miniMe != null) + if (miniMe != null && !resizing) { g.drawImage(miniMe, 0, 0, this); } @@ -400,6 +359,7 @@ public class OverviewPanel extends JPanel implements Runnable g.drawString("Overview.....", 5, (sequencesHeight / 2) + 20); } + g.setColor(Color.red); g.drawRect(boxX, boxY, boxWidth, boxHeight); g.drawRect(boxX + 1, boxY + 1, boxWidth - 2, boxHeight - 2);