X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOverviewPanel.java;h=01ca97899a390a9b4c4b788a477943b33d69e5b3;hb=e5b6a315d9cffef8b66a8be031c4cdb542fb3a6e;hp=3662ec298f88f3d1b8293faf61951b5f37b92c3e;hpb=9c5d69ef1e102b1eac18ec13c362522f40c9000d;p=jalview.git

diff --git a/src/jalview/gui/OverviewPanel.java b/src/jalview/gui/OverviewPanel.java
index 3662ec2..01ca978 100755
--- a/src/jalview/gui/OverviewPanel.java
+++ b/src/jalview/gui/OverviewPanel.java
@@ -1,368 +1,159 @@
-/*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
- *
- * This program 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 2
- * of the License, or (at your option) any later version.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-package jalview.gui;
-
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.image.*;
-
-import javax.swing.*;
-
-
-/**
- * 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 = 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)
-    {
-        this.av = ap.av;
-        this.ap = ap;
-        setLayout(null);
-
-        sr = new SequenceRenderer(av);
-        sr.renderGaps( false );
-        fr = new FeatureRenderer(av);
-        fr.transparency = ap.seqPanel.seqCanvas.getFeatureRenderer().transparency;
-        fr.featuresDisplayed = ap.seqPanel.seqCanvas.getFeatureRenderer().featuresDisplayed;
-
-        // 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())
-        {
-            // 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;
-            }
-        }
-
-        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)
-                    doMouseDragged(evt);
-                }
-            });
-
-        addMouseListener(new MouseAdapter()
-            {
-                public void mousePressed(MouseEvent evt)
-                {
-                  if(!av.wrapAlignment)
-                    doMousePressed(evt);
-                }
-
-                public void mouseReleased(MouseEvent evt)
-                {
-                  if(!av.wrapAlignment)
-                    doMouseReleased(evt);
-                }
-            });
-
-        updateOverviewImage();
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param evt DOCUMENT ME!
-     */
-    public void doMousePressed(MouseEvent evt)
-    {
-        boxX = evt.getX();
-        boxY = evt.getY();
-
-        checkValid();
-        repaint();
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param evt DOCUMENT ME!
-     */
-    public void doMouseReleased(MouseEvent evt)
-    {
-        boxX = evt.getX();
-        boxY = evt.getY();
-        checkValid();
-
-        ap.setScrollValues((int) (boxX / scalew / av.getCharWidth()),
-                (int) (boxY / scaleh / av.getCharHeight()));
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param evt DOCUMENT ME!
-     */
-    public void doMouseDragged(MouseEvent evt)
-    {
-        boxX = evt.getX();
-        boxY = evt.getY();
-        checkValid();
-
-        ap.setScrollValues( (int) (boxX / scalew / av.getCharWidth()),
-                           (int) (boxY / scaleh / av.getCharHeight()));
-       repaint();
-    }
-
-    /**
-     * 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))
-        {
-            boxX = width - boxWidth;
-        }
-    }
-
-    /**
-     * DOCUMENT ME!
-     */
-    public void updateOverviewImage()
-    {
-        if (resizing)
-        {
-            resizeAgain = true;
-            return;
-        }
-
-        resizing = true;
-
-        if ( (getWidth() > 0) && (getHeight() > 0))
-        {
-          width = getWidth();
-          sequencesHeight = getHeight() - graphHeight;
-        }
-
-        setPreferredSize(new Dimension(width, sequencesHeight + graphHeight));
-        setBoxPosition();
-
-        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!
-     */
-    public void run()
-    {
-        miniMe = null;
-
-        int alwidth = av.alignment.getWidth();
-        int alheight = av.alignment.getHeight();
-
-        setPreferredSize(new Dimension(width, sequencesHeight + graphHeight));
-
-        int fullsizeWidth = alwidth * av.getCharWidth();
-        int fullsizeHeight = alheight * av.getCharHeight();
-
-        scalew = (float) width / (float) fullsizeWidth;
-        scaleh = (float) sequencesHeight / (float) fullsizeHeight;
-
-        miniMe = new BufferedImage(width, sequencesHeight + graphHeight,
-                BufferedImage.TYPE_INT_RGB);
-
-
-        Graphics mg = miniMe.getGraphics();
-        mg.setColor(Color.orange);
-        mg.fillRect(0,0,width, miniMe.getHeight());
-
-        float sampleCol = (float) alwidth / (float) width;
-        float sampleRow = (float) alheight / (float) sequencesHeight;
-
-        int lastcol=-1, lastrow=-1;
-        Color color = Color.white;
-        for (int col = 0; col < width; col++)
-        {
-          for (int row = 0; row < sequencesHeight; row++)
-          {
-            if((int)(col*sampleCol) == lastcol && (int)(row*sampleRow)==lastrow)
-            {
-              miniMe.setRGB(col,row,color.getRGB());
-              continue;
-            }
-
-            lastrow = (int)(row*sampleRow);
-            lastcol = (int)(col*sampleCol);
-
-            color = sr.getResidueBoxColour(
-                av.alignment.getSequenceAt(lastrow), lastcol);
-
-            if(av.showSequenceFeatures)
-            {
-              color = fr.findFeatureColour(color,
-                                                       av.alignment.getSequenceAt(lastrow),
-                                                       lastcol);
-            }
-
-            miniMe.setRGB(col,row,color.getRGB());
-
-            if (av.conservation != null)
-            {
-              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();
-        }
-    }
-
-    /**
-     * DOCUMENT ME!
-     */
-    public void setBoxPosition()
-    {
-      int fullsizeWidth = av.alignment.getWidth() * av.getCharWidth();
-      int fullsizeHeight = av.alignment.getHeight() * av.getCharHeight();
-
-      scalew = (float) width / (float) fullsizeWidth;
-      scaleh = (float) sequencesHeight / (float) fullsizeHeight;
-
-        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();
-    }
-
-    /**
-     * 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);
-
-    }
-}
+/*
+ * 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.
+ *  
+ * 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 <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
+package jalview.gui;
+
+import jalview.viewmodel.OverviewDimensions;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+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 javax.swing.JPanel;
+
+/**
+ * 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
+{
+  private OverviewDimensions od;
+
+  private OverviewCanvas oviewCanvas;
+
+  private AlignViewport av;
+
+  private AlignmentPanel ap;
+
+  /**
+   * Creates a new OverviewPanel object.
+   * 
+   * @param alPanel
+   *          The alignment panel which is shown in the overview panel
+   */
+  public OverviewPanel(AlignmentPanel alPanel)
+  {
+    this.av = alPanel.av;
+    this.ap = alPanel;
+
+    od = new OverviewDimensions(av.getRanges(), av.isShowAnnotation());
+
+    oviewCanvas = new OverviewCanvas(od, av, ap, this);
+    setLayout(new BorderLayout());
+    add(oviewCanvas, BorderLayout.CENTER);
+
+    addComponentListener(new ComponentAdapter()
+    {
+      @Override
+      public void componentResized(ComponentEvent evt)
+      {
+        if ((getWidth() != od.getWidth())
+                || (getHeight() != (od.getHeight())))
+        {
+          updateOverviewImage();
+        }
+      }
+    });
+
+    addMouseMotionListener(new MouseMotionAdapter()
+    {
+      @Override
+      public void mouseDragged(MouseEvent evt)
+      {
+        if (!av.getWrapAlignment())
+        {
+          od.updateViewportFromMouse(evt.getX(), evt.getY(), av
+                  .getAlignment().getHiddenSequences(), av
+                  .getColumnSelection(), av.getRanges());
+          ap.setScrollValues(od.getScrollCol(), od.getScrollRow());
+        }
+      }
+    });
+
+    addMouseListener(new MouseAdapter()
+    {
+      @Override
+      public void mousePressed(MouseEvent evt)
+      {
+        if (!av.getWrapAlignment())
+        {
+          od.updateViewportFromMouse(evt.getX(), evt.getY(), av
+                  .getAlignment().getHiddenSequences(), av
+                  .getColumnSelection(), av.getRanges());
+          ap.setScrollValues(od.getScrollCol(), od.getScrollRow());
+        }
+      }
+    });
+
+    updateOverviewImage();
+  }
+
+  /**
+   * Updates the overview image when the related alignment panel is updated
+   */
+  public void updateOverviewImage()
+  {
+    if (oviewCanvas.resizing)
+    {
+      oviewCanvas.resizeAgain = true;
+      return;
+    }
+
+    oviewCanvas.resizing = true;
+
+    if ((getWidth() > 0) && (getHeight() > 0))
+    {
+      od.setWidth(getWidth());
+      od.setHeight(getHeight());
+    }
+
+    setPreferredSize(new Dimension(od.getWidth(), od.getHeight()));
+
+    Thread thread = new Thread(this);
+    thread.start();
+    repaint();
+  }
+
+  @Override
+  public void run()
+  {
+    oviewCanvas.draw(av.isShowSequenceFeatures(), av.isShowAnnotation());
+    setBoxPosition();
+  }
+
+  /**
+   * Update the overview panel box when the associated alignment panel is
+   * changed
+   * 
+   */
+  public void setBoxPosition()
+  {
+    od.setBoxPosition(av.getAlignment()
+            .getHiddenSequences(), av.getColumnSelection(), av.getRanges());
+    repaint();
+  }
+}