JAL-3253-applet no-NCList IntervalStore fixes

[jalview.git] / src / jalview / renderer / OverviewResColourFinder.java

diff --git a/src/jalview/renderer/OverviewResColourFinder.java b/src/jalview/renderer/OverviewResColourFinder.java
index b606ba3..a98f3b3 100644 (file)
--- a/src/jalview/renderer/OverviewResColourFinder.java
+++ b/src/jalview/renderer/OverviewResColourFinder.java
@@ -22,28 +22,34 @@ package jalview.renderer;
 
 import jalview.datamodel.SequenceGroup;
 import jalview.datamodel.SequenceI;
-import jalview.gui.Preferences;
+import jalview.renderer.seqfeatures.FeatureColourFinder;
 import jalview.util.Comparison;
 
 import java.awt.Color;
 
 public class OverviewResColourFinder extends ResidueColourFinder
 {
-  final Color GAP_COLOUR; // default colour to use at gaps
+  final int GAP_COLOUR; // default colour to use at gaps
 
-  final Color RESIDUE_COLOUR; // default colour to use at residues
+  final int RESIDUE_COLOUR; // default colour to use at residues
 
   final Color HIDDEN_COLOUR; // colour for hidden regions
 
   boolean useLegacy = false;
 
+  public static final Color OVERVIEW_DEFAULT_GAP = Color.lightGray;
+
+  public static final Color OVERVIEW_DEFAULT_LEGACY_GAP = Color.white;
+
+  public static final Color OVERVIEW_DEFAULT_HIDDEN = Color.darkGray
+          .darker();
+
   /**
    * Constructor without colour settings (used by applet)
    */
   public OverviewResColourFinder()
   {
-    this(false, Preferences.OVERVIEW_DEFAULT_GAP,
-            Preferences.OVERVIEW_DEFAULT_HIDDEN);
+    this(false, OVERVIEW_DEFAULT_GAP, OVERVIEW_DEFAULT_HIDDEN);
   }
 
   /**
@@ -61,69 +67,99 @@ public class OverviewResColourFinder extends ResidueColourFinder
   {
     if (useLegacyColouring)
     {
-      GAP_COLOUR = Color.white;
-      RESIDUE_COLOUR = Color.lightGray;
-      HIDDEN_COLOUR = hiddenCol;
+      GAP_COLOUR = Color.white.getRGB();
+      RESIDUE_COLOUR = Color.lightGray.getRGB();
     }
     else
     {
-      GAP_COLOUR = gapCol;
-      RESIDUE_COLOUR = Color.white;
-      HIDDEN_COLOUR = hiddenCol;
+      GAP_COLOUR = gapCol.getRGB();
+      RESIDUE_COLOUR = Color.white.getRGB();
     }
+    HIDDEN_COLOUR = hiddenCol;
   }
 
   @Override
+  /**
+   * for Test suite only.
+   */
   public Color getBoxColour(ResidueShaderI shader, SequenceI seq, int i)
   {
-    Color resBoxColour = RESIDUE_COLOUR;
-    char currentChar = seq.getCharAt(i);
+    return new Color(getBoxColourInt(shader, seq, i));
+  }
 
+  public int getBoxColourInt(ResidueShaderI shader, SequenceI seq, int i)
+  {
+    char currentChar = seq.getCharAt(i);
     // In the overview window, gaps are coloured grey, unless the colour scheme
     // specifies a gap colour, in which case gaps honour the colour scheme
     // settings
-    if (shader.getColourScheme() != null)
+    boolean isGap = Comparison.isGap(currentChar);
+    if (shader.getColourScheme() == null)
     {
-      if (Comparison.isGap(currentChar)
-              && (!shader.getColourScheme().hasGapColour()))
-      {
-        resBoxColour = GAP_COLOUR;
-      }
-      else
-      {
-        resBoxColour = shader.findColour(currentChar, i, seq);
-      }
+      return (isGap ? GAP_COLOUR : RESIDUE_COLOUR);
     }
-    else if (Comparison.isGap(currentChar))
+    return (isGap && !shader.getColourScheme().hasGapColour() ? GAP_COLOUR
+            : shader.findColourInt(currentChar, i, seq));
+  }
+
+  /**
+   * For test suite only.
+   */
+  @Override
+  public Color getResidueColour(boolean showBoxes, ResidueShaderI shader,
+          SequenceGroup[] allGroups, final SequenceI seq, int i,
+          FeatureColourFinder finder)
+  {
+    return new Color(getResidueColourInt(showBoxes, shader, allGroups, seq,
+            i, finder));
+  }
+
+
+  public int getResidueColourInt(boolean showBoxes, ResidueShaderI shader,
+          SequenceGroup[] allGroups, final SequenceI seq, int i,
+          FeatureColourFinder finder)
+  {
+
+    int c = seq.getColor(i);
+    if (c != 0)
     {
-      resBoxColour = GAP_COLOUR;
+      return c;
     }
 
-    return resBoxColour;
+    int col = getResidueBoxColourInt(showBoxes, shader, allGroups, seq, i);
+
+    // if there's a FeatureColourFinder we might override the residue colour
+    // here with feature colouring
+    return seq.setColor(i,
+            finder == null || finder.noFeaturesDisplayed() ? col
+                    : finder.findFeatureColourInt(col, seq, i));
   }
 
   /**
-   * {@inheritDoc} In the overview, the showBoxes setting is ignored, as the
-   * overview displays the colours regardless.
+   * For test suite only.
    */
   @Override
   protected Color getResidueBoxColour(boolean showBoxes,
-          ResidueShaderI shader,
-          SequenceGroup[] allGroups, SequenceI seq, int i)
+          ResidueShaderI shader, SequenceGroup[] allGroups, SequenceI seq,
+          int i)
+  {
+    return new Color(
+            getResidueBoxColourInt(showBoxes, shader, allGroups, seq, i));
+  }
+
+  /**
+   * In the overview, the showBoxes setting is ignored, as the overview displays
+   * the colours regardless.
+   */
+  protected int getResidueBoxColourInt(boolean showBoxes,
+          ResidueShaderI shader, SequenceGroup[] allGroups, SequenceI seq,
+          int i)
   {
-    ResidueShaderI currentShader;
     SequenceGroup currentSequenceGroup = getCurrentSequenceGroup(allGroups,
             i);
-    if (currentSequenceGroup != null)
-    {
-      currentShader = currentSequenceGroup.getGroupColourScheme();
-    }
-    else
-    {
-      currentShader = shader;
-    }
-
-    return getBoxColour(currentShader, seq, i);
+    ResidueShaderI currentShader = (currentSequenceGroup == null ? shader
+            : currentSequenceGroup.getGroupColourScheme());
+    return getBoxColourInt(currentShader, seq, i);
   }
 
   /**