X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOverviewPanel.java;h=d87285c63079761b69151e3125d5724bbbf8f9fc;hb=fce4313f5daea7f5b5914bfaefd11e946664942c;hp=95d194b7a8da5f8dadd2b69a60ced6030aeaab47;hpb=25aaaa87042b3f507ad4348120df7dd073182759;p=jalview.git

diff --git a/src/jalview/gui/OverviewPanel.java b/src/jalview/gui/OverviewPanel.java
index 95d194b..d87285c 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 2.8.2b1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -21,109 +21,82 @@
 package jalview.gui;
 
 import jalview.renderer.AnnotationRenderer;
+import jalview.viewmodel.OverviewDimensions;
 
-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!
+ * Panel displaying an overview of the full alignment, with an interactive box
+ * representing the viewport onto the alignment.
  * 
  * @author $author$
  * @version $Revision$
  */
 public class OverviewPanel extends JPanel implements Runnable
 {
-  BufferedImage miniMe;
-
-  AlignViewport av;
-
-  AlignmentPanel ap;
-
-  final AnnotationRenderer renderer = new AnnotationRenderer();
-
-  float scalew = 1f;
-
-  float scaleh = 1f;
+  private static final Color TRANS_GREY = new Color(100, 100, 100, 25);
 
-  int width;
+  private final AnnotationRenderer renderer = new AnnotationRenderer();
 
-  int sequencesHeight;
+  private OverviewDimensions od;
 
-  int graphHeight = 20;
+  private BufferedImage miniMe;
 
-  int boxX = -1;
+  private BufferedImage lastMiniMe = null;
 
-  int boxY = -1;
+  private AlignViewport av;
 
-  int boxWidth = -1;
+  private AlignmentPanel ap;
 
-  int boxHeight = -1;
+  //
+  private boolean resizing = false;
 
-  boolean resizing = false;
+  // This is set true if the user resizes whilst
+  // the overview is being calculated
+  private boolean resizeAgain = false;
 
   // Can set different properties in this seqCanvas than
   // main visible SeqCanvas
-  SequenceRenderer sr;
+  private SequenceRenderer sr;
 
-  jalview.renderer.seqfeatures.FeatureRenderer fr;
+  private jalview.renderer.seqfeatures.FeatureRenderer fr;
 
   /**
    * Creates a new OverviewPanel object.
    * 
-   * @param ap
-   *          DOCUMENT ME!
+   * @param alPanel
+   *          The alignment panel which is shown in the overview panel
    */
-  public OverviewPanel(AlignmentPanel ap)
+  public OverviewPanel(AlignmentPanel alPanel)
   {
-    this.av = ap.av;
-    this.ap = ap;
+    this.av = alPanel.av;
+    this.ap = alPanel;
     setLayout(null);
 
     sr = new SequenceRenderer(av);
     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();
-
-    if (av.getAlignmentConservationAnnotation() == null)
-    {
-      graphHeight = 0;
-    }
+    fr = new FeatureRenderer(alPanel);
 
-    if (av.getAlignment().getWidth() > av.getAlignment().getHeight())
-    {
-      // wider
-      width = 400;
-      sequencesHeight = (int) (400f / initialScale);
-      if (sequencesHeight < 40)
-      {
-        sequencesHeight = 40;
-      }
-    }
-    else
-    {
-      // taller
-      width = (int) (400f * initialScale);
-      sequencesHeight = 300;
-
-      if (width < 120)
-      {
-        width = 120;
-      }
-    }
+    od = new OverviewDimensions(av);
 
     addComponentListener(new ComponentAdapter()
     {
       @Override
       public void componentResized(ComponentEvent evt)
       {
-        if ((getWidth() != width)
-                || (getHeight() != (sequencesHeight + graphHeight)))
+        if ((getWidth() != od.getWidth())
+                || (getHeight() != (od.getHeight())))
         {
           updateOverviewImage();
         }
@@ -135,13 +108,12 @@ 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.
-          boxX = evt.getX();
-          boxY = evt.getY();
-          checkValid();
+          od.setBoxPositionByMouse(evt.getX(), evt.getY());
+          ap.setScrollValues(od.getScrollCol(), od.getScrollRow());
         }
       }
     });
@@ -151,11 +123,10 @@ 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();
-          checkValid();
+          od.setBoxPositionByMouse(evt.getX(), evt.getY());
+          ap.setScrollValues(od.getScrollCol(), od.getScrollRow());
         }
       }
     });
@@ -164,60 +135,7 @@ public class OverviewPanel extends JPanel implements Runnable
   }
 
   /**
-   * DOCUMENT ME!
-   */
-  void checkValid()
-  {
-    if (boxY < 0)
-    {
-      boxY = 0;
-    }
-
-    if (boxY > (sequencesHeight - boxHeight))
-    {
-      boxY = sequencesHeight - boxHeight + 1;
-    }
-
-    if (boxX < 0)
-    {
-      boxX = 0;
-    }
-
-    if (boxX > (width - boxWidth))
-    {
-      if (av.hasHiddenColumns())
-      {
-        // Try smallest possible box
-        boxWidth = (int) ((av.endRes - av.startRes + 1) * av.getCharWidth() * scalew);
-      }
-      boxX = width - boxWidth;
-    }
-
-    int col = (int) (boxX / scalew / av.getCharWidth());
-    int row = (int) (boxY / scaleh / av.getCharHeight());
-
-    if (av.hasHiddenColumns())
-    {
-      if (!av.getColumnSelection().isVisible(col))
-      {
-        return;
-      }
-
-      col = av.getColumnSelection().findColumnPosition(col);
-    }
-
-    if (av.hasHiddenRows())
-    {
-      row = av.getAlignment().getHiddenSequences()
-              .findIndexWithoutHiddenSeqs(row);
-    }
-
-    ap.setScrollValues(col, row);
-
-  }
-
-  /**
-   * DOCUMENT ME!
+   * Updates the overview image when the related alignment panel is updated
    */
   public void updateOverviewImage()
   {
@@ -231,24 +149,17 @@ public class OverviewPanel extends JPanel implements Runnable
 
     if ((getWidth() > 0) && (getHeight() > 0))
     {
-      width = getWidth();
-      sequencesHeight = getHeight() - graphHeight;
+      od.setWidth(getWidth()); // width = getWidth();
+      od.setHeight(getHeight()); // sequencesHeight = getHeight() - graphHeight;
     }
 
-    setPreferredSize(new Dimension(width, sequencesHeight + graphHeight));
+    setPreferredSize(new Dimension(od.getWidth(), od.getHeight()));
 
     Thread thread = new Thread(this);
     thread.start();
     repaint();
   }
 
-  // This is set true if the user resizes whilst
-  // the overview is being calculated
-  boolean resizeAgain = false;
-
-  /**
-   * DOCUMENT ME!
-   */
   @Override
   public void run()
   {
@@ -259,68 +170,114 @@ public class OverviewPanel extends JPanel implements Runnable
       fr.transferSettings(ap.getSeqPanel().seqCanvas.getFeatureRenderer());
     }
 
+    // why do we need to set preferred size again? was set in
+    // updateOverviewImage
+    setPreferredSize(new Dimension(od.getWidth(), od.getHeight()));
+
+    miniMe = new BufferedImage(od.getWidth(), od.getHeight(),
+            BufferedImage.TYPE_INT_RGB);
+
+    Graphics mg = miniMe.getGraphics();
+    mg.setColor(Color.orange);
+    mg.fillRect(0, 0, od.getWidth(), miniMe.getHeight());
+
+    // calculate scale based on current alignment width and height
+    od.updateScales();
+
+    // calculate sampleCol and sampleRow
+    // alignment width is max number of residues/bases
+    // alignment height is number of sequences
     int alwidth = av.getAlignment().getWidth();
     int alheight = av.getAlignment().getHeight()
             + av.getAlignment().getHiddenSequences().getSize();
 
-    setPreferredSize(new Dimension(width, sequencesHeight + graphHeight));
+    // sampleCol or sampleRow is the width/height allocated to each residue
+    // in particular, sometimes we may need more than one row/col of the
+    // BufferedImage allocated
+    // sampleCol is how much of a residue to assign to each pixel
+    // sampleRow is how many sequences to assign to each pixel
+    float sampleCol = alwidth / (float) od.getWidth();
+    float sampleRow = alheight / (float) od.getSequencesHeight();
 
-    int fullsizeWidth = alwidth * av.getCharWidth();
-    int fullsizeHeight = alheight * av.getCharHeight();
+    buildImage(sampleRow, sampleCol);
 
-    scalew = (float) width / (float) fullsizeWidth;
-    scaleh = (float) sequencesHeight / (float) fullsizeHeight;
+    if (av.getAlignmentConservationAnnotation() != null)
+    {
+      renderer.updateFromAlignViewport(av);
+      for (int col = 0; col < od.getWidth() && !resizeAgain; col++)
+      {
+        mg.translate(col, od.getSequencesHeight());
+        renderer.drawGraph(mg, av.getAlignmentConservationAnnotation(),
+                av.getAlignmentConservationAnnotation().annotations,
+                (int) (sampleCol) + 1, od.getGraphHeight(),
+                (int) (col * sampleCol), (int) (col * sampleCol) + 1);
+        mg.translate(-col, -od.getSequencesHeight());
 
-    miniMe = new BufferedImage(width, sequencesHeight + graphHeight,
-            BufferedImage.TYPE_INT_RGB);
+      }
+    }
+    System.gc();
 
-    Graphics mg = miniMe.getGraphics();
-    mg.setColor(Color.orange);
-    mg.fillRect(0, 0, width, miniMe.getHeight());
+    resizing = false;
 
-    float sampleCol = (float) alwidth / (float) width;
-    float sampleRow = (float) alheight / (float) sequencesHeight;
+    if (resizeAgain)
+    {
+      resizeAgain = false;
+      updateOverviewImage();
+    }
+    else
+    {
+      lastMiniMe = miniMe;
+    }
 
-    int lastcol = -1, lastrow = -1;
+    setBoxPosition();
+  }
+
+  private void buildImage(float sampleRow, float sampleCol)
+  {
+    int lastcol = -1;
+    int lastrow = -1;
     int color = Color.white.getRGB();
-    int row, col;
-    jalview.datamodel.SequenceI seq;
+
+    jalview.datamodel.SequenceI seq = null;
+    final boolean hasHiddenRows = av.hasHiddenRows();
+    final boolean hasHiddenCols = av.hasHiddenColumns();
     boolean hiddenRow = false;
-    for (row = 0; row < sequencesHeight; row++)
+    // 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 (int row = 0; row < od.getSequencesHeight() && !resizeAgain; row++)
     {
-      if ((int) (row * sampleRow) == lastrow)
+      boolean doCopy = true;
+      int currentrow = (int) (row * sampleRow);
+      if (currentrow != lastrow)
       {
-        // No need to recalculate the colours,
-        // Just copy from the row above
-        for (col = 0; col < width; col++)
-        {
-          miniMe.setRGB(col, row, miniMe.getRGB(col, row - 1));
-        }
-        continue;
-      }
+        doCopy = false;
 
-      lastrow = (int) (row * sampleRow);
+        lastrow = currentrow;
 
-      hiddenRow = false;
-      if (av.hasHiddenRows())
-      {
-        seq = av.getAlignment().getHiddenSequences()
-                .getHiddenSequence(lastrow);
-        if (seq == null)
+        hiddenRow = false;
+        // should be method(s) in Alignment
+        if (hasHiddenRows)
         {
-          int index = av.getAlignment().getHiddenSequences()
-                  .findIndexWithoutHiddenSeqs(lastrow);
+          seq = av.getAlignment().getHiddenSequences()
+                  .getHiddenSequence(lastrow);
+          if (seq == null)
+          {
+            int index = av.getAlignment().getHiddenSequences()
+                    .findIndexWithoutHiddenSeqs(lastrow);
 
-          seq = av.getAlignment().getSequenceAt(index);
+            seq = av.getAlignment().getSequenceAt(index);
+          }
+          else
+          {
+            hiddenRow = true;
+          }
         }
         else
         {
-          hiddenRow = true;
+          seq = av.getAlignment().getSequenceAt(lastrow);
         }
-      }
-      else
-      {
-        seq = av.getAlignment().getSequenceAt(lastrow);
+        // end of Alignment method(s)
       }
 
       if (seq == null)
@@ -329,146 +286,100 @@ public class OverviewPanel extends JPanel implements Runnable
         continue;
       }
 
-      for (col = 0; col < width; col++)
+      for (int col = 0; col < od.getWidth() && !resizeAgain; col++)
       {
-        if ((int) (col * sampleCol) == lastcol
-                && (int) (row * sampleRow) == lastrow)
+        if (doCopy)
         {
-          miniMe.setRGB(col, row, color);
-          continue;
+          color = miniMe.getRGB(col, row - 1);
         }
-
-        lastcol = (int) (col * sampleCol);
-
-        if (seq.getLength() > lastcol)
+        else if ((int) (col * sampleCol) != lastcol
+                || (int) (row * sampleRow) != lastrow)
         {
-          color = sr.getResidueBoxColour(seq, lastcol).getRGB();
-
-          if (av.isShowSequenceFeatures())
-          {
-            color = fr.findFeatureColour(color, seq, lastcol);
-          }
-        }
-        else
-        {
-          color = -1; // White
-        }
-
-        if (hiddenRow
-                || (av.hasHiddenColumns() && !av.getColumnSelection()
-                        .isVisible(lastcol)))
-        {
-          color = new Color(color).darker().darker().getRGB();
+          lastcol = (int) (col * sampleCol);
+          color = getColumnColourFromSequence(seq, hiddenRow, hasHiddenCols,
+                  lastcol);
         }
+        // else if ((int) (col * sampleCol) == lastcol && (int) (row *
+        // sampleRow) == lastrow))
+        // we just use the color we already have , so don't need to set it
 
         miniMe.setRGB(col, row, color);
-
-      }
-    }
-
-    if (av.getAlignmentConservationAnnotation() != null)
-    {
-      renderer.updateFromAlignViewport(av);
-      for (col = 0; col < width; col++)
-      {
-        lastcol = (int) (col * sampleCol);
-        {
-          mg.translate(col, sequencesHeight);
-          renderer.drawGraph(mg, av.getAlignmentConservationAnnotation(),
-                  av.getAlignmentConservationAnnotation().annotations,
-                  (int) (sampleCol) + 1, graphHeight,
-                  (int) (col * sampleCol), (int) (col * sampleCol) + 1);
-          mg.translate(-col, -sequencesHeight);
-        }
       }
     }
-    System.gc();
-
-    resizing = false;
-
-    setBoxPosition();
-
-    if (resizeAgain)
-    {
-      resizeAgain = false;
-      updateOverviewImage();
-    }
   }
 
-  /**
-   * DOCUMENT ME!
+  /*
+   * Find the colour of a sequence at a specified column position
    */
-  public void setBoxPosition()
+  private int getColumnColourFromSequence(jalview.datamodel.SequenceI seq,
+          boolean hiddenRow, boolean hasHiddenCols, int lastcol)
   {
-    int fullsizeWidth = av.getAlignment().getWidth() * av.getCharWidth();
-    int fullsizeHeight = (av.getAlignment().getHeight() + av.getAlignment()
-            .getHiddenSequences().getSize())
-            * av.getCharHeight();
+    int color;
 
-    int startRes = av.getStartRes();
-    int endRes = av.getEndRes();
-
-    if (av.hasHiddenColumns())
+    if (seq.getLength() > lastcol)
     {
-      startRes = av.getColumnSelection().adjustForHiddenColumns(startRes);
-      endRes = av.getColumnSelection().adjustForHiddenColumns(endRes);
-    }
+      color = sr.getResidueBoxColour(seq, lastcol).getRGB();
 
-    int startSeq = av.startSeq;
-    int endSeq = av.endSeq;
-
-    if (av.hasHiddenRows())
-    {
-      startSeq = av.getAlignment().getHiddenSequences()
-              .adjustForHiddenSeqs(startSeq);
-
-      endSeq = av.getAlignment().getHiddenSequences()
-              .adjustForHiddenSeqs(endSeq);
-
-    }
-
-    scalew = (float) width / (float) fullsizeWidth;
-    scaleh = (float) sequencesHeight / (float) fullsizeHeight;
-
-    boxX = (int) (startRes * av.getCharWidth() * scalew);
-    boxY = (int) (startSeq * av.getCharHeight() * scaleh);
-
-    if (av.hasHiddenColumns())
-    {
-      boxWidth = (int) ((endRes - startRes + 1) * av.getCharWidth() * scalew);
+      if (av.isShowSequenceFeatures())
+      {
+        color = fr.findFeatureColour(color, seq, lastcol);
+      }
     }
     else
     {
-      boxWidth = (int) ((endRes - startRes + 1) * av.getCharWidth() * scalew);
+      color = Color.white.getRGB(); // White
     }
 
-    boxHeight = (int) ((endSeq - startSeq) * av.getCharHeight() * scaleh);
+    if (hiddenRow
+            || (hasHiddenCols && !av.getColumnSelection()
+                    .isVisible(lastcol)))
+    {
+      color = new Color(color).darker().darker().getRGB();
+    }
 
-    repaint();
+    return color;
   }
 
   /**
-   * DOCUMENT ME!
+   * Update the overview panel box when the associated alignment panel is
+   * changed
    * 
-   * @param g
-   *          DOCUMENT ME!
    */
+  public void setBoxPosition()
+  {
+    od.setBoxPosition();
+    repaint();
+  }
+
+
   @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(TRANS_GREY);
       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(TRANS_GREY);
+        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);
-
+    od.drawBox(g);
   }
 }