X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOverviewPanel.java;h=9397cebbeaae42116937602076ff815fb8e382d4;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=39a232a57c3ce4bfae1fa46ccd1623c9a23fd2bb;hpb=be32c14cd8e48fe0a207cd7030cb9cd46f894678;p=jalview.git diff --git a/src/jalview/gui/OverviewPanel.java b/src/jalview/gui/OverviewPanel.java index 39a232a..9397ceb 100755 --- a/src/jalview/gui/OverviewPanel.java +++ b/src/jalview/gui/OverviewPanel.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) - * Copyright (C) $$Year-Rel$$ The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * @@ -92,7 +92,7 @@ public class OverviewPanel extends JPanel implements Runnable sr.renderGaps = false; sr.forOverview = true; fr = new FeatureRenderer(ap); - + // scale the initial size of overviewpanel to shape of alignment float initialScale = (float) av.getAlignment().getWidth() / (float) av.getAlignment().getHeight(); @@ -292,6 +292,8 @@ public class OverviewPanel extends JPanel implements Runnable int color = Color.white.getRGB(); int row, col; jalview.datamodel.SequenceI seq; + final boolean hasHiddenRows = av.hasHiddenRows(), hasHiddenCols = av + .hasHiddenColumns(); boolean hiddenRow = false; for (row = 0; row < sequencesHeight; row++) { @@ -309,7 +311,7 @@ public class OverviewPanel extends JPanel implements Runnable lastrow = (int) (row * sampleRow); hiddenRow = false; - if (av.hasHiddenRows()) + if (hasHiddenRows) { seq = av.getAlignment().getHiddenSequences() .getHiddenSequence(lastrow); @@ -362,8 +364,8 @@ public class OverviewPanel extends JPanel implements Runnable } if (hiddenRow - || (av.hasHiddenColumns() && !av.getColumnSelection() - .isVisible(lastcol))) + || (hasHiddenCols && !av.getColumnSelection().isVisible( + lastcol))) { color = new Color(color).darker().darker().getRGB(); }