JAL-2524 don't render up to a hidden marker beyond the visible region

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

diff --git a/src/jalview/gui/OverviewCanvas.java b/src/jalview/gui/OverviewCanvas.java
index e475c2c..6f9fbbf 100644 (file)
--- a/src/jalview/gui/OverviewCanvas.java
+++ b/src/jalview/gui/OverviewCanvas.java
@@ -21,7 +21,7 @@
 package jalview.gui;
 
 import jalview.api.AlignViewportI;
-import jalview.renderer.seqfeatures.FeatureColourFinder;
+import jalview.renderer.OverviewRenderer;
 import jalview.viewmodel.OverviewDimensions;
 
 import java.awt.Color;
@@ -117,17 +117,12 @@ public class OverviewCanvas extends JComponent
     {
       fr.transferSettings(transferRenderer);
     }
-    FeatureColourFinder finder = new FeatureColourFinder(fr);
 
-    // why do we need to set preferred size again? was set in
-    // updateOverviewImage
     setPreferredSize(new Dimension(od.getWidth(), od.getHeight()));
 
-    OverviewRenderer or = new OverviewRenderer(sr, finder, od);
-    miniMe = or.draw(od.getRows(av.getRanges(), av.getAlignment()),
- od
-            .getColumns(av.getRanges(), av.getAlignment()
-                    .getHiddenColumns()));
+    OverviewRenderer or = new OverviewRenderer(sr, fr, od);
+    miniMe = or.draw(od.getRows(av.getAlignment()),
+            od.getColumns(av.getAlignment()));
 
     Graphics mg = miniMe.getGraphics();
 
@@ -136,8 +131,7 @@ public class OverviewCanvas extends JComponent
       mg.translate(0, od.getSequencesHeight());
       or.drawGraph(mg, av.getAlignmentConservationAnnotation(),
               av.getCharWidth(), od.getGraphHeight(),
- od.getColumns(
-              av.getRanges(), av.getAlignment().getHiddenColumns()));
+              od.getColumns(av.getAlignment()));
       mg.translate(0, -od.getSequencesHeight());
     }
     System.gc();