git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
04d19d4
)
JAL-2388 Add missed optimisation
author
kiramt
<k.mourao@dundee.ac.uk>
Mon, 15 May 2017 14:50:07 +0000
(15:50 +0100)
committer
kiramt
<k.mourao@dundee.ac.uk>
Mon, 15 May 2017 14:50:07 +0000
(15:50 +0100)
src/jalview/renderer/OverviewRenderer.java
patch
|
blob
|
history
diff --git
a/src/jalview/renderer/OverviewRenderer.java
b/src/jalview/renderer/OverviewRenderer.java
index
69676c8
..
9291ca6
100644
(file)
--- a/
src/jalview/renderer/OverviewRenderer.java
+++ b/
src/jalview/renderer/OverviewRenderer.java
@@
-95,20
+95,27
@@
public class OverviewRenderer
Math.round((colIndex + 1) * pixelsPerCol) - 1,
miniMe.getWidth() - 1);
Math.round((colIndex + 1) * pixelsPerCol) - 1,
miniMe.getWidth() - 1);
- // determine the colour based on the sequence and column position
- rgbcolor = getColumnColourFromSequence(seq,
- hidden || cols.isHidden(alignmentCol), alignmentCol, finder);
-
- // fill in the appropriate number of pixels
- for (int row = pixelRow; row <= endRow; ++row)
+ // don't do expensive colour determination if we're not going to use it
+ // NB this is important to avoid performance issues in the overview
+ // panel
+ if (pixelCol <= endCol)
{
{
- for (int col = pixelCol; col <= endCol; ++col)
+ // determine the colour based on the sequence and column position
+ rgbcolor = getColumnColourFromSequence(seq,
+ hidden || cols.isHidden(alignmentCol), alignmentCol,
+ finder);
+
+ // fill in the appropriate number of pixels
+ for (int row = pixelRow; row <= endRow; ++row)
{
{
- miniMe.setRGB(col, row, rgbcolor);
+ for (int col = pixelCol; col <= endCol; ++col)
+ {
+ miniMe.setRGB(col, row, rgbcolor);
+ }
}
}
- }
- pixelCol = endCol + 1;
+ pixelCol = endCol + 1;
+ }
colIndex++;
}
pixelRow = endRow + 1;
colIndex++;
}
pixelRow = endRow + 1;