X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FOverviewPanel.java;fp=src%2Fjalview%2Fappletgui%2FOverviewPanel.java;h=2fc5716a1eb253a8d21072b38b39e0d36d71103c;hb=6e5286721b2711415a80d34364ae24b7a81fe2f9;hp=e2d986e6e5f8531263c2f72b7544db85bb9f3508;hpb=32f013e4de40a95ac786d49a30e802a00bb8f1ba;p=jalview.git diff --git a/src/jalview/appletgui/OverviewPanel.java b/src/jalview/appletgui/OverviewPanel.java index e2d986e..2fc5716 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; @@ -248,6 +249,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 +279,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 +307,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