X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FOverviewPanel.java;h=3ef2936e21b3302683caaf55e2b8bb9d3b161c21;hb=050133c52e350a0e76b94ab0c1243aea7613b042;hp=1d11b67b4f11fa25979e7b31ddf88cac56538361;hpb=dc6be6d88fed09c93aabe03c7fd0f389ef558471;p=jalview.git

diff --git a/src/jalview/appletgui/OverviewPanel.java b/src/jalview/appletgui/OverviewPanel.java
index 1d11b67..3ef2936 100755
--- a/src/jalview/appletgui/OverviewPanel.java
+++ b/src/jalview/appletgui/OverviewPanel.java
@@ -21,6 +21,7 @@
 package jalview.appletgui;
 
 import jalview.datamodel.SequenceI;
+import jalview.renderer.seqfeatures.FeatureColourFinder;
 import jalview.viewmodel.OverviewDimensions;
 
 import java.awt.Color;
@@ -76,7 +77,8 @@ public class OverviewPanel extends Panel implements Runnable,
     sr.forOverview = true;
     fr = new FeatureRenderer(av);
 
-    od = new OverviewDimensions(av.getPosProps(), av.isShowAnnotation());
+    od = new OverviewDimensions(av.getRanges(),
+            (av.isShowAnnotation() && av.getSequenceConsensusHash() != null));
 
     setSize(new Dimension(od.getWidth(), od.getHeight()));
     addComponentListener(new ComponentAdapter()
@@ -143,7 +145,7 @@ public class OverviewPanel extends Panel implements Runnable,
   {
     od.updateViewportFromMouse(evt.getX(), evt.getY(), av.getAlignment()
             .getHiddenSequences(), av.getColumnSelection(), av
-            .getPosProps());
+            .getRanges());
     ap.setScrollValues(od.getScrollCol(), od.getScrollRow());
     ap.paintAlignment(false);
   }
@@ -208,7 +210,9 @@ public class OverviewPanel extends Panel implements Runnable,
 
     buildImage(sampleRow, sampleCol, mg);
 
-    if (av.isShowAnnotation())
+    // check for conservation annotation to make sure overview works for DNA too
+    if (av.isShowAnnotation()
+            && (av.getAlignmentConservationAnnotation() != null))
     {
       for (int col = 0; col < od.getWidth() && !resizeAgain; col++)
       {
@@ -248,6 +252,7 @@ public class OverviewPanel extends Panel implements Runnable,
     int sameCol = 0;
 
     SequenceI seq = null;
+    FeatureColourFinder finder = new FeatureColourFinder(fr);
 
     final boolean hasHiddenCols = av.hasHiddenColumns();
     boolean hiddenRow = false;
@@ -277,7 +282,7 @@ public class OverviewPanel extends Panel implements Runnable,
             lastcol = (int) (col * sampleCol);
 
             color = getColumnColourFromSequence(seq, hiddenRow,
-                    hasHiddenCols, lastcol);
+                    hasHiddenCols, lastcol, finder);
 
             mg.setColor(color);
             if (sameCol == 1 && sameRow == 1)
@@ -305,21 +310,12 @@ public class OverviewPanel extends Panel implements Runnable,
    */
   private Color getColumnColourFromSequence(
           jalview.datamodel.SequenceI seq, boolean hiddenRow,
-          boolean hasHiddenCols, int lastcol)
+          boolean hasHiddenCols, int lastcol, FeatureColourFinder finder)
   {
-    Color color;
+    Color color = Color.white;
     if (seq.getLength() > lastcol)
     {
-      color = sr.getResidueBoxColour(seq, lastcol);
-
-      if (av.isShowSequenceFeatures())
-      {
-        color = fr.findFeatureColour(color, seq, lastcol);
-      }
-    }
-    else
-    {
-      color = Color.white;
+      color = sr.getResidueColour(seq, lastcol, finder);
     }
 
     if (hiddenRow
@@ -339,7 +335,7 @@ public class OverviewPanel extends Panel implements Runnable,
   public void setBoxPosition()
   {
     od.setBoxPosition(av.getAlignment()
-            .getHiddenSequences(), av.getColumnSelection(), av.getPosProps());
+            .getHiddenSequences(), av.getColumnSelection(), av.getRanges());
     repaint();
   }