X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOverviewPanel.java;h=714eec688ce9f2a27463b8b4ee7a25c071c7e934;hb=3bff9f93376444b36ca6b69d30193e10ea3c07ab;hp=244d884b50d4e2a08b87ba34757711d9a4d4fc93;hpb=588042b69abf8e60bcc950b24c283933c7dd422f;p=jalview.git

diff --git a/src/jalview/gui/OverviewPanel.java b/src/jalview/gui/OverviewPanel.java
index 244d884..714eec6 100755
--- a/src/jalview/gui/OverviewPanel.java
+++ b/src/jalview/gui/OverviewPanel.java
@@ -21,305 +21,430 @@ package jalview.gui;
 import java.awt.*;
 import java.awt.event.*;
 import java.awt.image.*;
+
 import javax.swing.*;
 
-public class OverviewPanel
-    extends JPanel implements Runnable
+
+/**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
+public class OverviewPanel extends JPanel implements Runnable
 {
-  BufferedImage miniMe;
-  AlignViewport av;
-  AlignmentPanel ap;
-  float scalew = 1f;
-  float scaleh = 1f;
-  int width;
-  int sequencesHeight;
-  int graphHeight = 30;
-  int boxX = -1;
-  int boxY = -1;
-  int boxWidth = -1;
-  int boxHeight = -1;
-  boolean resizing = false;
-
-  public OverviewPanel(AlignmentPanel ap)
-  {
-    this.av = ap.av;
-    this.ap = ap;
-    setLayout(null);
-
-    // scale the initial size of overviewpanel to shape of alignment
-    float initialScale = (float) av.alignment.getWidth() /
-        (float) av.alignment.getHeight();
-
-    if (av.alignment.getWidth() > av.alignment.getHeight())
+    BufferedImage miniMe;
+    AlignViewport av;
+    AlignmentPanel ap;
+    float scalew = 1f;
+    float scaleh = 1f;
+    int width;
+    int sequencesHeight;
+    int graphHeight = 20;
+    int boxX = -1;
+    int boxY = -1;
+    int boxWidth = -1;
+    int boxHeight = -1;
+    boolean resizing = false;
+
+    // Can set different properties in this seqCanvas than
+    // main visible SeqCanvas
+    SequenceRenderer sr;
+    FeatureRenderer fr;
+
+    /**
+     * Creates a new OverviewPanel object.
+     *
+     * @param ap DOCUMENT ME!
+     */
+    public OverviewPanel(AlignmentPanel ap)
     {
-      // wider
-      width = 400;
-      sequencesHeight = (int) (400f / initialScale);
-    }
-    else
-    {
-      // taller
-      width = (int) (400f * initialScale);
-      sequencesHeight = 300;
+        this.av = ap.av;
+        this.ap = ap;
+        setLayout(null);
 
-      if (width < 120)
-      {
-        width = 120;
-      }
-    }
+        sr = new SequenceRenderer(av);
+        sr.renderGaps = false;
+        sr.forOverview = true;
+        fr = new FeatureRenderer(av);
 
-    addComponentListener(new ComponentAdapter()
-    {
-      public void componentResized(ComponentEvent evt)
-      {
-        if ( (getWidth() != width) ||
-            (getHeight() != (sequencesHeight + graphHeight)))
+        // scale the initial size of overviewpanel to shape of alignment
+        float initialScale = (float) av.alignment.getWidth() / (float) av.alignment.getHeight();
+
+        if(av.conservation==null)
+          graphHeight = 0;
+
+
+        if (av.alignment.getWidth() > av.alignment.getHeight())
         {
-          updateOverviewImage();
+            // 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;
+            }
         }
-      }
-    });
 
-    addMouseMotionListener(new MouseMotionAdapter()
-    {
-      public void mouseDragged(MouseEvent evt)
-      {
-        doMouseDragged(evt);
-      }
-    });
+        addComponentListener(new ComponentAdapter()
+            {
+                public void componentResized(ComponentEvent evt)
+                {
+                    if ((getWidth() != width) ||
+                            (getHeight() != (sequencesHeight + graphHeight)))
+                    {
+                        updateOverviewImage();
+                    }
+                }
+            });
+
+        addMouseMotionListener(new MouseMotionAdapter()
+            {
+                public void mouseDragged(MouseEvent evt)
+                {
+                  if (!av.wrapAlignment)
+                  {
+                    boxX = evt.getX();
+                    boxY = evt.getY();
+                    checkValid();
+                  }
+                }
+            });
+
+        addMouseListener(new MouseAdapter()
+            {
+                public void mousePressed(MouseEvent evt)
+                {
+                  if(!av.wrapAlignment)
+                  {
+                    boxX = evt.getX();
+                    boxY = evt.getY();
+                    checkValid();
+                  }
+                }
+            });
+
+        updateOverviewImage();
+    }
+
 
-    addMouseListener(new MouseAdapter()
+    /**
+     * DOCUMENT ME!
+     */
+    void checkValid()
     {
-      public void mousePressed(MouseEvent evt)
-      {
-        doMousePressed(evt);
-      }
+        if (boxY < 0)
+        {
+            boxY = 0;
+        }
 
-      public void mouseReleased(MouseEvent evt)
-      {
-        doMouseReleased(evt);
-      }
-    });
+        if (boxY > (sequencesHeight - boxHeight))
+        {
+            boxY = sequencesHeight - boxHeight + 1;
+        }
 
-    updateOverviewImage();
-  }
+        if (boxX < 0)
+        {
+            boxX = 0;
+        }
 
-  public void doMousePressed(MouseEvent evt)
-  {
-    boxX = evt.getX();
-    boxY = evt.getY();
+        if (boxX > (width - boxWidth))
+        {
+          if(av.hasHiddenColumns)
+          {
+            //Try smallest possible box
+            boxWidth = (int) ( (av.endRes - av.startRes + 1) *
+                                   av.getCharWidth() * scalew);
+          }
+          boxX = width - boxWidth;
+        }
 
-    checkValid();
-    repaint();
-  }
+        int col = (int) (boxX / scalew / av.getCharWidth());
+        int row = (int) (boxY / scaleh / av.getCharHeight());
 
-  public void doMouseReleased(MouseEvent evt)
-  {
-    boxX = evt.getX();
-    boxY = evt.getY();
-    checkValid();
+        if (av.hasHiddenColumns)
+        {
+          if (!av.getColumnSelection().isVisible(col))
+          {
+            return;
+          }
 
-    if (!resizing)
-    {
-      ap.setScrollValues( (int) (boxX / scalew / av.getCharWidth()),
-                         (int) (boxY / scaleh / av.getCharHeight()));
-    }
-  }
+          col = av.getColumnSelection().findColumnPosition(col);
+        }
+
+        if( av.hasHiddenRows )
+        {
+          row = av.alignment.getHiddenSequences().findIndexWithoutHiddenSeqs(row);
+        }
 
-  public void doMouseDragged(MouseEvent evt)
-  {
-    boxX = evt.getX();
-    boxY = evt.getY();
-    checkValid();
+        ap.setScrollValues( col, row );
 
-    if (!resizing)
-    {
-      ap.setScrollValues( (int) (boxX / scalew / av.getCharWidth()),
-                         (int) (boxY / scaleh / av.getCharHeight()));
     }
-  }
 
-  void checkValid()
-  {
-    if (boxY < 0)
+    /**
+     * DOCUMENT ME!
+     */
+    public void updateOverviewImage()
     {
-      boxY = 0;
-    }
+        if (resizing)
+        {
+            resizeAgain = true;
+            return;
+        }
 
-    if (boxY > (sequencesHeight - boxHeight))
-    {
-      boxY = sequencesHeight - boxHeight + 1;
-    }
+        resizing = true;
 
-    if (boxX < 0)
-    {
-      boxX = 0;
-    }
+        if ( (getWidth() > 0) && (getHeight() > 0))
+        {
+          width = getWidth();
+          sequencesHeight = getHeight() - graphHeight;
+        }
 
-    if (boxX > (width - boxWidth))
-    {
-      boxX = width - boxWidth;
+        setPreferredSize(new Dimension(width, sequencesHeight + graphHeight));
+
+        Thread thread = new Thread(this);
+        thread.start();
+        repaint();
     }
-  }
 
-  public void updateOverviewImage()
-  {
-    if (resizing)
+    // This is set true if the user resizes whilst
+    // the overview is being calculated
+    boolean resizeAgain = false;
+
+    /**
+     * DOCUMENT ME!
+     */
+    public void run()
     {
-      return;
-    }
+        miniMe = null;
 
-    resizing = true;
+       if (av.showSequenceFeatures)
+       {
+         fr.transferSettings( ap.seqPanel.seqCanvas.getFeatureRenderer() );
+       }
 
-    Thread thread = new Thread(this);
-    thread.start();
-    repaint();
-  }
+        int alwidth = av.alignment.getWidth();
+        int alheight = av.alignment.getHeight()
+            +av.alignment.getHiddenSequences().getSize();
 
-  public void run()
-  {
-    miniMe = null;
+        setPreferredSize(new Dimension(width, sequencesHeight + graphHeight));
 
-    int alwidth = av.alignment.getWidth();
-    int alheight = av.alignment.getHeight();
+        int fullsizeWidth = alwidth * av.getCharWidth();
+        int fullsizeHeight = alheight * av.getCharHeight();
 
-    if ( (getWidth() > 0) && (getHeight() > 0))
-    {
-      width = getWidth();
-      sequencesHeight = getHeight() - graphHeight;
-    }
+        scalew = (float) width / (float) fullsizeWidth;
+        scaleh = (float) sequencesHeight / (float) fullsizeHeight;
 
-    setPreferredSize(new Dimension(width, sequencesHeight + graphHeight));
+        miniMe = new BufferedImage(width, sequencesHeight + graphHeight,
+                BufferedImage.TYPE_INT_RGB);
 
-    int fullsizeWidth = alwidth * av.getCharWidth();
-    int fullsizeHeight = alheight * av.getCharHeight();
 
-    scalew = (float) width / (float) fullsizeWidth;
-    scaleh = (float) sequencesHeight / (float) fullsizeHeight;
+        Graphics mg = miniMe.getGraphics();
+        mg.setColor(Color.orange);
+        mg.fillRect(0,0,width, miniMe.getHeight());
 
-    miniMe = new BufferedImage(width, sequencesHeight + graphHeight,
-                               BufferedImage.TYPE_INT_RGB);
+        float sampleCol = (float) alwidth / (float) width;
+        float sampleRow = (float) alheight / (float) sequencesHeight;
 
-    Graphics mg = miniMe.getGraphics();
-    BufferedImage consensus = new BufferedImage(fullsizeWidth, 60,
-                                                BufferedImage.TYPE_3BYTE_BGR);
-    Graphics g = consensus.getGraphics();
-    ap.annotationPanel.drawGraph(g, av.conservation, fullsizeWidth, 60);
-    mg.drawImage(consensus, 0, sequencesHeight, width,
-                 sequencesHeight + graphHeight, 0, 0, fullsizeWidth, 60, this);
+        int lastcol=-1, lastrow=-1;
+        int color = Color.white.getRGB();
+        int row, col;
+        jalview.datamodel.SequenceI seq;
+        boolean hiddenRow = false;
+        for (row = 0; row < sequencesHeight; row++)
+        {
+          if((int)(row*sampleRow)==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;
+          }
 
-    boolean oldRenderGaps = av.renderGaps;
+          lastrow = (int)(row*sampleRow);
 
-    try
-    {
-      // We'll have to draw the full size alignment in chunks, as an image of the
-      // whole alignment requires too much memory
-      // Max size depends on the font size, the following is a
-      // guess at a size which works
-      int maxSize = 2000 / av.getFont().getSize();
-      BufferedImage block;
-      int blockx = 0;
-      int blocky = 0;
-      int blockw = 0;
-      int blockh = 0;
-      int eRes = 0;
-      int eSeq = 0;
-
-      av.setRenderGaps(false);
-
-      for (int sRes = 0, chunkx = 0; sRes < alwidth;
-           sRes += maxSize, chunkx++)
-      {
-        eSeq = 0;
-        eRes += maxSize;
+          hiddenRow = false;
+          if (av.hasHiddenRows)
+          {
+            seq = av.alignment.getHiddenSequences().getHiddenSequence(lastrow);
+            if (seq == null)
+            {
 
-        if (eRes > alwidth)
-        {
-          eRes = alwidth;
-        }
+              int index =
+                 av.alignment.getHiddenSequences().findIndexWithoutHiddenSeqs(lastrow);
 
-        for (int sSeq = 0, chunky = 0; sSeq < alheight;
-             sSeq += maxSize, chunky++)
-        {
-          eSeq += maxSize;
 
-          if (eSeq > alheight)
+             seq = av.alignment.getSequenceAt(index);
+            }
+            else
+            {
+              hiddenRow = true;
+            }
+          }
+          else
+            seq = av.alignment.getSequenceAt(lastrow);
+
+          if(seq==null)
           {
-            eSeq = alheight;
+            System.out.println(lastrow+" null");
+            continue;
           }
 
-          blocky = 0;
-          blockx = (int) ( (float) sRes / (float) alwidth * width);
+            for (col = 0; col < width; col++)
+            {
+            if((int)(col*sampleCol) == lastcol && (int)(row*sampleRow)==lastrow)
+            {
+              miniMe.setRGB(col,row,color);
+              continue;
+            }
+
+
+            lastcol = (int)(col*sampleCol);
 
-          block = new BufferedImage( (eRes - sRes) * av.charWidth,
-                                    (eSeq - sSeq) * av.charHeight,
-                                    BufferedImage.TYPE_3BYTE_BGR);
-          g = block.getGraphics();
+            if (seq.getLength() > lastcol)
+            {
+              color = sr.getResidueBoxColour(
+                  seq, lastcol).getRGB();
 
-          ap.seqPanel.seqCanvas.drawPanel(g, sRes, eRes, sSeq, eSeq,
-                                          sRes, sSeq, 0);
+              if (av.showSequenceFeatures)
+                color = fr.findFeatureColour(color, lastrow, lastcol);
+            }
+            else
+            {
+              color = -1; //White
+            }
 
-          blockh = (int) ( (float) (eSeq - sSeq) / (float) alheight *
-                          sequencesHeight) +
-              1;
-          blockw = (int) ( (float) (eRes - sRes) / (float) alwidth * width) +
-              1;
+            if(hiddenRow ||
+               (av.hasHiddenColumns && !av.getColumnSelection().isVisible(lastcol)))
+            {
+              color = new Color(color).darker().darker().getRGB();
+            }
 
-          blocky += (int) ( (float) sSeq / (float) alheight * sequencesHeight);
 
-          mg.drawImage(block, blockx, blocky, blockx + blockw,
-                       blocky + blockh, 0, 0, block.getWidth(),
-                       block.getHeight(), this);
+            miniMe.setRGB(col,row,color);
 
-          block = null;
+
+          }
         }
-      }
-    }
-    catch (OutOfMemoryError error)
-    {
-      System.err.println(
-          "Out of memory when trying to calculate the overview window image!");
-    }
 
-    av.setRenderGaps(oldRenderGaps);
-    resizing = false;
-
-    setBoxPosition();
-  }
-
-  public void setBoxPosition()
-  {
-    boxX = (int) (av.getStartRes() * av.getCharWidth() * scalew);
-    boxY = (int) (av.getStartSeq() * av.getCharHeight() * scaleh);
-    boxWidth = (int) ( (av.getEndRes() - av.getStartRes() + 1) *
-                      av.getCharWidth() * scalew);
-    boxHeight = (int) (av.getEndSeq() * av.getCharHeight() * scaleh) -
-        boxY;
-    repaint();
-  }
-
-  public void paintComponent(Graphics g)
-  {
-    g.setColor(Color.white);
-    g.fillRect(0, 0, getWidth(), getHeight());
-    g.setColor(Color.black);
-
-    if (resizing)
-    {
-      g.setFont(new Font("Verdana", Font.BOLD, 15));
-      g.drawString("Recalculating", 5, sequencesHeight / 2);
-      g.drawString("Overview.....", 5, (sequencesHeight / 2) + 20);
+        if (av.conservation != null)
+        {
+          for (col = 0; col < width; col++)
+          {
+            lastcol = (int) (col * sampleCol);
+            {
+              mg.translate(col, sequencesHeight);
+              ap.annotationPanel.drawGraph(mg, av.conservation,
+                                           (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();
+        }
     }
-    else
+
+    /**
+     * DOCUMENT ME!
+     */
+    public void setBoxPosition()
     {
-      if (miniMe != null)
+      int fullsizeWidth = av.alignment.getWidth() * av.getCharWidth();
+      int fullsizeHeight = (av.alignment.getHeight()
+                   +av.alignment.getHiddenSequences().getSize()) * av.getCharHeight();
+
+      int startRes = av.getStartRes();
+      int endRes = av.getEndRes();
+
+      if(av.hasHiddenColumns)
       {
-        g.drawImage(miniMe, 0, 0, this);
+        startRes = av.getColumnSelection().adjustForHiddenColumns(startRes);
+        endRes = av.getColumnSelection().adjustForHiddenColumns(endRes);
       }
 
-      g.setColor(Color.red);
-      g.drawRect(boxX, boxY, boxWidth, boxHeight);
-      g.drawRect(boxX + 1, boxY + 1, boxWidth - 2, boxHeight - 2);
+      int startSeq = av.startSeq;
+      int endSeq = av.endSeq;
+
+      if (av.hasHiddenRows)
+      {
+        startSeq =
+            av.alignment.getHiddenSequences().adjustForHiddenSeqs(startSeq);
+
+        endSeq =
+            av.alignment.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);
+        else
+          boxWidth = (int) ((endRes - startRes + 1) * av.getCharWidth() * scalew);
+
+
+        boxHeight = (int) ((endSeq - startSeq) * av.getCharHeight() * scaleh);
+
+
+        repaint();
+    }
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param g DOCUMENT ME!
+     */
+    public void paintComponent(Graphics g)
+    {
+        if (miniMe != null && !resizing)
+        {
+          g.drawImage(miniMe, 0, 0, this);
+        }
+        else
+        {
+          g.setColor(Color.white);
+          g.fillRect(0, 0, getWidth(), getHeight());
+          g.setColor(Color.black);
+          g.setFont(new Font("Verdana", Font.BOLD, 15));
+          g.drawString("Recalculating", 5, sequencesHeight / 2);
+          g.drawString("Overview.....", 5, (sequencesHeight / 2) + 20);
+        }
+
+
+        g.setColor(Color.red);
+        g.drawRect(boxX, boxY, boxWidth, boxHeight);
+        g.drawRect(boxX + 1, boxY + 1, boxWidth - 2, boxHeight - 2);
+
     }
-  }
 }