import java.awt.image.*;\r
import org.jibble.epsgraphics.*;\r
import javax.imageio.*;\r
+import javax.swing.*;\r
\r
\r
\r
SeqPanel seqPanel;\r
IdPanel idPanel;\r
IdwidthAdjuster idwidthAdjuster;\r
- SecondaryStructurePanel ssPanel;\r
public AlignFrame alignFrame;\r
ScalePanel scalePanel;\r
- ScorePanel scorePanel;\r
+ AnnotationPanel annotationPanel;\r
+ AnnotationLabels alabels;\r
+\r
+ // this value is set false when selection area being dragged\r
+ boolean fastPaint = true;\r
\r
public AlignmentPanel(AlignFrame af, final AlignViewport av)\r
{\r
idPanel = new IdPanel (av, this);\r
\r
scalePanel = new ScalePanel(av, this);\r
- scorePanel = new ScorePanel(av);\r
- ssPanel = new SecondaryStructurePanel(av);\r
-\r
- secondaryPanelHolder.add(ssPanel, BorderLayout.CENTER);\r
\r
idPanelHolder.add(idPanel, BorderLayout.CENTER);\r
idwidthAdjuster = new IdwidthAdjuster(this);\r
idSpaceFillerPanel1.add(idwidthAdjuster, BorderLayout.CENTER);\r
\r
- Dimension d = calculateIdWidth();\r
- d.setSize( d.width+4, d.height);\r
- idPanel.idCanvas.setPreferredSize( d );\r
- hscrollFillerPanel.setPreferredSize( d );\r
+ annotationPanel = new AnnotationPanel(this);\r
+ alabels = new AnnotationLabels(this);\r
\r
- scalePanelHolder.add(scalePanel, BorderLayout.CENTER);\r
- scorePanelHolder.add(scorePanel, BorderLayout.CENTER);\r
- seqPanelHolder.add(seqPanel, BorderLayout.CENTER);\r
+ annotationSpaceFillerHolder.setPreferredSize(annotationPanel.getPreferredSize());\r
+ annotationScroller.setPreferredSize(annotationPanel.getPreferredSize());\r
+ annotationScroller.setViewportView(annotationPanel);\r
+ annotationSpaceFillerHolder.add(alabels, BorderLayout.CENTER);\r
\r
+ fontChanged();\r
\r
- if(seqPanel.seqCanvas.getWidth()==0)\r
- javax.swing.SwingUtilities.invokeLater(new Runnable()\r
- {\r
- public void run()\r
- {\r
- setScrollValues(0,0);\r
- Dimension d = calculateIdWidth();\r
- d.setSize( d.width+4, d.height);\r
- idPanel.idCanvas.setPreferredSize( d );\r
- hscrollFillerPanel.setPreferredSize( d );\r
- RefreshPanels();\r
- }\r
- });\r
+ scalePanelHolder.add(scalePanel, BorderLayout.CENTER);\r
+ seqPanelHolder.add(seqPanel, BorderLayout.CENTER);\r
\r
+ setScrollValues(0, 0);\r
\r
hscroll.addAdjustmentListener(this);\r
vscroll.addAdjustmentListener(this);\r
\r
- addComponentListener(new ComponentAdapter()\r
- {\r
- public void componentResized(ComponentEvent evt)\r
- {\r
- RefreshPanels();\r
- }\r
- });\r
-\r
setFocusable(true);\r
addKeyListener(new KeyAdapter()\r
{\r
{\r
case 27: // escape key\r
av.setSelectionGroup(null);\r
- RefreshPanels();\r
- break;\r
- case KeyEvent.VK_X:\r
- alignFrame.cut_actionPerformed(null);\r
- break;\r
- case KeyEvent.VK_C:\r
- alignFrame.copy_actionPerformed(null);\r
- break;\r
- case KeyEvent.VK_V:\r
- alignFrame.paste(true);\r
- break;\r
- case KeyEvent.VK_A:\r
- alignFrame.selectAllSequenceMenuItem_actionPerformed(null);\r
+ repaint();\r
break;\r
+\r
case KeyEvent.VK_DOWN:\r
alignFrame.moveSelectedSequences(false);\r
break;\r
case KeyEvent.VK_UP:\r
alignFrame.moveSelectedSequences(true);\r
break;\r
- case KeyEvent.VK_F:\r
- alignFrame.findMenuItem_actionPerformed(null);\r
- break;\r
}\r
}\r
});\r
}\r
\r
+ public void fontChanged()\r
+ {\r
+ // set idCanvas bufferedImage to null\r
+ // to prevent drawing old image\r
+ FontMetrics fm = getFontMetrics(av.getFont());\r
+\r
+ scalePanelHolder.setPreferredSize(new Dimension(10, av.charHeight+fm.getDescent()));\r
+ idSpaceFillerPanel1.setPreferredSize(new Dimension(10, av.charHeight+fm.getDescent()));\r
+\r
+ idPanel.idCanvas.gg = null;\r
+ annotationPanel.adjustPanelHeight();\r
+ Dimension d = calculateIdWidth();\r
+ d.setSize(d.width + 4, d.height);\r
+ idPanel.idCanvas.setPreferredSize(d);\r
+ hscrollFillerPanel.setPreferredSize(d);\r
+ repaint();\r
+ }\r
+\r
+\r
Dimension calculateIdWidth()\r
{\r
Graphics g = this.getGraphics();\r
i++;\r
}\r
\r
+ // Also check annotation label widths\r
+ i=0;\r
+ if(al.getAlignmentAnnotation()!=null)\r
+ {\r
+ fm = g.getFontMetrics(alabels.getFont());\r
+ while (i < al.getAlignmentAnnotation().length)\r
+ {\r
+ String label = al.getAlignmentAnnotation()[i].label;\r
+ if (fm.stringWidth(label) > idWidth)\r
+ idWidth = fm.stringWidth(label);\r
+ i++;\r
+ }\r
+ }\r
+\r
return new Dimension(idWidth, 12);\r
}\r
\r
seqPanel.seqCanvas.highlightSearchResults( results );\r
\r
// do we need to scroll the panel?\r
- if(results!=null && (av.getStartSeq()>results[0]\r
- || av.getEndSeq()<results[0]\r
- || av.getStartRes()>results[1]\r
- || av.getEndRes()<results[2]))\r
- setScrollValues(results[1], results[0]);\r
-\r
+ if(results!=null)\r
+ {\r
+ SequenceI seq = av.alignment.getSequenceAt(results[0]);\r
+ int start = seq.findIndex( results[1] )-1;\r
+ int end = seq.findIndex( results[2] )-1;\r
+ if( av.getStartRes() > start\r
+ || av.getEndRes() < end\r
+ || (av.getStartSeq() > results[0]\r
+ || av.getEndSeq() < results[0]))\r
+ setScrollValues(start, results[0]);\r
+ }\r
\r
}\r
\r
}\r
\r
\r
- public void setGraphPanelVisible(boolean b)\r
+ public void setAnnotationVisible(boolean b)\r
{\r
- idSpaceFillerPanel.setVisible(b);\r
- scorePanelHolder.setVisible(b);\r
-\r
- RefreshPanels();\r
- // bit annoying to call this twice, can you do better?\r
- RefreshPanels();\r
+ annotationSpaceFillerHolder.setVisible(b);\r
+ annotationScroller.setVisible(b);\r
}\r
\r
- public void setSecondaryStructureVisible(boolean b)\r
- {\r
- secondaryPanelHolder.setVisible(b);\r
- RefreshPanels();\r
- }\r
\r
public void setWrapAlignment(boolean wrap)\r
{\r
- scorePanelHolder.setVisible(!wrap);\r
scalePanelHolder.setVisible(!wrap);\r
- secondaryPanelHolder.setVisible(!wrap);\r
-\r
hscroll.setVisible(!wrap);\r
-\r
idwidthAdjuster.setVisible(!wrap);\r
- idSpaceFillerPanel.setVisible(!wrap);\r
+\r
+ av.setShowAnnotation(!wrap);\r
+ annotationScroller.setVisible(!wrap);\r
+ annotationSpaceFillerHolder.setVisible(!wrap);\r
idSpaceFillerPanel1.setVisible(!wrap);\r
\r
- RefreshPanels();\r
+ repaint();\r
\r
}\r
\r
al.getWidth() );\r
\r
c.calculate();\r
- c.verdict(false, 100);\r
+ c.verdict(false, av.ConsPercGaps);\r
ConservationColourScheme ccs = new ConservationColourScheme(c, cs);\r
\r
av.setGlobalColourScheme( ccs );\r
\r
}\r
\r
- RefreshPanels();\r
+ repaint();\r
}\r
\r
- public void RefreshPanels()\r
- {\r
-\r
- requestFocus();\r
- invalidate();\r
- idPanelHolder.setPreferredSize(idPanel.idCanvas.getPreferredSize());\r
- if(idPanel.idCanvas.getPreferredSize()!=null)\r
- hscrollFillerPanel.setPreferredSize(new Dimension(idPanel.idCanvas.getPreferredSize().width, 12));\r
- idSpaceFillerPanel1.setPreferredSize(new Dimension(500,\r
- av.charHeight / 2 + 12));\r
- scalePanelHolder.setPreferredSize(new Dimension(500,\r
- av.charHeight / 2 + 12));\r
-\r
- if (av.getWrapAlignment())\r
- {\r
- int max = av.alignment.getWidth() /\r
- (seqPanel.seqCanvas.getWidth() / av.charWidth)+1 ;\r
-\r
- vscroll.setValues(0, 1, 0, max);\r
- }\r
- else\r
- {\r
- av.getConsensus(true);\r
- if (overviewPanel != null)\r
- overviewPanel.updateOverviewImage();\r
- setScrollValues(av.getStartRes(), av.getStartSeq());\r
- }\r
-\r
- repaint();\r
- }\r
\r
int hextent = 0;\r
int vextent = 0;\r
{\r
if(vscroll.getValue()<1)\r
return false;\r
+ fastPaint = false;\r
vscroll.setValue(vscroll.getValue() - 1);\r
}\r
else\r
{\r
if(vextent+vscroll.getValue() >= av.getAlignment().getHeight())\r
return false;\r
+ fastPaint = false;\r
vscroll.setValue(vscroll.getValue() + 1);\r
}\r
-\r
+ fastPaint = true;\r
return true;\r
}\r
\r
public boolean scrollRight(boolean right)\r
{\r
- if(right)\r
- {\r
- if(hscroll.getValue()<1)\r
- return false;\r
- hscroll.setValue(hscroll.getValue() - 1);\r
- }\r
- else\r
- {\r
- if(hextent+hscroll.getValue() >= av.getAlignment().getWidth())\r
- return false;\r
- hscroll.setValue(hscroll.getValue() + 1);\r
- }\r
\r
- return true;\r
- }\r
+ if (right)\r
+ {\r
+ if (hscroll.getValue() < 1)\r
+ return false;\r
+ fastPaint = false;\r
+ hscroll.setValue(hscroll.getValue() - 1);\r
+ }\r
+ else\r
+ {\r
+ if (hextent + hscroll.getValue() >= av.getAlignment().getWidth())\r
+ return false;\r
+ fastPaint = false;\r
+ hscroll.setValue(hscroll.getValue() + 1);\r
+ }\r
+ fastPaint = true;\r
+ return true;\r
+ }\r
\r
\r
public void setScrollValues(int x, int y)\r
{\r
+ av.setEndRes(x + seqPanel.seqCanvas.getWidth()/av.getCharWidth()-1);\r
+\r
hextent = seqPanel.seqCanvas.getWidth()/av.charWidth;\r
vextent = seqPanel.seqCanvas.getHeight()/av.charHeight;\r
\r
hscroll.setValues(x,hextent,0,av.getAlignment().getWidth());\r
vscroll.setValues(y,vextent,0,av.getAlignment().getHeight() );\r
\r
- repaint();\r
+\r
\r
}\r
\r
\r
public void adjustmentValueChanged(AdjustmentEvent evt)\r
{\r
+ int oldX = av.getStartRes();\r
+ int oldY = av.getStartSeq();\r
\r
if (evt.getSource() == hscroll)\r
{\r
int offy = vscroll.getValue();\r
if (av.getWrapAlignment())\r
{\r
- av.setStartRes( vscroll.getValue() * av.getChunkWidth());\r
+ int rowSize = seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getWidth());\r
+ av.setStartRes( vscroll.getValue() * rowSize );\r
+ av.setEndRes( (vscroll.getValue()+1) * rowSize );\r
}\r
else\r
{\r
}\r
}\r
\r
-\r
if(overviewPanel!=null)\r
overviewPanel.setBoxPosition();\r
\r
- repaint();\r
+ if(av.getWrapAlignment() || !fastPaint)\r
+ repaint();\r
+ else\r
+ {\r
+ idPanel.idCanvas.fastPaint(av.getStartSeq() - oldY);\r
+ seqPanel.seqCanvas.fastPaint(av.getStartRes() - oldX,\r
+ av.getStartSeq() - oldY);\r
+\r
+ scalePanel.repaint();\r
+ if (av.getShowAnnotation())\r
+ annotationPanel.fastPaint(av.getStartRes() - oldX);\r
+ }\r
+\r
+ }\r
+\r
+\r
+ public void paintComponent(Graphics g)\r
+ {\r
+ invalidate();\r
+ Dimension d = idPanel.idCanvas.getPreferredSize();\r
+ idPanelHolder.setPreferredSize(d);\r
+ hscrollFillerPanel.setPreferredSize(new Dimension(d.width, 12));\r
+ validate();\r
+\r
+ if (av.getWrapAlignment())\r
+ {\r
+ int max = av.alignment.getWidth() / seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getWidth());\r
+ vscroll.setMaximum(max);\r
+ vscroll.setUnitIncrement(1);\r
+ vscroll.setVisibleAmount(1);\r
+ }\r
+ else\r
+ {\r
+ setScrollValues(av.getStartRes(), av.getStartSeq());\r
+ }\r
+\r
+\r
+\r
}\r
\r
public int print(Graphics pg, PageFormat pf, int pi) throws PrinterException\r
public int printUnwrapped(Graphics pg, int pwidth, int pheight, int pi) throws PrinterException\r
{\r
\r
- int idWidth = calculateIdWidth().width;\r
+ int idWidth = calculateIdWidth().width + 4;\r
+ FontMetrics fm = getFontMetrics(av.getFont());\r
+ int scaleHeight = av.charHeight + fm.getDescent();\r
\r
+ pg.setColor(Color.white);\r
+ pg.fillRect(0, 0, pwidth, pheight);\r
+ pg.setFont(av.getFont());\r
\r
- pg.setColor(Color.white);\r
- pg.fillRect(0,0,pwidth, pheight);\r
- pg.setFont( av.getFont() );\r
+ ////////////////////////////////////\r
+ /// How many sequences and residues can we fit on a printable page?\r
+ int totalRes = (pwidth - idWidth) / av.getCharWidth();\r
\r
- ////////////////////////////////////\r
- /// How many sequences and residues can we fit on a printable page?\r
- int totalRes = (pwidth - idWidth)/av.getCharWidth();\r
- int totalSeq = (int)((pheight - 30)/av.getCharHeight())-1;\r
- int pagesWide = av.getAlignment().getWidth() / totalRes +1;\r
- int pagesHigh = av.getAlignment().getHeight() / totalSeq +1;\r
+ int totalSeq = (int) ( (pheight - scaleHeight) / av.getCharHeight()) - 1;\r
\r
- if (pi >= pagesWide*pagesHigh)\r
- return Printable.NO_SUCH_PAGE;\r
+ int pagesWide = av.getAlignment().getWidth() / totalRes + 1;\r
\r
- /////////////////////////////\r
- /// Only print these sequences and residues on this page\r
- int startRes, endRes, startSeq, endSeq;\r
- startRes = (pi % pagesWide) * totalRes;\r
- endRes = startRes + totalRes-1;\r
- if(endRes>av.getAlignment().getWidth())\r
- endRes = av.getAlignment().getWidth();\r
+ /////////////////////////////\r
+ /// Only print these sequences and residues on this page\r
+ int startRes, endRes, startSeq, endSeq;\r
+ startRes = (pi % pagesWide) * totalRes;\r
+ endRes = startRes + totalRes - 1;\r
+ if (endRes > av.getAlignment().getWidth()-1)\r
+ endRes = av.getAlignment().getWidth()-1;\r
\r
- startSeq = (pi / pagesWide) * totalSeq;\r
- endSeq = startSeq + totalSeq;\r
- if(endSeq > av.getAlignment().getHeight())\r
- endSeq = av.getAlignment().getHeight();\r
+ startSeq = (pi / pagesWide) * totalSeq;\r
+ endSeq = startSeq + totalSeq;\r
+ if (endSeq > av.getAlignment().getHeight())\r
+ endSeq = av.getAlignment().getHeight();\r
\r
+ int pagesHigh = ( (av.alignment.getHeight() / totalSeq) + 1) * pheight;\r
\r
- ////////////////\r
- //draw Scale\r
- pg.translate(30,0);\r
- scalePanel.drawScale(pg, startRes, endRes, pwidth-idWidth);\r
+ if (av.showAnnotation)\r
+ pagesHigh += annotationPanel.getHeight();\r
\r
- pg.translate(-30, 30);\r
- ////////////////\r
- // Draw the ids\r
- Color currentColor=null;\r
- Color currentTextColor=null;\r
- for(int i=startSeq; i<endSeq; i++)\r
- {\r
- if (av.getSelectionGroup()!=null && av.getSelectionGroup().sequences.contains(av.getAlignment().getSequenceAt(i)))\r
- {\r
- currentColor = Color.gray;\r
- currentTextColor = Color.black;\r
- }\r
- else\r
+ pagesHigh /= pheight;\r
+\r
+ if (pi >= pagesWide * pagesHigh)\r
+ return Printable.NO_SUCH_PAGE;\r
+\r
+ //draw Scale\r
+ pg.translate(idWidth, 0);\r
+ scalePanel.drawScale(pg, startRes, endRes, pwidth - idWidth, scaleHeight);\r
+ pg.translate( -idWidth, scaleHeight);\r
+ ////////////////\r
+ // Draw the ids\r
+ Color currentColor = null;\r
+ Color currentTextColor = null;\r
+ for (int i = startSeq; i < endSeq; i++)\r
{\r
- currentColor = av.getAlignment().getSequenceAt(i).getColor();\r
- currentTextColor = Color.black;\r
- }\r
+ if (av.getSelectionGroup() != null &&\r
+ av.getSelectionGroup().sequences.\r
+ contains(av.getAlignment().getSequenceAt(i)))\r
+ {\r
+ currentColor = Color.gray;\r
+ currentTextColor = Color.black;\r
+ }\r
+ else\r
+ {\r
+ currentColor = av.getAlignment().getSequenceAt(i).getColor();\r
+ currentTextColor = Color.black;\r
+ }\r
+\r
+ pg.setColor(currentColor);\r
+ pg.fillRect(0,\r
+ jalview.analysis.AlignmentUtil.getPixelHeight(startSeq, i,\r
+ av.getCharHeight()),\r
+ idWidth,\r
+ av.getCharHeight());\r
\r
- pg.setColor(currentColor);\r
- pg.fillRect(0, jalview.analysis.AlignmentUtil.getPixelHeight(startSeq, i, av.getCharHeight()),\r
- idWidth,\r
- av.getCharHeight());\r
+ pg.setColor(currentTextColor);\r
\r
- pg.setColor(currentTextColor);\r
+ String string = av.getAlignment().getSequenceAt(i).getName();\r
+ if (av.getShowFullId())\r
+ string = av.getAlignment().getSequenceAt(i).getDisplayId();\r
\r
- String string = av.getAlignment().getSequenceAt(i).getName();\r
- if(av.getShowFullId())\r
- string = av.getAlignment().getSequenceAt(i).getDisplayId();\r
+ pg.drawString(string, 0, jalview.analysis.AlignmentUtil.getPixelHeight\r
+ (startSeq, i, av.getCharHeight()) + av.getCharHeight() -\r
+ (av.getCharHeight() / 5));\r
+ }\r
\r
- pg.drawString(string, 0, jalview.analysis.AlignmentUtil.getPixelHeight\r
- (startSeq, i, av.getCharHeight()) + av.getCharHeight() - (av.getCharHeight() / 5));\r
- }\r
+ // draw main sequence panel\r
+ pg.translate(idWidth, 0);\r
+ seqPanel.seqCanvas.drawPanel(pg, startRes, endRes, startSeq, endSeq,\r
+ startRes, startSeq, 0);\r
\r
- // draw main sequence panel\r
- pg.translate(idWidth+4,0);\r
- pg.setClip(0,0,pwidth-idWidth, pheight);\r
- seqPanel.seqCanvas.drawPanel(pg,startRes,endRes,startSeq,endSeq,startRes,startSeq,0);\r
\r
- return Printable.PAGE_EXISTS;\r
+ if (av.showAnnotation && endSeq == av.alignment.getHeight())\r
+ {\r
+ pg.translate( -idWidth, (endSeq - startSeq) * av.charHeight);\r
+ alabels.drawComponent( (Graphics2D) pg);\r
+ pg.translate(idWidth, 0);\r
+ annotationPanel.drawComponent( (Graphics2D) pg, startRes, endRes+1);\r
+ }\r
+\r
+ return Printable.PAGE_EXISTS;\r
+\r
}\r
\r
\r
public int printWrappedAlignment(Graphics pg, int pwidth, int pheight, int pi) throws PrinterException\r
{\r
+ int idWidth = calculateIdWidth().width + 4;\r
+\r
+ int resWidth = seqPanel.seqCanvas.getWrappedCanvasWidth(pwidth - idWidth);\r
+ int totalHeight = totalHeight = (av.alignment.getHeight() + 2) *\r
+ ( (av.alignment.getWidth()\r
+ / resWidth) + 1) * av.charHeight;\r
\r
- int idWidth = calculateIdWidth().width;\r
\r
- if( seqPanel.seqCanvas.getWidth() < pwidth-idWidth)\r
- pwidth = seqPanel.seqCanvas.getWidth() + idWidth;\r
+ pg.setColor(Color.white);\r
+ pg.fillRect(0, 0, pwidth, pheight);\r
+ pg.setFont(av.getFont());\r
\r
+ ////////////////\r
+ // Draw the ids\r
+ pg.setColor(Color.black);\r
\r
- pg.setColor(Color.white);\r
- pg.fillRect(0,0,pwidth, pheight);\r
- pg.setFont( av.getFont() );\r
+ pg.translate(0, -pi * pheight);\r
\r
- ////////////////////////////////////\r
- /// How many sequences and residues can we fit on a printable page?\r
- AlignmentI da = av.alignment;\r
- int endy = da.getHeight();\r
- int chunkHeight = (da.getHeight() + 2)*av.charHeight;\r
- int chunkWidth = (pwidth-idWidth)/av.charWidth;\r
+ pg.setClip(0,pi*pheight,pwidth, pheight);\r
\r
- int noChunksOnPage = pheight / chunkHeight;\r
- int totalChunks = da.getWidth() / chunkWidth;\r
+ int ypos = 2 * av.charHeight;\r
+ do\r
+ {\r
+ for (int i = 0; i < av.alignment.getHeight(); i++)\r
+ {\r
+ SequenceI s = av.alignment.getSequenceAt(i);\r
+ String string = s.getName();\r
+ if (av.getShowFullId())\r
+ string = s.getDisplayId();\r
\r
- if ( pi*noChunksOnPage > totalChunks )\r
- return Printable.NO_SUCH_PAGE;\r
+ pg.drawString(string, 0,\r
+ AlignmentUtil.getPixelHeight(0, i, av.charHeight) +\r
+ ypos +\r
+ av.charHeight - (av.charHeight / 5));\r
\r
- ////////////////\r
- // Draw the ids\r
- pg.setClip(0,0,pwidth, noChunksOnPage*chunkHeight);\r
+ }\r
\r
- int row = pi*noChunksOnPage;\r
- pg.setColor(Color.black);\r
- for(int ypos=2*av.charHeight;\r
- ypos <= pheight && row*chunkWidth<da.getWidth();\r
- ypos += chunkHeight, row++ )\r
- {\r
- for (int i = 0; i < endy; i++)\r
- {\r
- SequenceI s = da.getSequenceAt(i);\r
- String string = s.getName();\r
- if (av.getShowFullId())\r
- string = s.getDisplayId();\r
+ ypos += (av.alignment.getHeight() + 2) * av.charHeight;\r
\r
- pg.drawString(string, 0,\r
- AlignmentUtil.getPixelHeight(0, i, av.charHeight) + ypos +\r
- av.charHeight - (av.charHeight / 5));\r
}\r
- }\r
+ while (ypos < totalHeight);\r
+\r
+ pg.translate(idWidth, 0);\r
\r
- // draw main sequence panel\r
- pg.translate(idWidth+4,0);\r
- seqPanel.seqCanvas.drawWrappedPanel(pg, pwidth-idWidth, pheight, pi*noChunksOnPage*chunkWidth);\r
+ seqPanel.seqCanvas.drawWrappedPanel(pg, pwidth - idWidth, totalHeight, 0);\r
+\r
+ if (pi * pheight < totalHeight)\r
+ return Printable.PAGE_EXISTS;\r
+ else\r
+ return Printable.NO_SUCH_PAGE;\r
\r
\r
- return Printable.PAGE_EXISTS;\r
\r
}\r
\r
height = (av.alignment.getHeight()+1) * av.charHeight + 30;\r
width = idPanel.getWidth() + av.alignment.getWidth() * av.charWidth;\r
}\r
+ if(av.getShowAnnotation())\r
+ {\r
+ height += annotationPanel.getPreferredSize().height;\r
+ }\r
\r
try\r
{\r
width = idPanel.getWidth() + av.alignment.getWidth() * av.charWidth;\r
}\r
\r
+ if(av.getShowAnnotation())\r
+ {\r
+ height += annotationPanel.getPreferredSize().height;\r
+ }\r
+\r
\r
\r
try\r
FileOutputStream out = new FileOutputStream(chooser.getSelectedFile());\r
\r
BufferedImage bi = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);\r
- Graphics png = bi.getGraphics();\r
+ Graphics2D png = (Graphics2D)bi.getGraphics();\r
\r
+ png.setRenderingHint(RenderingHints.KEY_ANTIALIASING,RenderingHints.VALUE_ANTIALIAS_ON);\r
\r
if (av.getWrapAlignment())\r
printWrappedAlignment(png, width, height, 0);\r
\r
}\r
\r
+class Preview extends JFrame\r
+{\r
+\r
+ public Preview(Image image)\r
+ {\r
+ setResizable(true);\r
+ setSize(image.getWidth(this), image.getHeight(this));\r
+ setVisible(true);\r
+ getContentPane().setLayout(new BorderLayout());\r
+ getContentPane().add(new PreviewPanel(image), BorderLayout.CENTER);\r
+ validate();\r
+ repaint();\r
+ }\r
+}\r
+\r
+class PreviewPanel extends JPanel\r
+{\r
+ Image image;\r
+ public PreviewPanel(Image image)\r
+ {\r
+ this.image = image;\r
+ }\r
+ public void paintComponent(Graphics g)\r
+ {\r
+ if(image!=null)\r
+ g.drawImage(image,0,0,this);\r
+ else\r
+ System.out.println("image is null");\r
+ }\r
+}\r
+\r
\r
\r
\r
git://source.jalview.org / jalview.git / blobdiff