X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOverviewPanel.java;h=d09c7561661fc11d2b6a849db27cd92fd71b4020;hb=781218e12641a89d5dd99906369d5b9807c1d203;hp=0b97682a43799274fd24212524e5dee5db41c529;hpb=59d682209891099d46b960509907c79e3fb276fe;p=jalview.git
diff --git a/src/jalview/gui/OverviewPanel.java b/src/jalview/gui/OverviewPanel.java
index 0b97682..d09c756 100755
--- a/src/jalview/gui/OverviewPanel.java
+++ b/src/jalview/gui/OverviewPanel.java
@@ -1,28 +1,38 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.gui;
import jalview.renderer.AnnotationRenderer;
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.image.*;
-import javax.swing.*;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionAdapter;
+import java.awt.image.BufferedImage;
+
+import javax.swing.JPanel;
/**
* DOCUMENT ME!
@@ -64,7 +74,7 @@ public class OverviewPanel extends JPanel implements Runnable
// main visible SeqCanvas
SequenceRenderer sr;
- FeatureRenderer fr;
+ jalview.renderer.seqfeatures.FeatureRenderer fr;
/**
* Creates a new OverviewPanel object.
@@ -132,7 +142,7 @@ public class OverviewPanel extends JPanel implements Runnable
@Override
public void mouseDragged(MouseEvent evt)
{
- if (!av.wrapAlignment)
+ if (!av.getWrapAlignment())
{
// TODO: feature: jv2.5 detect shift drag and update selection from
// it.
@@ -148,7 +158,7 @@ public class OverviewPanel extends JPanel implements Runnable
@Override
public void mousePressed(MouseEvent evt)
{
- if (!av.wrapAlignment)
+ if (!av.getWrapAlignment())
{
boxX = evt.getX();
boxY = evt.getY();
@@ -251,9 +261,9 @@ public class OverviewPanel extends JPanel implements Runnable
{
miniMe = null;
- if (av.showSequenceFeatures)
+ if (av.isShowSequenceFeatures())
{
- fr.transferSettings(ap.seqPanel.seqCanvas.getFeatureRenderer());
+ fr.transferSettings(ap.getSeqPanel().seqCanvas.getFeatureRenderer());
}
int alwidth = av.getAlignment().getWidth();
@@ -282,15 +292,28 @@ 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;
+ // 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
for (row = 0; row < sequencesHeight; row++)
{
+ if (resizeAgain)
+ {
+ break;
+ }
if ((int) (row * sampleRow) == lastrow)
{
// No need to recalculate the colours,
// Just copy from the row above
for (col = 0; col < width; col++)
{
+ if (resizeAgain)
+ {
+ break;
+ }
miniMe.setRGB(col, row, miniMe.getRGB(col, row - 1));
}
continue;
@@ -299,7 +322,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);
@@ -328,6 +351,10 @@ public class OverviewPanel extends JPanel implements Runnable
for (col = 0; col < width; col++)
{
+ if (resizeAgain)
+ {
+ break;
+ }
if ((int) (col * sampleCol) == lastcol
&& (int) (row * sampleRow) == lastrow)
{
@@ -341,7 +368,7 @@ public class OverviewPanel extends JPanel implements Runnable
{
color = sr.getResidueBoxColour(seq, lastcol).getRGB();
- if (av.showSequenceFeatures)
+ if (av.isShowSequenceFeatures())
{
color = fr.findFeatureColour(color, seq, lastcol);
}
@@ -352,8 +379,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();
}
@@ -368,6 +395,10 @@ public class OverviewPanel extends JPanel implements Runnable
renderer.updateFromAlignViewport(av);
for (col = 0; col < width; col++)
{
+ if (resizeAgain)
+ {
+ break;
+ }
lastcol = (int) (col * sampleCol);
{
mg.translate(col, sequencesHeight);
@@ -383,13 +414,17 @@ public class OverviewPanel extends JPanel implements Runnable
resizing = false;
- setBoxPosition();
-
if (resizeAgain)
{
resizeAgain = false;
updateOverviewImage();
}
+ else
+ {
+ lastMiniMe = miniMe;
+ }
+
+ setBoxPosition();
}
/**
@@ -444,6 +479,7 @@ public class OverviewPanel extends JPanel implements Runnable
repaint();
}
+ private BufferedImage lastMiniMe = null;
/**
* DOCUMENT ME!
*
@@ -453,19 +489,32 @@ public class OverviewPanel extends JPanel implements Runnable
@Override
public void paintComponent(Graphics g)
{
- if (resizing)
+ if (resizing || resizeAgain)
{
- g.setColor(Color.white);
+ if (lastMiniMe == null)
+ {
+ g.setColor(Color.white);
+ g.fillRect(0, 0, getWidth(), getHeight());
+ }
+ else
+ {
+ g.drawImage(lastMiniMe, 0, 0, getWidth(), getHeight(), this);
+ }
+ g.setColor(new Color(100, 100, 100, 25));
g.fillRect(0, 0, getWidth(), getHeight());
}
- else if (miniMe != null)
+ else if (lastMiniMe != null)
{
- g.drawImage(miniMe, 0, 0, this);
+ g.drawImage(lastMiniMe, 0, 0, this);
+ if (lastMiniMe != miniMe)
+ {
+ g.setColor(new Color(100, 100, 100, 25));
+ g.fillRect(0, 0, getWidth(), getHeight());
+ }
}
-
+ // TODO: render selected regions
g.setColor(Color.red);
g.drawRect(boxX, boxY, boxWidth, boxHeight);
g.drawRect(boxX + 1, boxY + 1, boxWidth - 2, boxHeight - 2);
-
}
}