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
Merge branch 'develop' into efficiency/JAL-2034_JAL-1421
[jalview.git]
/
src
/
jalview
/
appletgui
/
OverviewPanel.java
diff --git
a/src/jalview/appletgui/OverviewPanel.java
b/src/jalview/appletgui/OverviewPanel.java
index
1749e23
..
9b2be4c
100755
(executable)
--- a/
src/jalview/appletgui/OverviewPanel.java
+++ b/
src/jalview/appletgui/OverviewPanel.java
@@
-265,7
+265,8
@@
public class OverviewPanel extends Panel implements Runnable,
{
miniMe = null;
int alwidth = av.getAlignment().getWidth();
{
miniMe = null;
int alwidth = av.getAlignment().getWidth();
- int alheight = av.getAlignment().getHeight();
+ int alheight = av.getAlignment().getHeight()
+ + av.getAlignment().getHiddenSequences().getSize();
if (av.isShowSequenceFeatures())
{
if (av.isShowSequenceFeatures())
{
@@
-298,10
+299,16
@@
public class OverviewPanel extends Panel implements Runnable,
Color color = Color.yellow;
int row, col, sameRow = 0, sameCol = 0;
jalview.datamodel.SequenceI seq;
Color color = Color.yellow;
int row, col, sameRow = 0, sameCol = 0;
jalview.datamodel.SequenceI seq;
+ final boolean hasHiddenRows = av.hasHiddenRows(), hasHiddenCols = av
+ .hasHiddenColumns();
boolean hiddenRow = false;
AlignmentI alignment = av.getAlignment();
for (row = 0; row <= sequencesHeight; row++)
{
boolean hiddenRow = false;
AlignmentI alignment = av.getAlignment();
for (row = 0; row <= sequencesHeight; row++)
{
+ if (resizeAgain)
+ {
+ break;
+ }
if ((int) (row * sampleRow) == lastrow)
{
sameRow++;
if ((int) (row * sampleRow) == lastrow)
{
sameRow++;
@@
-309,7
+316,7
@@
public class OverviewPanel extends Panel implements Runnable,
}
hiddenRow = false;
}
hiddenRow = false;
- if (av.hasHiddenRows())
+ if (hasHiddenRows)
{
seq = alignment.getHiddenSequences().getHiddenSequence(lastrow);
if (seq == null)
{
seq = alignment.getHiddenSequences().getHiddenSequence(lastrow);
if (seq == null)
@@
-355,8
+362,8
@@
public class OverviewPanel extends Panel implements Runnable,
}
if (hiddenRow
}
if (hiddenRow
- || (av.hasHiddenColumns() && !av.getColumnSelection()
- .isVisible(lastcol)))
+ || (hasHiddenCols && !av.getColumnSelection().isVisible(
+ lastcol)))
{
color = color.darker().darker();
}
{
color = color.darker().darker();
}
@@
-383,6
+390,10
@@
public class OverviewPanel extends Panel implements Runnable,
{
for (col = 0; col < width; col++)
{
{
for (col = 0; col < width; col++)
{
+ if (resizeAgain)
+ {
+ break;
+ }
lastcol = (int) (col * sampleCol);
{
mg.translate(col, sequencesHeight);
lastcol = (int) (col * sampleCol);
{
mg.translate(col, sequencesHeight);