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

diff --git a/src/jalview/gui/OverviewPanel.java b/src/jalview/gui/OverviewPanel.java
index 2c67388..01ca978 100755
--- a/src/jalview/gui/OverviewPanel.java
+++ b/src/jalview/gui/OverviewPanel.java
@@ -1,168 +1,159 @@
-package jalview.gui;
-
-import javax.swing.*;
-import java.awt.event.*;
-import java.awt.image.*;
-import java.awt.*;
-
-public class OverviewPanel extends JPanel
-{
-  BufferedImage miniMe;
-  AlignViewport av;
-  AlignmentPanel ap;
-  float scalew = 1f;
-  float scaleh = 1f;
-
-  int sequencesWidth=400, sequencesHeight=150;
-  int graphHeight=30;
-  int boxX=-1, boxY=-1, boxWidth=-1, boxHeight=-1;
-
-  public OverviewPanel(AlignmentPanel ap, AlignViewport av)
-  {
-    this.av = av;
-    this.ap = ap;
-    setSize(sequencesWidth, sequencesHeight+graphHeight);
-    setLayout(null);
-
-    updateOverviewImage();
-
-    addComponentListener(new ComponentAdapter()
-   {
-
-       public void componentResized(ComponentEvent evt)
-       {
-         if( getWidth()!=sequencesWidth || getHeight()!=sequencesHeight+graphHeight)
-           updateOverviewImage();
-       }
-   });
-
-
-    addMouseMotionListener(new MouseMotionAdapter()
-           {
-             public void mouseDragged(MouseEvent evt)
-             { doMouseDragged(evt);}
-           });
-
-    addMouseListener(new MouseAdapter()
-    {
-      public void mousePressed(MouseEvent evt)
-      { doMousePressed(evt);}
-      public void mouseReleased(MouseEvent evt)
-      { doMouseReleased(evt);}
-    });
-
-  }
-
-  public void doMousePressed(MouseEvent evt)
-  {
-    checkValid(evt.getX(), evt.getY());
-    repaint();
-  }
-
-  public void doMouseReleased(MouseEvent evt)
-  {
-    int x = evt.getX();
-    int y = evt.getY();
-    checkValid(x, y);
-    ap.setScrollValues( (int)(x/scalew/av.getCharWidth()), (int)(y/scaleh/av.getCharHeight()) );
-  }
-
-  public void doMouseDragged(MouseEvent evt)
-  {
-    int x = evt.getX();
-    int y = evt.getY();
-    checkValid(x, y);
-    ap.setScrollValues( (int)(x/scalew/av.getCharWidth()), (int)(y/scaleh/av.getCharHeight()) );
-    repaint();
-  }
-
-  void checkValid(int x, int y)
-  {
-
-    if (y < 0)
-      y = 0;
-    if (y > sequencesHeight - boxHeight)
-      y = sequencesHeight- boxHeight;
-
-
-    if (x < 0)
-      x = 0;
-
-    if (x > sequencesWidth - boxWidth)
-      x = sequencesWidth - boxWidth;
-
-    boxX = x;
-    boxY = y;
-  }
-
-  public void updateOverviewImage()
-  {
-   miniMe = null;
-   setPreferredSize (new Dimension(sequencesWidth, sequencesHeight+graphHeight));
-   sequencesWidth=getWidth();
-   sequencesHeight=this.getHeight()-graphHeight;
-
-
-    int fullsizeWidth = (int)(av.getAlignment().getWidth()*av.getCharWidth());
-    int fullsizeHeight = av.getAlignment().getHeight()*av.getCharHeight();
-
-
-    BufferedImage fullSize = new BufferedImage(fullsizeWidth,
-                                               fullsizeHeight,
-                                               BufferedImage.TYPE_INT_RGB);
-
-    BufferedImage consensus = new BufferedImage(fullsizeWidth,
-                                               80,
-                                               BufferedImage.TYPE_INT_RGB);
-
-
-    Graphics g = fullSize.getGraphics();
-    ap.seqPanel.seqCanvas.drawPanel(g,0,av.getAlignment().getWidth(),0,av.getAlignment().getHeight(),0,0,0);
-
-    g = consensus.getGraphics();
-    ap.scorePanel.drawScorePanel(g, fullsizeWidth, 0, av.getAlignment().getWidth());
-
-    try{
-      miniMe = new BufferedImage(sequencesWidth, sequencesHeight + graphHeight,
-                                 BufferedImage.TYPE_INT_RGB);
-      Graphics mg = miniMe.getGraphics();
-
-      mg.drawImage(fullSize, 0, 0, sequencesWidth, sequencesHeight, 0, 0,
-                   fullsizeWidth, fullsizeHeight, this);
-      mg.drawImage(consensus, 0, sequencesHeight, sequencesWidth,
-                   sequencesHeight + graphHeight, 0, 0, fullsizeWidth, 60, this);
-
-      scalew = (float) sequencesWidth / (float) fullsizeWidth;
-      scaleh = (float) sequencesHeight / (float) fullsizeHeight;
-
-      setBoxPosition();
-    }catch(Exception ex)
-    {// most likely the frame size is zero
-      miniMe = null;
-    }
-
-  }
-
-  public void setBoxPosition()
-  {
-      boxX = (int) (av.getStartRes() * av.getCharWidth() * scalew);
-      boxY = (int) (av.getStartSeq() * av.getCharHeight() * scaleh);
-      boxWidth = (int) (av.getEndRes() * av.getCharWidth() * scalew) - boxX;
-      boxHeight = (int) (av.getEndSeq() * av.getCharHeight() * scaleh) - boxY;
-      repaint();
-
-  }
-
-
-  public void paintComponent(Graphics g)
-  {
-    if(miniMe!=null)
-      g.drawImage(miniMe, 0,0,this);
-
-    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();
+  }
+}