SequenceRenderer changes

diff --git a/src/jalview/gui/SeqCanvas.java b/src/jalview/gui/SeqCanvas.java
index 30a8090..18e3f08 100755 (executable)
--- a/src/jalview/gui/SeqCanvas.java
+++ b/src/jalview/gui/SeqCanvas.java
@@ -10,6 +10,7 @@ import jalview.analysis.*;
 public class SeqCanvas extends JComponent\r
 {\r
      FeatureRenderer fr;\r
+     SequenceRenderer sr;\r
     BufferedImage             img;\r
     Graphics2D          gg;\r
     int               imgWidth;\r
@@ -31,6 +32,7 @@ public class SeqCanvas extends JComponent
     {\r
        this.av         = av;\r
        fr = new FeatureRenderer(av);\r
+       sr = new SequenceRenderer(av);\r
        setLayout(new BorderLayout());\r
        PaintRefresher.Register(this);\r
 \r
@@ -171,7 +173,7 @@ public void fastPaint(int horizontal, int vertical)
  * in the adjustment listener in SeqPanel when the scrollbars move.\r
  */\r
 \r
-  public void paintComponent(Graphics g)\r
+  public void paint(Graphics g)\r
   {\r
     g.setColor(Color.white);\r
     g.fillRect(0, 0, getWidth(), getHeight());\r
@@ -303,7 +305,8 @@ public void fastPaint(int horizontal, int vertical)
 \r
     Graphics2D g = (Graphics2D)g1;\r
     g.setFont(av.getFont());\r
-    RendererI sr = av.getRenderer();\r
+    sr.renderGaps(av.renderGaps);\r
+\r
 \r
     SequenceI nextSeq;\r
 \r
@@ -316,7 +319,7 @@ public void fastPaint(int horizontal, int vertical)
      sr.drawSequence(g, nextSeq, av.alignment.findAllGroups( nextSeq ),x1,x2,\r
                  (x1 - startx) * av.charWidth,\r
                  offset + AlignmentUtil.getPixelHeight(starty, i, av.charHeight),\r
-                 av.charWidth,av.charHeight,null, i);\r
+                 av.charWidth,av.charHeight);\r
 \r
      if(av.showSequenceFeatures)\r
      {\r
@@ -324,7 +327,7 @@ public void fastPaint(int horizontal, int vertical)
                        (x1 - startx) * av.charWidth,\r
                        offset +\r
                        AlignmentUtil.getPixelHeight(starty, i, av.charHeight),\r
-                       av.charWidth, av.charHeight, null, i);\r
+                       av.charWidth, av.charHeight);\r
      }\r
     }\r
     //\r