X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignmentPanel.java;h=50c89f556802e61319f45994459d898db711a4b3;hb=eee02848424734a9466de35ff19636377652e59b;hp=76fc8d5cc86f61268a43dbeb586c0616e30bfea6;hpb=2b9c6a8948800edf58dd055631920654729fd675;p=jalview.git

diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index 76fc8d5..50c89f5 100755
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -1,596 +1,1086 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * Copyright (C) 2005 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
 package jalview.gui;
 
-import jalview.jbgui.GAlignmentPanel;
-import jalview.schemes.*;
-import jalview.analysis.*;
 import jalview.datamodel.*;
+
+import jalview.jbgui.*;
+
+import jalview.schemes.*;
+
+import org.jibble.epsgraphics.*;
+
 import java.awt.*;
 import java.awt.event.*;
+import java.awt.image.*;
 import java.awt.print.*;
+
 import java.io.*;
-import java.awt.image.*;
-import org.jibble.epsgraphics.*;
+
 import javax.imageio.*;
 
+import javax.swing.*;
 
 
-public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListener, Printable
+/**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
+public class AlignmentPanel extends GAlignmentPanel
+    implements AdjustmentListener, Printable
 {
-
-  AlignViewport     av;
-  OverviewPanel overviewPanel;
-  SeqPanel   seqPanel;
-  IdPanel    idPanel;
-  SecondaryStructurePanel ssPanel;
-  public AlignFrame alignFrame;
-  ScalePanel scalePanel;
-  ScorePanel scorePanel;
-
-  public AlignmentPanel(AlignFrame af, final AlignViewport av)
-  {
-    alignFrame = af;
-    this.av         = av;
-    seqPanel        = new SeqPanel  (av, this);
-    idPanel         = new IdPanel   (av, this);
-
-    scalePanel = new ScalePanel(av, this);
-    scorePanel = new ScorePanel(av);
-    ssPanel = new SecondaryStructurePanel(av);
-
-    secondaryPanelHolder.add(ssPanel, BorderLayout.CENTER);
-
-    idPanelHolder.add(idPanel, BorderLayout.CENTER);
-    IdwidthAdjuster iap = new IdwidthAdjuster(this);
-    idSpaceFillerPanel1.add(iap, BorderLayout.CENTER);
-
-    Dimension d = calculateIdWidth();
-    d.setSize( d.width+4, d.height);
-    idPanel.idCanvas.setPreferredSize( d );
-    hscrollFillerPanel.setPreferredSize( d );
-
-    scalePanelHolder.add(scalePanel, BorderLayout.CENTER);
-    scorePanelHolder.add(scorePanel, BorderLayout.CENTER);
-    seqPanelHolder.add(seqPanel, BorderLayout.CENTER);
-    setScrollValues(0,0);
-
-    hscroll.addAdjustmentListener(this);
-    vscroll.addAdjustmentListener(this);
-
-    addComponentListener(new ComponentAdapter()
-   {
-     public void componentResized(ComponentEvent evt)
-     {
-          RefreshPanels();
-     }
-   });
-
-
-  // hscroll.setFocusable(false);
-  // vscroll.setFocusable(false);
-   setFocusable(true);
-
-   addKeyListener(new KeyAdapter()
-   {
-     public void keyPressed(KeyEvent evt)
-     {
-       switch(evt.getKeyCode())
-       {
-         case  27: // escape key
-           av.setSelectionGroup(null);
-           RefreshPanels();
-           break;
-         case KeyEvent.VK_X:
-           alignFrame.cut_actionPerformed(null);
-           break;
-         case KeyEvent.VK_C:
-           alignFrame.copy_actionPerformed(null);
-           break;
-         case KeyEvent.VK_V:
-           alignFrame.paste(true);
-           break;
-         case KeyEvent.VK_A:
-           alignFrame.selectAllSequenceMenuItem_actionPerformed(null);
-           break;
-        case KeyEvent.VK_DOWN:
-          alignFrame.moveSelectedSequences(false);
-          break;
-        case KeyEvent.VK_UP:
-          alignFrame.moveSelectedSequences(true);
-          break;
-        case KeyEvent.VK_F:
-          alignFrame.findMenuItem_actionPerformed(null);
-          break;
-       }
-     }
-   });
-  }
-
-  Dimension calculateIdWidth()
-  {
-    Graphics g = this.getGraphics();
-    if(g==null)
+    AlignViewport av;
+    OverviewPanel overviewPanel;
+    SeqPanel seqPanel;
+    IdPanel idPanel;
+    IdwidthAdjuster idwidthAdjuster;
+
+    /** DOCUMENT ME!! */
+    public AlignFrame alignFrame;
+    ScalePanel scalePanel;
+    AnnotationPanel annotationPanel;
+    AnnotationLabels alabels;
+
+    // this value is set false when selection area being dragged
+    boolean fastPaint = true;
+    int hextent = 0;
+    int vextent = 0;
+
+    /**
+     * Creates a new AlignmentPanel object.
+     *
+     * @param af DOCUMENT ME!
+     * @param av DOCUMENT ME!
+     */
+    public AlignmentPanel(AlignFrame af, final AlignViewport av)
     {
-      javax.swing.JFrame f = new javax.swing.JFrame();
-      f.addNotify();
-      g = f.getGraphics();
-    }
+        alignFrame = af;
+        this.av = av;
+        seqPanel = new SeqPanel(av, this);
+        idPanel = new IdPanel(av, this);
 
-    FontMetrics fm = g.getFontMetrics(av.font);
-    AlignmentI al = av.getAlignment();
+        scalePanel = new ScalePanel(av, this);
 
-       int i   = 0;
-       int idWidth = 0;
-       String id;
-       while (i < al.getHeight() && al.getSequenceAt(i) != null)
-       {
-         SequenceI s   = al.getSequenceAt(i);
-         if(av.getShowFullId())
-           id   = s.getDisplayId();
-         else
-           id = s.getName();
-
-         if (fm.stringWidth(id) > idWidth)
-           idWidth = fm.stringWidth(id);
-         i++;
-       }
+        idPanelHolder.add(idPanel, BorderLayout.CENTER);
+        idwidthAdjuster = new IdwidthAdjuster(this);
+        idSpaceFillerPanel1.add(idwidthAdjuster, BorderLayout.CENTER);
 
-       return new Dimension(idWidth, 12);
-  }
+        annotationPanel = new AnnotationPanel(this);
+        alabels = new AnnotationLabels(this);
 
+        annotationSpaceFillerHolder.setPreferredSize(annotationPanel.getPreferredSize());
+        annotationScroller.setPreferredSize(annotationPanel.getPreferredSize());
+        annotationScroller.setViewportView(annotationPanel);
+        annotationSpaceFillerHolder.add(alabels, BorderLayout.CENTER);
 
- public void highlightSearchResults(int [] results)
- {
-   seqPanel.seqCanvas.highlightSearchResults( results );
+        fontChanged();
 
-   // do we need to scroll the panel?
-   if(results!=null && (av.getStartSeq()>results[0]
-                        || av.getEndSeq()<results[0]
-                        || av.getStartRes()>results[1]
-                        || av.getEndRes()<results[2]))
-       setScrollValues(results[1], results[0]);
+        scalePanelHolder.add(scalePanel, BorderLayout.CENTER);
+        seqPanelHolder.add(seqPanel, BorderLayout.CENTER);
 
+        setScrollValues(0, 0);
 
- }
+        hscroll.addAdjustmentListener(this);
+        vscroll.addAdjustmentListener(this);
 
+        setFocusable(true);
+        addKeyListener(new KeyAdapter()
+            {
+                public void keyPressed(KeyEvent evt)
+                {
+                    switch (evt.getKeyCode())
+                    {
+                    case 27: // escape key
+                        av.setSelectionGroup(null);
+                        repaint();
 
- public OverviewPanel getOverviewPanel()
- {
-   return overviewPanel;
- }
+                        break;
 
- public void setOverviewPanel(OverviewPanel op)
- {
-   overviewPanel = op;
- }
+                    case KeyEvent.VK_DOWN:
+                        alignFrame.moveSelectedSequences(false);
 
+                        break;
 
-  public void setGraphPanelVisible(boolean b)
-  {
-    idSpaceFillerPanel.setVisible(b);
-    scorePanelHolder.setVisible(b);
+                    case KeyEvent.VK_UP:
+                        alignFrame.moveSelectedSequences(true);
 
-    RefreshPanels();
-    // bit annoying to call this twice, can you do better?
-    RefreshPanels();
-  }
+                        break;
 
-  public void setSecondaryStructureVisible(boolean b)
-  {
-    secondaryPanelHolder.setVisible(b);
-    RefreshPanels();
-  }
+                    case KeyEvent.VK_BACK_SPACE:
+                    case KeyEvent.VK_DELETE:
+                      alignFrame.cut_actionPerformed(null);
+                      break;
+                    }
 
-  public void setWrapAlignment(boolean wrap)
-  {
-    scorePanelHolder.setVisible(!wrap);
-    scalePanelHolder.setVisible(!wrap);
-    secondaryPanelHolder.setVisible(!wrap);
+                }
+            });
+    }
 
-    hscroll.setVisible(!wrap);
+    /**
+     * DOCUMENT ME!
+     */
+    public void fontChanged()
+    {
+        // set idCanvas bufferedImage to null
+        // to prevent drawing old image
+        FontMetrics fm = getFontMetrics(av.getFont());
 
-    idSpaceFillerPanel.setVisible(!wrap);
-    idSpaceFillerPanel1.setVisible(!wrap);
+        scalePanelHolder.setPreferredSize(new Dimension(10,
+                av.charHeight + fm.getDescent()));
+        idSpaceFillerPanel1.setPreferredSize(new Dimension(10,
+                av.charHeight + fm.getDescent()));
 
-    RefreshPanels();
+        idPanel.idCanvas.gg = null;
+        seqPanel.seqCanvas.img = null;
+        annotationPanel.adjustPanelHeight();
 
-  }
+        Dimension d = calculateIdWidth();
+        d.setSize(d.width + 4, d.height);
+        idPanel.idCanvas.setPreferredSize(d);
+        hscrollFillerPanel.setPreferredSize(d);
 
+        if (av.getWrapAlignment())
+        {
+          int max = av.alignment.getWidth() /
+              seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getWidth());
+          vscroll.setMaximum(max);
+          vscroll.setUnitIncrement(1);
+          vscroll.setVisibleAmount(1);
+        }
+        else
+        {
+          setScrollValues(av.getStartRes(), av.getStartSeq());
+        }
 
-  public void setColourScheme()
-  {
-    ColourSchemeI cs = av.getGlobalColourScheme();
+        if(overviewPanel!=null)
+          overviewPanel.setBoxPosition();
 
-    if(av.getConservationSelected())
+        repaint();
+    }
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @return DOCUMENT ME!
+     */
+    public Dimension calculateIdWidth()
     {
+      Container c = new Container();
 
-       Alignment al = (Alignment)av.getAlignment();
-       Conservation c = new Conservation("All",
-                            ResidueProperties.propHash, 3, al.getSequences(), 0,
-                            al.getWidth() );
+        FontMetrics fm = c.getFontMetrics(av.font);
+        AlignmentI al = av.getAlignment();
 
-       c.calculate();
-       c.verdict(false, 100);
-       ConservationColourScheme ccs = new ConservationColourScheme(c, cs);
+        int i = 0;
+        int idWidth = 0;
+        String id;
 
-       av.setGlobalColourScheme( ccs );
+        while ((i < al.getHeight()) && (al.getSequenceAt(i) != null))
+        {
+            SequenceI s = al.getSequenceAt(i);
 
-    }
+            if (av.getShowFullId())
+            {
+                id = s.getDisplayId();
+            }
+            else
+            {
+                id = s.getName();
+            }
 
-    RefreshPanels();
-  }
-
-  public void RefreshPanels()
-  {
-              requestFocus();
-              invalidate();
-              idPanelHolder.setPreferredSize(idPanel.idCanvas.getPreferredSize());
-              if(idPanel.idCanvas.getPreferredSize()!=null)
-                hscrollFillerPanel.setPreferredSize(new Dimension(idPanel.idCanvas.getPreferredSize().width, 12));
-              idSpaceFillerPanel1.setPreferredSize(new Dimension(500,
-                  av.charHeight / 2 + 12));
-              scalePanelHolder.setPreferredSize(new Dimension(500,
-                  av.charHeight / 2 + 12));
-              if (av.getWrapAlignment())
-              {
-                int max = av.alignment.getWidth() /
-                    (seqPanel.seqCanvas.getWidth() / av.charWidth) + 1;
-
-                int h = (av.alignment.getHeight() + 2) * av.charHeight;
-                vextent = seqPanel.seqCanvas.getHeight() / h;
-                vscroll.setValues(0, vextent, 0, max);
-              }
-              else
-
-                setScrollValues(av.getStartRes(), av.getStartSeq());
-              av.getConsensus(true);
-              if (overviewPanel != null)
-                overviewPanel.updateOverviewImage();
-
-          validate();
-          repaint();
-  }
-  int hextent = 0;
-  int vextent = 0;
+            if (fm.stringWidth(id) > idWidth)
+            {
+                idWidth = fm.stringWidth(id);
+            }
 
+            i++;
+        }
 
-  // return value is true if the scroll is valid
-  public boolean scrollUp(boolean up)
-  {
-    if(up)
-    {
-      if(vscroll.getValue()<1)
-        return false;
-      vscroll.setValue(vscroll.getValue() - 1);
-    }
-    else
-    {
-     if(vextent+vscroll.getValue() >= av.getAlignment().getHeight())
-       return false;
-      vscroll.setValue(vscroll.getValue() + 1);
-    }
+        // Also check annotation label widths
+        i = 0;
 
-    return true;
-  }
+        if (al.getAlignmentAnnotation() != null)
+        {
+            fm = c.getFontMetrics(alabels.getFont());
 
-  public boolean scrollRight(boolean right)
-  {
-    if(right)
-   {
-     if(hscroll.getValue()<1)
-       return false;
-     hscroll.setValue(hscroll.getValue() - 1);
-   }
-   else
-   {
-    if(hextent+hscroll.getValue() >= av.getAlignment().getWidth())
-      return false;
-     hscroll.setValue(hscroll.getValue() + 1);
-   }
+            while (i < al.getAlignmentAnnotation().length)
+            {
+                String label = al.getAlignmentAnnotation()[i].label;
 
-   return true;
- }
+                if (fm.stringWidth(label) > idWidth)
+                {
+                    idWidth = fm.stringWidth(label);
+                }
 
+                i++;
+            }
+        }
 
-  public void setScrollValues(int x, int y)
-  {
-    hextent = seqPanel.seqCanvas.getWidth()/av.getCharWidth();
-    vextent = seqPanel.seqCanvas.getHeight()/av.getCharHeight();
-
-    if(hextent+x  >  av.getAlignment().getWidth())
-      x =  av.getAlignment().getWidth()- hextent;
+        return new Dimension(idWidth, 12);
+    }
 
-    if(vextent+y > av.getAlignment().getHeight())
-      y = av.getAlignment().getHeight() - vextent;
+    /**
+     * DOCUMENT ME!
+     *
+     * @param results DOCUMENT ME!
+     */
+    public void highlightSearchResults(int[] results)
+    {
+        seqPanel.seqCanvas.highlightSearchResults(results);
+
+        // do we need to scroll the panel?
+        if (results != null)
+        {
+            SequenceI seq = av.alignment.getSequenceAt(results[0]);
+            int start = seq.findIndex(results[1]) - 1;
+            int end = seq.findIndex(results[2]) - 1;
+
+            if ((av.getStartRes() > start) || (av.getEndRes() < end) ||
+                    ((av.getStartSeq() > results[0]) ||
+                    (av.getEndSeq() < results[0])))
+            {
+                setScrollValues(start, results[0]);
+            }
+        }
+    }
 
-    if(y<0)
-      y = 0;
+    /**
+     * DOCUMENT ME!
+     *
+     * @return DOCUMENT ME!
+     */
+    public OverviewPanel getOverviewPanel()
+    {
+        return overviewPanel;
+    }
 
-    if(x<0)
-      x=0;
+    /**
+     * DOCUMENT ME!
+     *
+     * @param op DOCUMENT ME!
+     */
+    public void setOverviewPanel(OverviewPanel op)
+    {
+        overviewPanel = op;
+    }
 
-    hscroll.setValues(x,hextent,0,av.getAlignment().getWidth());
-    vscroll.setValues(y,vextent,0,av.getAlignment().getHeight() );
+    /**
+     * DOCUMENT ME!
+     *
+     * @param b DOCUMENT ME!
+     */
+    public void setAnnotationVisible(boolean b)
+    {
+        annotationSpaceFillerHolder.setVisible(b);
+        annotationScroller.setVisible(b);
+    }
 
+    /**
+     * DOCUMENT ME!
+     *
+     * @param wrap DOCUMENT ME!
+     */
+    public void setWrapAlignment(boolean wrap)
+    {
+        av.startSeq = 0;
+        scalePanelHolder.setVisible(!wrap);
+        hscroll.setVisible(!wrap);
+        idwidthAdjuster.setVisible(!wrap);
 
-    repaint();
+       if(wrap)
+       {
+         annotationScroller.setVisible(false);
+         annotationSpaceFillerHolder.setVisible(false);
+       }
+       else if(av.showAnnotation)
+       {
+         annotationScroller.setVisible(true);
+         annotationSpaceFillerHolder.setVisible(true);
+       }
 
-  }
+       idSpaceFillerPanel1.setVisible(!wrap);
 
+        repaint();
+    }
 
-  public void adjustmentValueChanged(AdjustmentEvent evt)
-  {
 
-    if (evt.getSource() == hscroll)
+    // return value is true if the scroll is valid
+    public boolean scrollUp(boolean up)
     {
-      int x = hscroll.getValue();
-      av.setStartRes(x);
-      av.setEndRes(x + seqPanel.seqCanvas.getWidth()/av.getCharWidth()-1);
-    }
+        if (up)
+        {
+            if (vscroll.getValue() < 1)
+            {
+                return false;
+            }
+
+            fastPaint = false;
+            vscroll.setValue(vscroll.getValue() - 1);
+        }
+        else
+        {
+            if ((vextent + vscroll.getValue()) >= av.getAlignment().getHeight())
+            {
+                return false;
+            }
 
-    if (evt.getSource() == vscroll)
-    {
-      int offy = vscroll.getValue();
-      if (av.getWrapAlignment())
-      {
-        av.setStartRes( vscroll.getValue() * av.getChunkWidth());
-      }
-      else
-      {
-        av.setStartSeq(offy);
-        av.setEndSeq(offy + seqPanel.seqCanvas.getHeight() / av.getCharHeight());
-      }
+            fastPaint = false;
+            vscroll.setValue(vscroll.getValue() + 1);
+        }
+
+        fastPaint = true;
+
+        return true;
     }
 
+    /**
+     * DOCUMENT ME!
+     *
+     * @param right DOCUMENT ME!
+     *
+     * @return DOCUMENT ME!
+     */
+    public boolean scrollRight(boolean right)
+    {
+        if (right)
+        {
+            if (hscroll.getValue() < 1)
+            {
+                return false;
+            }
+
+            fastPaint = false;
+            hscroll.setValue(hscroll.getValue() - 1);
+        }
+        else
+        {
+            if ((hextent + hscroll.getValue()) >= av.getAlignment().getWidth())
+            {
+                return false;
+            }
 
-    if(overviewPanel!=null)
-      overviewPanel.setBoxPosition();
+            fastPaint = false;
+            hscroll.setValue(hscroll.getValue() + 1);
+        }
 
-    repaint();
-  }
+        fastPaint = true;
 
-  public int print(Graphics pg, PageFormat pf, int pi) throws PrinterException
-  {
-    pg.translate((int)pf.getImageableX(), (int)pf.getImageableY());
+        return true;
+    }
 
-    int pwidth = (int) pf.getImageableWidth();
-    int pheight = (int) pf.getImageableHeight();
+    /**
+     * DOCUMENT ME!
+     *
+     * @param x DOCUMENT ME!
+     * @param y DOCUMENT ME!
+     */
+    public void setScrollValues(int x, int y)
+    {
+        av.setEndRes((x + (seqPanel.seqCanvas.getWidth() / av.getCharWidth())) -
+            1);
+
+        hextent = seqPanel.seqCanvas.getWidth() / av.charWidth;
+        vextent = seqPanel.seqCanvas.getHeight() / av.charHeight;
+
+        if (hextent > av.alignment.getWidth())
+        {
+            hextent = av.alignment.getWidth();
+        }
+
+        if (vextent > av.alignment.getHeight())
+        {
+            vextent = av.alignment.getHeight();
+        }
+
+        if ((hextent + x) > av.getAlignment().getWidth())
+        {
+            x = av.getAlignment().getWidth() - hextent;
+        }
+
+        if ((vextent + y) > av.getAlignment().getHeight())
+        {
+            y = av.getAlignment().getHeight() - vextent;
+        }
+
+        if (y < 0)
+        {
+            y = 0;
+        }
+
+        if (x < 0)
+        {
+            x = 0;
+        }
+
+        hscroll.setValues(x, hextent, 0, av.getAlignment().getWidth());
+        vscroll.setValues(y, vextent, 0, av.getAlignment().getHeight());
+    }
 
-    if (av.getWrapAlignment())
-      return printWrappedAlignment(pg, pwidth,pheight, pi);
-    else
-      return printUnwrapped(pg,pwidth, pheight,pi);
-  }
 
-  public int printUnwrapped(Graphics pg, int pwidth, int pheight, int pi) throws PrinterException
-  {
+    /**
+     * DOCUMENT ME!
+     *
+     * @param evt DOCUMENT ME!
+     */
+    public void adjustmentValueChanged(AdjustmentEvent evt)
+    {
 
-    int idWidth = calculateIdWidth().width;
+        int oldX = av.getStartRes();
+        int oldY = av.getStartSeq();
+
+        if (evt.getSource() == hscroll)
+        {
+            int x = hscroll.getValue();
+            av.setStartRes(x);
+            av.setEndRes((x +
+                (seqPanel.seqCanvas.getWidth() / av.getCharWidth())) - 1);
+        }
+
+        if (evt.getSource() == vscroll)
+        {
+            int offy = vscroll.getValue();
+
+            if (av.getWrapAlignment())
+            {
+                int rowSize = seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getWidth());
+                av.setStartRes(vscroll.getValue() * rowSize);
+                av.setEndRes((vscroll.getValue() + 1) * rowSize);
+            }
+            else
+            {
+                av.setStartSeq(offy);
+                av.setEndSeq(offy +
+                    (seqPanel.seqCanvas.getHeight() / av.getCharHeight()));
+            }
+        }
+
+        if (overviewPanel != null)
+        {
+            overviewPanel.setBoxPosition();
+        }
+
+        int xShift = av.getStartRes() - oldX;
+        int yShift = av.getStartSeq() - oldY;
+
+        if ( (xShift != 0 && yShift != 0) ||
+            (Math.abs(xShift) > av.getEndRes() - av.getStartRes()
+             || Math.abs(yShift) > av.getEndSeq() - av.getStartSeq())
+             || av.getWrapAlignment()
+             || !fastPaint)
+        {
+          // Either no shift at all, or shift greater than visible amount
+          repaint();
+        }
+        else
+        {
+            idPanel.idCanvas.fastPaint(yShift);
+            seqPanel.seqCanvas.fastPaint(xShift, yShift);
 
+            scalePanel.repaint();
 
-    pg.setColor(Color.white);
-    pg.fillRect(0,0,pwidth, pheight);
-    pg.setFont( av.getFont() );
+            if (av.getShowAnnotation())
+            {
+                annotationPanel.fastPaint(xShift);
+            }
+        }
+    }
 
-    ////////////////////////////////////
-    /// How many sequences and residues can we fit on a printable page?
-    int totalRes = (pwidth - idWidth)/av.getCharWidth();
-    int totalSeq = (int)((pheight - 30)/av.getCharHeight())-1;
-    int pagesWide = av.getAlignment().getWidth() / totalRes +1;
-    int pagesHigh = av.getAlignment().getHeight() / totalSeq +1;
+    /**
+     * DOCUMENT ME!
+     *
+     * @param g DOCUMENT ME!
+     */
+    public void paintComponent(Graphics g)
+    {
+        invalidate();
 
-    if (pi >= pagesWide*pagesHigh)
-     return Printable.NO_SUCH_PAGE;
+        Dimension d = idPanel.idCanvas.getPreferredSize();
+        idPanelHolder.setPreferredSize(d);
+        hscrollFillerPanel.setPreferredSize(new Dimension(d.width, 12));
+        validate();
 
-    /////////////////////////////
-    /// Only print these sequences and residues on this page
-    int startRes, endRes, startSeq, endSeq;
-    startRes = (pi % pagesWide) * totalRes;
-    endRes = startRes + totalRes-1;
-    if(endRes>av.getAlignment().getWidth())
-      endRes = av.getAlignment().getWidth();
+        if (av.getWrapAlignment())
+        {
+            int max = av.alignment.getWidth() / seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getWidth());
+            vscroll.setMaximum(max);
+            vscroll.setUnitIncrement(1);
+            vscroll.setVisibleAmount(1);
+        }
+        else
+        {
+            setScrollValues(av.getStartRes(), av.getStartSeq());
+        }
+    }
 
-     startSeq = (pi / pagesWide) * totalSeq;
-     endSeq = startSeq + totalSeq;
-     if(endSeq > av.getAlignment().getHeight())
-       endSeq = av.getAlignment().getHeight();
+    /**
+     * DOCUMENT ME!
+     *
+     * @param pg DOCUMENT ME!
+     * @param pf DOCUMENT ME!
+     * @param pi DOCUMENT ME!
+     *
+     * @return DOCUMENT ME!
+     *
+     * @throws PrinterException DOCUMENT ME!
+     */
+    public int print(Graphics pg, PageFormat pf, int pi)
+        throws PrinterException
+    {
+        pg.translate((int) pf.getImageableX(), (int) pf.getImageableY());
 
+        int pwidth = (int) pf.getImageableWidth();
+        int pheight = (int) pf.getImageableHeight();
 
-    ////////////////
-    //draw Scale
-    pg.translate(30,0);
-    scalePanel.drawScale(pg, startRes, endRes, pwidth-idWidth);
+        if (av.getWrapAlignment())
+        {
+            return printWrappedAlignment(pg, pwidth, pheight, pi);
+        }
+        else
+        {
+            return printUnwrapped(pg, pwidth, pheight, pi);
+        }
+    }
 
-    pg.translate(-30, 30);
-    ////////////////
-    // Draw the ids
-    Color currentColor=null;
-    Color currentTextColor=null;
-    for(int i=startSeq; i<endSeq; i++)
+    /**
+     * DOCUMENT ME!
+     *
+     * @param pg DOCUMENT ME!
+     * @param pwidth DOCUMENT ME!
+     * @param pheight DOCUMENT ME!
+     * @param pi DOCUMENT ME!
+     *
+     * @return DOCUMENT ME!
+     *
+     * @throws PrinterException DOCUMENT ME!
+     */
+    public int printUnwrapped(Graphics pg, int pwidth, int pheight, int pi)
+        throws PrinterException
     {
-      if (av.getSelectionGroup()!=null && av.getSelectionGroup().sequences.contains(av.getAlignment().getSequenceAt(i)))
-      {
-        currentColor = Color.gray;
-        currentTextColor = Color.black;
-      }
-      else
-      {
-        currentColor = av.getAlignment().getSequenceAt(i).getColor();
-        currentTextColor = Color.black;
-      }
+        int idWidth = calculateIdWidth().width + 4;
+        FontMetrics fm = getFontMetrics(av.getFont());
+        int scaleHeight = av.charHeight + fm.getDescent();
+
+        pg.setColor(Color.white);
+        pg.fillRect(0, 0, pwidth, pheight);
+        pg.setFont(av.getFont());
+
+        ////////////////////////////////////
+        /// How many sequences and residues can we fit on a printable page?
+        int totalRes = (pwidth - idWidth) / av.getCharWidth();
+
+        int totalSeq = (int) ((pheight - scaleHeight) / av.getCharHeight()) -
+            1;
+
+        int pagesWide = (av.getAlignment().getWidth() / totalRes) + 1;
+
+        /////////////////////////////
+        /// Only print these sequences and residues on this page
+        int startRes;
+
+        /////////////////////////////
+        /// Only print these sequences and residues on this page
+        int endRes;
+
+        /////////////////////////////
+        /// Only print these sequences and residues on this page
+        int startSeq;
+
+        /////////////////////////////
+        /// Only print these sequences and residues on this page
+        int endSeq;
+        startRes = (pi % pagesWide) * totalRes;
+        endRes = (startRes + totalRes) - 1;
+
+        if (endRes > (av.getAlignment().getWidth() - 1))
+        {
+            endRes = av.getAlignment().getWidth() - 1;
+        }
+
+        startSeq = (pi / pagesWide) * totalSeq;
+        endSeq = startSeq + totalSeq;
+
+        if (endSeq > av.getAlignment().getHeight())
+        {
+            endSeq = av.getAlignment().getHeight();
+        }
+
+        int pagesHigh = ((av.alignment.getHeight() / totalSeq) + 1) * pheight;
+
+        if (av.showAnnotation)
+        {
+            pagesHigh += annotationPanel.getHeight();
+        }
+
+        pagesHigh /= pheight;
+
+        if (pi >= (pagesWide * pagesHigh))
+        {
+            return Printable.NO_SUCH_PAGE;
+        }
+
+        //draw Scale
+        pg.translate(idWidth, 0);
+        scalePanel.drawScale(pg, startRes, endRes, pwidth - idWidth, scaleHeight);
+        pg.translate(-idWidth, scaleHeight);
+
+        ////////////////
+        // Draw the ids
+        Color currentColor = null;
+        Color currentTextColor = null;
+
+        for (int i = startSeq; i < endSeq; i++)
+        {
+            if ((av.getSelectionGroup() != null) &&
+                    av.getSelectionGroup().sequences.contains(
+                        av.getAlignment().getSequenceAt(i)))
+            {
+                currentColor = Color.gray;
+                currentTextColor = Color.black;
+            }
+            else
+            {
+                currentColor = av.getAlignment().getSequenceAt(i).getColor();
+                currentTextColor = Color.black;
+            }
+
+            pg.setColor(currentColor);
+            pg.fillRect(0, (i-startSeq) * av.charHeight, idWidth,
+                av.getCharHeight());
+
+            pg.setColor(currentTextColor);
+
+            String string = av.getAlignment().getSequenceAt(i).getName();
+
+            if (av.getShowFullId())
+            {
+                string = av.getAlignment().getSequenceAt(i).getDisplayId();
+            }
+
+            pg.drawString(string, 0,
+                (((i-startSeq) * av.charHeight) + av.getCharHeight()) -
+                (av.getCharHeight() / 5));
+        }
+
+        // draw main sequence panel
+        pg.translate(idWidth, 0);
+        seqPanel.seqCanvas.drawPanel(pg, startRes, endRes, startSeq, endSeq,
+            startRes, startSeq, 0);
+
+        if (av.showAnnotation && (endSeq == av.alignment.getHeight()))
+        {
+            pg.translate(-idWidth, (endSeq - startSeq) * av.charHeight);
+            alabels.drawComponent((Graphics2D) pg);
+            pg.translate(idWidth, 0);
+            annotationPanel.drawComponent((Graphics2D) pg, startRes, endRes +
+                1);
+        }
+
+        return Printable.PAGE_EXISTS;
+    }
 
-      pg.setColor(currentColor);
-      pg.fillRect(0,  jalview.analysis.AlignmentUtil.getPixelHeight(startSeq, i, av.getCharHeight()),
-                              idWidth,
-                              av.getCharHeight());
+    /**
+     * DOCUMENT ME!
+     *
+     * @param pg DOCUMENT ME!
+     * @param pwidth DOCUMENT ME!
+     * @param pheight DOCUMENT ME!
+     * @param pi DOCUMENT ME!
+     *
+     * @return DOCUMENT ME!
+     *
+     * @throws PrinterException DOCUMENT ME!
+     */
+    public int printWrappedAlignment(Graphics pg, int pwidth, int pheight,
+        int pi) throws PrinterException
+    {
+        int idWidth = calculateIdWidth().width + 4;
 
-      pg.setColor(currentTextColor);
+        int resWidth = seqPanel.seqCanvas.getWrappedCanvasWidth(pwidth -
+                idWidth);
+        int totalHeight = totalHeight = (av.alignment.getHeight() + 2) * ((av.alignment.getWidth() / resWidth) +
+                1) * av.charHeight;
 
-      String string = av.getAlignment().getSequenceAt(i).getName();
-      if(av.getShowFullId())
-        string = av.getAlignment().getSequenceAt(i).getDisplayId();
+        pg.setColor(Color.white);
+        pg.fillRect(0, 0, pwidth, pheight);
+        pg.setFont(av.getFont());
 
-      pg.drawString(string, 0,  jalview.analysis.AlignmentUtil.getPixelHeight
-                    (startSeq, i, av.getCharHeight()) + av.getCharHeight() - (av.getCharHeight() / 5));
-    }
+        ////////////////
+        // Draw the ids
+        pg.setColor(Color.black);
 
-    // draw main sequence panel
-    pg.translate(idWidth+4,0);
-    pg.setClip(0,0,pwidth-idWidth, pheight);
-    seqPanel.seqCanvas.drawPanel(pg,startRes,endRes,startSeq,endSeq,startRes,startSeq,0);
+        pg.translate(0, -pi * pheight);
 
-    return Printable.PAGE_EXISTS;
-  }
+        pg.setClip(0, pi * pheight, pwidth, pheight);
 
+        int ypos = 2 * av.charHeight;
 
-  public int printWrappedAlignment(Graphics pg, int pwidth, int pheight, int pi) throws PrinterException
-  {
+        do
+        {
+            for (int i = 0; i < av.alignment.getHeight(); i++)
+            {
+                SequenceI s = av.alignment.getSequenceAt(i);
+                String string = s.getName();
 
-    int idWidth = calculateIdWidth().width;
+                if (av.getShowFullId())
+                {
+                    string = s.getDisplayId();
+                }
 
-    if( seqPanel.seqCanvas.getWidth() < pwidth-idWidth)
-      pwidth = seqPanel.seqCanvas.getWidth() + idWidth;
+                pg.drawString(string, 0,
+                    ((i * av.charHeight) + ypos + av.charHeight) -
+                    (av.charHeight / 5));
+            }
 
+            ypos += ((av.alignment.getHeight() + 2) * av.charHeight);
+        }
+        while (ypos < totalHeight);
 
-    pg.setColor(Color.white);
-    pg.fillRect(0,0,pwidth, pheight);
-    pg.setFont( av.getFont() );
+        pg.translate(idWidth, 0);
 
-    ////////////////////////////////////
-    /// How many sequences and residues can we fit on a printable page?
-    AlignmentI da = av.alignment;
-    int endy   = da.getHeight();
-    int chunkHeight =  (da.getHeight() + 2)*av.charHeight;
-    int chunkWidth  =   (pwidth-idWidth)/av.charWidth;
+        seqPanel.seqCanvas.drawWrappedPanel(pg, pwidth - idWidth, totalHeight, 0);
 
-    int noChunksOnPage = pheight / chunkHeight;
-    int totalChunks = da.getWidth() / chunkWidth;
+        if ((pi * pheight) < totalHeight)
+        {
+            return Printable.PAGE_EXISTS;
+        }
+        else
+        {
+            return Printable.NO_SUCH_PAGE;
+        }
+    }
 
-    if ( pi*noChunksOnPage > totalChunks )
-     return Printable.NO_SUCH_PAGE;
+    /**
+     * DOCUMENT ME!
+     */
+    public void makeEPS(File epsFile)
+    {
+      boolean accurateText = true;
 
-    ////////////////
-    // Draw the ids
-    pg.setClip(0,0,pwidth, noChunksOnPage*chunkHeight);
+      String renderStyle = jalview.bin.Cache.getDefault("EPS_RENDERING",
+          "Prompt each time");
 
-    int row = pi*noChunksOnPage;
-    pg.setColor(Color.black);
-    for(int ypos=2*av.charHeight;
-        ypos <= pheight && row*chunkWidth<da.getWidth();
-        ypos += chunkHeight, row++ )
-    {
-      for (int i = 0; i < endy; i++)
+      // If we need to prompt, and if the GUI is visible then
+      // Prompt for EPS rendering style
+      if (renderStyle.equalsIgnoreCase("Prompt each time")
+          && !
+          (System.getProperty("java.awt.headless") != null
+           && System.getProperty("java.awt.headless").equals("true")))
       {
-        SequenceI s = da.getSequenceAt(i);
-        String string = s.getName();
-        if (av.getShowFullId())
-          string = s.getDisplayId();
-
-        pg.drawString(string, 0,
-                      AlignmentUtil.getPixelHeight(0, i, av.charHeight) + ypos +
-                      av.charHeight - (av.charHeight / 5));
-      }
-    }
+        EPSOptions eps = new EPSOptions();
+        renderStyle = eps.getValue();
 
-    // draw main sequence panel
-    pg.translate(idWidth+4,0);
-    seqPanel.seqCanvas.drawWrappedPanel(pg, pwidth-idWidth, pheight, pi*noChunksOnPage*chunkWidth);
+        if(eps.cancelled || renderStyle==null)
+          return;
 
+        renderStyle = eps.getValue();
+      }
 
-    return Printable.PAGE_EXISTS;
+      if (renderStyle.equalsIgnoreCase("text"))
+      {
+        accurateText = false;
+      }
 
-  }
 
+        if(epsFile == null)
+        {
+          jalview.io.JalviewFileChooser chooser = new jalview.io.
+              JalviewFileChooser(jalview.bin.Cache.getProperty(
+                  "LAST_DIRECTORY"), new String[]
+                                 {"eps"},
+                                 new String[]
+                                 {"Encapsulated Postscript"},
+                                 "Encapsulated Postscript");
+          chooser.setFileView(new jalview.io.JalviewFileView());
+          chooser.setDialogTitle("Create EPS file from alignment");
+          chooser.setToolTipText("Save");
 
-  public void makeEPS()
-  {
-    int height = (av.alignment.getWidth() / av.getChunkWidth() +1) * av.chunkHeight;
-    int width = seqPanel.getWidth() + idPanel.getWidth();
+          int value = chooser.showSaveDialog(this);
 
-    if (!av.getWrapAlignment())
-    {
-      height = (av.alignment.getHeight()+1) * av.charHeight + 30;
-      width = idPanel.getWidth() + av.alignment.getWidth() * av.charWidth;
-    }
+          if (value != jalview.io.JalviewFileChooser.APPROVE_OPTION)
+          {
+            return;
+          }
 
-    try
-    {
-      jalview.io.JalviewFileChooser chooser = new jalview.io.JalviewFileChooser(jalview.bin.Cache.getProperty(
-          "LAST_DIRECTORY"), new String[]{"eps"}, "Encapsulated Postscript");
-      chooser.setFileView(new jalview.io.JalviewFileView());
-      chooser.setDialogTitle("Create EPS file from alignment");
-      chooser.setToolTipText("Save");
+          epsFile = chooser.getSelectedFile();
 
-      int value = chooser.showSaveDialog(this);
-      if (value != jalview.io.JalviewFileChooser.APPROVE_OPTION)
-        return;
+          jalview.bin.Cache.setProperty("LAST_DIRECTORY",
+                                        chooser.getSelectedFile().getParent());
+        }
 
-      jalview.bin.Cache.setProperty("LAST_DIRECTORY",chooser.getSelectedFile().getPath());
-      FileOutputStream out = new FileOutputStream(chooser.getSelectedFile());
-      EpsGraphics2D pg = new EpsGraphics2D("Example", out, 0, 0, width, height);
+        int height = ( (av.alignment.getHeight() + 1) * av.charHeight) + 30;
+        int width = idPanel.getWidth() + (av.alignment.getWidth() * av.charWidth);
 
         if (av.getWrapAlignment())
-          printWrappedAlignment(pg, width, height, 0);
-        else
-          printUnwrapped(pg, width, height, 0);
+        {
+          height = ( (av.alignment.getWidth() / av.getChunkWidth()) + 1) *
+              av.chunkHeight;
+          width = seqPanel.getWidth() + idPanel.getWidth();
+
+        }
+
+
+        if (av.getShowAnnotation())
+        {
+            height += annotationPanel.getPreferredSize().height;
+        }
+
+        try
+         {
+           FileOutputStream out = new FileOutputStream(epsFile);
+           EpsGraphics2D pg = new EpsGraphics2D("Example", out, 0, 0, width,
+                                                height);
+
+           pg.setAccurateTextMode(accurateText);
+
+           if (av.getWrapAlignment())
+           {
+                printWrappedAlignment(pg, width, height, 0);
+            }
+            else
+            {
+                printUnwrapped(pg, width, height, 0);
+            }
+
+            pg.flush();
+            pg.close();
+        }
+        catch (Exception ex)
+        {
+            ex.printStackTrace();
+        }
+    }
 
 
-        pg.flush();
-        pg.close();
-    }
-    catch (Exception ex)
+    public void makePNGImageMap(File imgMapFile, String imageName)
     {
-      ex.printStackTrace();
-    }
-  }
+      ///////ONLY WORKS WITH NONE WRAPPED ALIGNMENTS
+      //////////////////////////////////////////////
+      int idWidth = calculateIdWidth().width + 4;
+      FontMetrics fm = getFontMetrics(av.getFont());
+      int scaleHeight = av.charHeight + fm.getDescent();
+
+        // Gen image map
+         //////////////////////////////////
+         if(imgMapFile!=null)
+         {
+           try
+           {
+             PrintWriter out = new PrintWriter(new FileWriter(imgMapFile));
+             out.println(jalview.io.HTMLOutput.getImageMapHTML());
+             out.println("<img src=\"" + imageName +
+                       "\" border=\"0\" usemap=\"#Map\" >"
+                       +"<map name=\"Map\">");
+
+             for (int s = 0; s < av.alignment.getHeight(); s++)
+             {
+               SequenceI seq = av.alignment.getSequenceAt(s);
+               SequenceGroup[] groups = av.alignment.findAllGroups(seq);
+               for (int i = 0; i < groups.length; i++)
+               {
+                 int sy = s * av.charHeight + scaleHeight;
+                 for (int res = groups[i].getStartRes();
+                      res < groups[i].getEndRes() + 1; res++)
+                 {
+                   int alIndex = seq.findPosition(res);
+                   Object obj = ResidueProperties.aa2Triplet.get(
+                       seq.getCharAt(res) + "");
+                   if (obj == null)
+                     continue;
+
+                   String triplet = obj.toString();
+
+                   out.println(
+                       "<area shape=\"rect\" coords=\""
+                       + (idWidth + res * av.charWidth) + ","
+                       + sy + ","
+                       + (idWidth + (res + 1) * av.charWidth) + ","
+                       + (av.charHeight + sy) + "\""
+                       + " onMouseOver=\"toolTip('"
+                       + alIndex + " " + triplet +
+                       "<br><em>" + groups[i].getName() +
+                       "</em>')\"; onMouseOut=\"toolTip()\"; "
+                       + " href=\"#\">");
+                 }
+               }
+             }
+
+             out.println("</map></body></html>");
+             out.close();
+
+           }
+           catch (Exception ex)
+           {
+             ex.printStackTrace();
+           }
+         }///////////END OF IMAGE MAP
 
-  public void makePNG()
-  {
-      int height = (av.alignment.getWidth() / av.getChunkWidth() +1) * av.chunkHeight;
-      int width = seqPanel.getWidth() + idPanel.getWidth();
+    }
 
-      if (!av.getWrapAlignment())
+    /**
+     * DOCUMENT ME!
+     */
+    public void makePNG(File pngFile)
+    {
+      if(pngFile==null)
       {
-        height = (av.alignment.getHeight()+1) * av.charHeight + 30;
-        width = idPanel.getWidth() + av.alignment.getWidth() * av.charWidth;
+        jalview.io.JalviewFileChooser chooser = new jalview.io.
+            JalviewFileChooser(jalview.bin.Cache.getProperty(
+                "LAST_DIRECTORY"), new String[]
+                               {"png"},
+                               new String[]
+                               {"Portable network graphics"},
+                               "Portable network graphics");
+        chooser.setFileView(new jalview.io.JalviewFileView());
+        chooser.setDialogTitle("Create EPS file from alignment");
+        chooser.setToolTipText("Save");
+
+        int value = chooser.showSaveDialog(this);
+
+        if (value != jalview.io.JalviewFileChooser.APPROVE_OPTION)
+        {
+          return;
+        }
+
+        pngFile = chooser.getSelectedFile();
+
+        jalview.bin.Cache.setProperty("LAST_DIRECTORY",
+                                      chooser.getSelectedFile().getParent());
       }
 
 
 
-    try
-    {
-      jalview.io.JalviewFileChooser chooser = new jalview.io.JalviewFileChooser(jalview.bin.Cache.getProperty(
-          "LAST_DIRECTORY"), new String[]{"png"}, "Portable network graphics");
-      chooser.setFileView(new jalview.io.JalviewFileView());
-      chooser.setDialogTitle("Create EPS file from alignment");
-      chooser.setToolTipText("Save");
+      int height = ( (av.alignment.getHeight() + 1) * av.charHeight) + 30;
+      int width = idPanel.getWidth() + (av.alignment.getWidth() * av.charWidth);
 
-      int value = chooser.showSaveDialog(this);
-      if (value != jalview.io.JalviewFileChooser.APPROVE_OPTION)
-        return;
+      if (av.getWrapAlignment())
+      {
+        height = ( (av.alignment.getWidth() / av.getChunkWidth()) + 1) *
+            av.chunkHeight;
+        width = seqPanel.getWidth() + idPanel.getWidth();
 
-      jalview.bin.Cache.setProperty("LAST_DIRECTORY",chooser.getSelectedFile().getPath());
-      FileOutputStream out = new FileOutputStream(chooser.getSelectedFile());
+      }
 
-      BufferedImage bi = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
-      Graphics png = bi.getGraphics();
 
+        if (av.getShowAnnotation())
+        {
+            height += annotationPanel.getPreferredSize().height;
+        }
+
+        try
+        {
+
+            FileOutputStream out = new FileOutputStream(pngFile);
+
+            BufferedImage bi = new BufferedImage(width, height,
+                    BufferedImage.TYPE_INT_RGB);
+            Graphics2D png = (Graphics2D) bi.getGraphics();
+
+            png.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+                RenderingHints.VALUE_ANTIALIAS_ON);
+
+            if (av.getWrapAlignment())
+            {
+                printWrappedAlignment(png, width, height, 0);
+            }
+            else
+            {
+                printUnwrapped(png, width, height, 0);
+            }
+
+            ImageIO.write(bi, "png", out);
+            out.close();
+        }
+        catch(OutOfMemoryError err)
+        {
+          System.out.println("########################\n"
+                             +"OUT OF MEMORY "+pngFile+"\n"
+                             +"########################");
+        }
+        catch (Exception ex)
+        {
+            ex.printStackTrace();
+        }
+    }
+}
 
-        if (av.getWrapAlignment())
-          printWrappedAlignment(png, width, height, 0);
-        else
-          printUnwrapped(png, width, height, 0);
 
-        ImageIO.write(bi, "png", out);
-        out.close();
-    }
-    catch (Exception ex)
+/**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
+class Preview extends JFrame
+{
+    /**
+     * Creates a new Preview object.
+     *
+     * @param image DOCUMENT ME!
+     */
+    public Preview(Image image)
     {
-      ex.printStackTrace();
+        setResizable(true);
+        setSize(image.getWidth(this), image.getHeight(this));
+        setVisible(true);
+        getContentPane().setLayout(new BorderLayout());
+        getContentPane().add(new PreviewPanel(image), BorderLayout.CENTER);
+        validate();
+        repaint();
     }
-  }
-
 }
 
 
+/**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
+class PreviewPanel extends JPanel
+{
+    Image image;
+
+    /**
+     * Creates a new PreviewPanel object.
+     *
+     * @param image DOCUMENT ME!
+     */
+    public PreviewPanel(Image image)
+    {
+        this.image = image;
+    }
 
-
+    /**
+     * DOCUMENT ME!
+     *
+     * @param g DOCUMENT ME!
+     */
+    public void paintComponent(Graphics g)
+    {
+        if (image != null)
+        {
+            g.drawImage(image, 0, 0, this);
+        }
+        else
+        {
+            System.out.println("DEBUG:image is null");
+        }
+    }
+}