Multiple Views

[jalview.git] / src / jalview / gui / SeqCanvas.java

diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java
index b4ef770..56e70ac 100755 (executable)
--- 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);\r
         sr = new SequenceRenderer(av);\r
         setLayout(new BorderLayout());\r
-        PaintRefresher.Register(this, av.alignment);\r
+        PaintRefresher.Register(this, av.getSequenceSetId());\r
         setBackground(Color.white);\r
     }\r
 \r
@@ -328,9 +328,34 @@ public class SeqCanvas extends JComponent
             return;\r
         }\r
 \r
-        img = new BufferedImage(imgWidth, imgHeight, BufferedImage.TYPE_INT_RGB);\r
-        gg = (Graphics2D) img.getGraphics();\r
-        gg.setFont(av.getFont());\r
+        if (img == null || imgWidth != img.getWidth() || imgHeight != img.getHeight())\r
+        {\r
+          try{\r
+            img = new BufferedImage(imgWidth, imgHeight,\r
+                                    BufferedImage.TYPE_INT_RGB);\r
+            gg = (Graphics2D) img.getGraphics();\r
+            gg.setFont(av.getFont());\r
+          }catch(OutOfMemoryError er)\r
+          {\r
+            System.gc();\r
+            System.out.println(er +" making image, SeqCanvas");\r
+            javax.swing.SwingUtilities.invokeLater(new Runnable()\r
+            {\r
+              public void run()\r
+              {\r
+                javax.swing.JOptionPane.showInternalMessageDialog(Desktop.\r
+                    desktop,\r
+                    "Out of memory creating alignment image!!"\r
+                    +\r
+                    "\nSee help files for increasing Java Virtual Machine memory."\r
+                    , "Out of memory",\r
+                    javax.swing.JOptionPane.WARNING_MESSAGE);\r
+              }\r
+            });\r
+\r
+            return;\r
+          }\r
+        }\r
 \r
         if (av.antiAlias)\r
           gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,\r
@@ -602,7 +627,7 @@ public class SeqCanvas extends JComponent
             g1.setColor(Color.blue);\r
 \r
             g1.drawLine( (blockEnd - blockStart + 1) * av.charWidth - 1,\r
-                        0+offset,\r
+                        0 + offset,\r
                         (blockEnd - blockStart + 1) * av.charWidth - 1,\r
                         (endSeq - startSeq) * av.charHeight + offset);\r
           }\r