float scaleh = 1f;\r
int width;\r
int sequencesHeight;\r
- int graphHeight = 30;\r
+ int graphHeight = 20;\r
int boxX = -1;\r
int boxY = -1;\r
int boxWidth = -1;\r
int boxHeight = -1;\r
boolean resizing = false;\r
\r
+ // Can set different properties in this seqCanvas than\r
+ // main visible SeqCanvas\r
+ SeqCanvas overviewSeq;\r
+\r
/**\r
* Creates a new OverviewPanel object.\r
*\r
this.ap = ap;\r
setLayout(null);\r
\r
+ overviewSeq = new SeqCanvas(av);\r
+ overviewSeq.isOverview = true;\r
+ overviewSeq.sr.renderGaps = false;\r
+\r
// scale the initial size of overviewpanel to shape of alignment\r
float initialScale = (float) av.alignment.getWidth() / (float) av.alignment.getHeight();\r
\r
+ if(av.vconsensus==null)\r
+ graphHeight = 0;\r
+\r
+\r
if (av.alignment.getWidth() > av.alignment.getHeight())\r
{\r
// wider\r
width = 400;\r
sequencesHeight = (int) (400f / initialScale);\r
+ if(sequencesHeight<40)\r
+ sequencesHeight = 40;\r
}\r
else\r
{\r
width = getWidth();\r
sequencesHeight = getHeight() - graphHeight;\r
}\r
+\r
setPreferredSize(new Dimension(width, sequencesHeight + graphHeight));\r
setBoxPosition();\r
\r
BufferedImage.TYPE_INT_RGB);\r
\r
\r
-\r
Graphics mg = miniMe.getGraphics();\r
- BufferedImage consensus;\r
- Graphics cg;\r
- Graphics g ;\r
-\r
- mg.setColor(Color.white);\r
- mg.fillRect(0, 0, getWidth(), getHeight());\r
- mg.setColor(Color.black);\r
- mg.setFont(new Font("Verdana", Font.BOLD, 15));\r
- mg.drawString("Recalculating", 5, sequencesHeight / 2);\r
- mg.drawString("Overview.....", 5, (sequencesHeight / 2) + 20);\r
\r
- boolean oldRenderGaps = av.renderGaps;\r
+ float sampleCol = (float) alwidth / (float) width;\r
+ float sampleRow = (float) alheight / (float) sequencesHeight;\r
\r
- try\r
+ for (int col = 0; col < width; col++)\r
{\r
- // We'll have to draw the full size alignment in chunks, as an image of the\r
- // whole alignment requires too much memory\r
- // Max size depends on the font size, the following is a\r
- // guess at a size which works\r
- int maxSize = 2000 / av.getFont().getSize();\r
- BufferedImage block;\r
- int blockx = 0;\r
- int blocky = 0;\r
- int blockw = 0;\r
- int blockh = 0;\r
- int eRes = 0;\r
- int eSeq = 0;\r
-\r
- av.setRenderGaps(false);\r
-\r
- for (int sRes = 0, chunkx = 0; sRes < alwidth;\r
- sRes += maxSize, chunkx++)\r
- {\r
- if(resizeAgain)\r
- break;\r
-\r
- eSeq = 0;\r
- eRes += maxSize;\r
-\r
- if (eRes > alwidth)\r
- {\r
- eRes = alwidth;\r
- }\r
-\r
- for (int sSeq = 0, chunky = 0; sSeq < alheight;\r
- sSeq += maxSize, chunky++)\r
- {\r
- if (resizeAgain)\r
- break;\r
- eSeq += maxSize;\r
-\r
- if (eSeq > alheight)\r
- {\r
- eSeq = alheight;\r
- }\r
-\r
- blocky = 0;\r
- blockx = (int) ((float) sRes / (float) alwidth * width);\r
+ for (int row = 0; row < sequencesHeight; row++)\r
+ {\r
+ overviewSeq.drawPanel(mg,\r
+ (int) (col * sampleCol),\r
+ (int) (col * sampleCol),\r
+ (int) (row * sampleRow),\r
+ (int) (row * sampleRow) + 1,\r
+ (int) (col * sampleCol),\r
+ (int) (row * sampleRow), 0);\r
+ mg.translate(0, 1);\r
+\r
+ if (av.conservation != null)\r
+ ap.annotationPanel.drawGraph(mg, av.conservation,\r
+ (int) (sampleCol) + 1,\r
+ graphHeight,\r
+ (int) (col * sampleCol),\r
+ (int) (col * sampleCol) + 1);\r
+\r
+ }\r
+ mg.translate(0, -sequencesHeight);\r
+ mg.translate(1, 0);\r
\r
- block = new BufferedImage((eRes - sRes) * av.charWidth,\r
- (eSeq - sSeq) * av.charHeight,\r
- BufferedImage.TYPE_3BYTE_BGR);\r
- g = block.getGraphics();\r
-\r
- ap.seqPanel.seqCanvas.drawPanel(g, sRes, eRes, sSeq, eSeq,\r
- sRes, sSeq, 0);\r
-\r
- blockh = (int) ((float) (eSeq - sSeq) / (float) alheight * sequencesHeight) +\r
- 1;\r
- blockw = (int) ((float) (eRes - sRes) / (float) alwidth * width) +\r
- 1;\r
-\r
- blocky += (int) ((float) sSeq / (float) alheight * sequencesHeight);\r
-\r
- if(av.conservation!=null)\r
- {\r
- consensus = new BufferedImage( (eRes - sRes) * av.charWidth, 60,\r
- BufferedImage.TYPE_3BYTE_BGR);\r
- cg = consensus.getGraphics();\r
-\r
- ap.annotationPanel.drawGraph(cg, av.conservation,\r
- (eRes - sRes) * av.charWidth, 60, sRes, eRes);\r
-\r
- mg.drawImage(consensus, blockx, sequencesHeight, blockx + blockw,\r
-\r
- sequencesHeight + graphHeight, 0, 0,\r
- (eRes - sRes) * av.charWidth, 60, this);\r
- }\r
-\r
- mg.drawImage(block, blockx, blocky, blockx + blockw,\r
- blocky + blockh, 0, 0, block.getWidth(),\r
- block.getHeight(), null);\r
-\r
- block = null;\r
- repaint();\r
- }\r
-\r
-\r
- }\r
- }\r
- catch (OutOfMemoryError error)\r
- {\r
- System.err.println(\r
- "Out of memory when trying to calculate the overview window image!");\r
}\r
\r
System.gc();\r
\r
- av.setRenderGaps(oldRenderGaps);\r
resizing = false;\r
\r
setBoxPosition();\r
*/\r
public void paintComponent(Graphics g)\r
{\r
- if (miniMe != null)\r
+ if (miniMe != null && !resizing)\r
{\r
g.drawImage(miniMe, 0, 0, this);\r
}\r
g.drawString("Overview.....", 5, (sequencesHeight / 2) + 20);\r
}\r
\r
+\r
g.setColor(Color.red);\r
g.drawRect(boxX, boxY, boxWidth, boxHeight);\r
g.drawRect(boxX + 1, boxY + 1, boxWidth - 2, boxHeight - 2);\r
git://source.jalview.org / jalview.git / blobdiff