X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSeqCanvas.java;h=aa98e76cdef6b2c32069cea96d313b2c5a9992be;hb=84c69c8b17a65ea0fc0bc4a475773e23612f1c18;hp=fca91993662432ffc1d74c5e30d3d92bc1666361;hpb=38ae1e61b0cd4fdbf6c9be24cb5f53382a4e6d51;p=jalview.git

diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java
index fca9199..aa98e76 100755
--- a/src/jalview/gui/SeqCanvas.java
+++ b/src/jalview/gui/SeqCanvas.java
@@ -62,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);
     }
 
@@ -328,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,
@@ -529,7 +554,7 @@ public class SeqCanvas extends JComponent
                 annotations = new AnnotationPanel(av);
 
               annotations.drawComponent( (Graphics2D) g, startRes, endx+1);
-              g.translate(0, -cHeight - ypos);
+              g.translate(0, -cHeight - ypos -3);
             }
             g.setClip(clip);
             g.translate(-LABEL_WEST, 0);
@@ -600,10 +625,11 @@ public class SeqCanvas extends JComponent
           if(av.getShowHiddenMarkers())
           {
             g1.setColor(Color.blue);
+
             g1.drawLine( (blockEnd - blockStart + 1) * av.charWidth - 1,
-                        startSeq + offset,
+                        0 + offset,
                         (blockEnd - blockStart + 1) * av.charWidth - 1,
-                        startSeq + (endSeq - startSeq) * av.charHeight + offset);
+                        (endSeq - startSeq) * av.charHeight + offset);
           }
 
           g1.translate( -screenY * av.charWidth, 0);