git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2443 push getResidueBoxColour inside getResidueColour
[jalview.git]
/
src
/
jalview
/
gui
/
OverviewPanel.java
diff --git
a/src/jalview/gui/OverviewPanel.java
b/src/jalview/gui/OverviewPanel.java
index
1c48690
..
4097c40
100755
(executable)
--- a/
src/jalview/gui/OverviewPanel.java
+++ b/
src/jalview/gui/OverviewPanel.java
@@
-21,6
+21,7
@@
package jalview.gui;
import jalview.renderer.AnnotationRenderer;
package jalview.gui;
import jalview.renderer.AnnotationRenderer;
+import jalview.renderer.seqfeatures.FeatureColourFinder;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Color;
import java.awt.Dimension;
@@
-289,7
+290,7
@@
public class OverviewPanel extends JPanel implements Runnable
float sampleRow = (float) alheight / (float) sequencesHeight;
int lastcol = -1, lastrow = -1;
float sampleRow = (float) alheight / (float) sequencesHeight;
int lastcol = -1, lastrow = -1;
- int color = Color.white.getRGB();
+ Color color = Color.white;
int row, col;
jalview.datamodel.SequenceI seq;
final boolean hasHiddenRows = av.hasHiddenRows(), hasHiddenCols = av
int row, col;
jalview.datamodel.SequenceI seq;
final boolean hasHiddenRows = av.hasHiddenRows(), hasHiddenCols = av
@@
-298,6
+299,9
@@
public class OverviewPanel extends JPanel implements Runnable
// get hidden row and hidden column map once at beginning.
// clone featureRenderer settings to avoid race conditions... if state is
// updated just need to refresh again
// get hidden row and hidden column map once at beginning.
// clone featureRenderer settings to avoid race conditions... if state is
// updated just need to refresh again
+
+ FeatureColourFinder finder = new FeatureColourFinder(fr);
+
for (row = 0; row < sequencesHeight; row++)
{
if (resizeAgain)
for (row = 0; row < sequencesHeight; row++)
{
if (resizeAgain)
@@
-358,7
+362,7
@@
public class OverviewPanel extends JPanel implements Runnable
if ((int) (col * sampleCol) == lastcol
&& (int) (row * sampleRow) == lastrow)
{
if ((int) (col * sampleCol) == lastcol
&& (int) (row * sampleRow) == lastrow)
{
- miniMe.setRGB(col, row, color);
+ miniMe.setRGB(col, row, color.getRGB());
continue;
}
continue;
}
@@
-366,26
+370,21
@@
public class OverviewPanel extends JPanel implements Runnable
if (seq.getLength() > lastcol)
{
if (seq.getLength() > lastcol)
{
- color = sr.getResidueBoxColour(seq, lastcol).getRGB();
-
- if (av.isShowSequenceFeatures())
- {
- color = fr.findFeatureColour(color, seq, lastcol);
- }
+ color = sr.getResidueColour(seq, lastcol, finder);
}
else
{
}
else
{
- color = -1; // White
+ color = Color.WHITE;
}
if (hiddenRow
|| (hasHiddenCols && !av.getColumnSelection().isVisible(
lastcol)))
{
}
if (hiddenRow
|| (hasHiddenCols && !av.getColumnSelection().isVisible(
lastcol)))
{
- color = new Color(color).darker().darker().getRGB();
+ color = color.darker().darker();
}
}
- miniMe.setRGB(col, row, color);
+ miniMe.setRGB(col, row, color.getRGB());
}
}
}
}