X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FScalePanel.java;h=36b414f8b1ace36acefd408407a69bef6c82ca5b;hb=d0b7395c10aec7c5da5a5662fc69783ec78fae8d;hp=486b87a578c7b880c94369461b9ee0f0ad4c65c7;hpb=efc31b4a8d5cee63555586804a2b79c06bdb5a14;p=jalview.git

diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index 486b87a..36b414f 100755
--- a/src/jalview/gui/ScalePanel.java
+++ b/src/jalview/gui/ScalePanel.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2007 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
@@ -18,13 +18,11 @@
  */
 package jalview.gui;
 
-import jalview.datamodel.*;
-
 import java.awt.*;
 import java.awt.event.*;
-
 import javax.swing.*;
 
+import jalview.datamodel.*;
 
 /**
  * DOCUMENT ME!
@@ -32,250 +30,451 @@ import javax.swing.*;
  * @author $author$
  * @version $Revision$
  */
-public class ScalePanel extends JPanel
+public class ScalePanel
+    extends JPanel implements MouseMotionListener, MouseListener
 {
-    protected int offy = 4;
-
-    /** DOCUMENT ME!! */
-    public int width;
-    protected AlignViewport av;
-    AlignmentPanel ap;
-    boolean stretchingGroup = false;
-    int min; //used by mouseDragged to see if user
-    int max; //used by mouseDragged to see if user
-
-    // wants to delete columns
-    public ScalePanel(AlignViewport av, AlignmentPanel ap)
+  protected int offy = 4;
+
+  /** DOCUMENT ME!! */
+  public int width;
+  protected AlignViewport av;
+  AlignmentPanel ap;
+  boolean stretchingGroup = false;
+  int min; //used by mouseDragged to see if user
+  int max; //used by mouseDragged to see if user
+  boolean mouseDragging = false;
+
+  // wants to delete columns
+  public ScalePanel(AlignViewport av, AlignmentPanel ap)
+  {
+    this.av = av;
+    this.ap = ap;
+
+    addMouseListener(this);
+    addMouseMotionListener(this);
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param evt DOCUMENT ME!
+   */
+  public void mousePressed(MouseEvent evt)
+  {
+    int x = (evt.getX() / av.getCharWidth()) + av.getStartRes();
+    final int res;
+
+    if (av.hasHiddenColumns)
     {
-        this.av = av;
-        this.ap = ap;
-
-        addMouseListener(new MouseAdapter()
-            {
-                public void mousePressed(MouseEvent evt)
-                {
-                    doMousePressed(evt);
-                }
-
-                public void mouseReleased(MouseEvent evt)
-                {
-                    doMouseReleased(evt);
-                }
-            });
-        addMouseMotionListener(new MouseMotionAdapter()
-            {
-                public void mouseDragged(MouseEvent evt)
-                {
-                    doMouseDragged(evt);
-                }
-            });
+      res = av.getColumnSelection().adjustForHiddenColumns(x);
     }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param evt DOCUMENT ME!
-     */
-    public void doMousePressed(MouseEvent evt)
+    else
     {
-        int x = evt.getX();
-        int res = (x / av.getCharWidth()) + av.getStartRes();
-        SequenceGroup sg = null;
+      res = x;
+    }
+
+    min = res;
+    max = res;
 
-        min = res;
-        max = res;
+    if (SwingUtilities.isRightMouseButton(evt))
+    {
+      JPopupMenu pop = new JPopupMenu();
+      if (reveal != null)
+      {
+        JMenuItem item = new JMenuItem("Reveal");
+        item.addActionListener(new ActionListener()
+        {
+          public void actionPerformed(ActionEvent e)
+          {
+            av.showColumn(reveal[0]);
+            reveal = null;
+            ap.paintAlignment(true);
+            if (ap.overviewPanel != null)
+            {
+              ap.overviewPanel.updateOverviewImage();
+            }
+          }
+        });
+        pop.add(item);
 
-        if (av.getColumnSelection().contains(res))
+        if (av.getColumnSelection().getHiddenColumns().size() > 1)
         {
-            av.getColumnSelection().removeElement(res);
-            ap.annotationPanel.removeEditableColumn(res);
+          item = new JMenuItem("Reveal All");
+          item.addActionListener(new ActionListener()
+          {
+            public void actionPerformed(ActionEvent e)
+            {
+              av.showAllHiddenColumns();
+              reveal = null;
+              ap.paintAlignment(true);
+              if (ap.overviewPanel != null)
+              {
+                ap.overviewPanel.updateOverviewImage();
+              }
+            }
+          });
+          pop.add(item);
         }
-        else
+        pop.show(this, evt.getX(), evt.getY());
+      }
+      else if (av.getColumnSelection().contains(res))
+      {
+        JMenuItem item = new JMenuItem("Hide Columns");
+        item.addActionListener(new ActionListener()
         {
-            av.getColumnSelection().addElement(res);
-            sg = new SequenceGroup();
-
-            for (int i = 0; i < av.alignment.getSequences().size(); i++)
+          public void actionPerformed(ActionEvent e)
+          {
+            av.hideColumns(res, res);
+            if (av.getSelectionGroup() != null
+                && av.getSelectionGroup().getSize() == av.alignment.getHeight())
             {
-                sg.addSequence(av.alignment.getSequenceAt(i), false);
+              av.setSelectionGroup(null);
             }
 
-            sg.setStartRes(res);
-            sg.setEndRes(res);
+            ap.paintAlignment(true);
+            if (ap.overviewPanel != null)
+            {
+              ap.overviewPanel.updateOverviewImage();
+            }
+          }
+        });
+        pop.add(item);
+        pop.show(this, evt.getX(), evt.getY());
+      }
+    }
+    else // LEFT MOUSE TO SELECT
+    {
+      if (!evt.isControlDown() && !evt.isShiftDown())
+      {
+        av.getColumnSelection().clear();
+      }
+
+      av.getColumnSelection().addElement(res);
+      SequenceGroup sg = new SequenceGroup();
+      for (int i = 0; i < av.alignment.getSequences().size(); i++)
+      {
+        sg.addSequence(av.alignment.getSequenceAt(i), false);
+      }
+
+      sg.setStartRes(res);
+      sg.setEndRes(res);
+      av.setSelectionGroup(sg);
+
+      if (evt.isShiftDown())
+      {
+        int min = Math.min(av.getColumnSelection().getMin(), res);
+        int max = Math.max(av.getColumnSelection().getMax(), res);
+        for (int i = min; i < max; i++)
+        {
+          av.getColumnSelection().addElement(i);
         }
+        sg.setStartRes(min);
+        sg.setEndRes(max);
+      }
+
+    }
+
+    ap.paintAlignment(true);
+  }
 
-        av.setSelectionGroup(sg);
-        ap.repaint();
+  /**
+   * DOCUMENT ME!
+   *
+   * @param evt DOCUMENT ME!
+   */
+  public void mouseReleased(MouseEvent evt)
+  {
+    mouseDragging = false;
+
+    int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
+
+    if (res > av.alignment.getWidth())
+    {
+      res = av.alignment.getWidth() - 1;
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param evt DOCUMENT ME!
-     */
-    public void doMouseReleased(MouseEvent evt)
+    if (av.hasHiddenColumns)
     {
-        int x = evt.getX();
-        int res = (x / av.getCharWidth()) + av.getStartRes();
+      res = av.getColumnSelection().adjustForHiddenColumns(res);
+    }
 
-        if (av.getColumnSelection() != null)
-        {
-            for (int i = 0; i < av.getColumnSelection().size(); i++)
-            {
-                ap.annotationPanel.addEditableColumn(av.getColumnSelection()
-                                                       .columnAt(i));
-            }
-        }
+    if (!stretchingGroup)
+    {
+      ap.paintAlignment(true);
 
-        if (!stretchingGroup)
-        {
-            ap.repaint();
+      return;
+    }
 
-            return;
-        }
+    SequenceGroup sg = av.getSelectionGroup();
 
-        SequenceGroup sg = av.getSelectionGroup();
+    if (sg != null)
+    {
+      if (res > sg.getStartRes())
+      {
+        sg.setEndRes(res);
+      }
+      else if (res < sg.getStartRes())
+      {
+        sg.setStartRes(res);
+      }
+    }
+    stretchingGroup = false;
+    ap.paintAlignment(true);
+  }
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param evt DOCUMENT ME!
+   */
+  public void mouseDragged(MouseEvent evt)
+  {
+    mouseDragging = true;
+
+    int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
+    if (res < 0)
+    {
+      res = 0;
+    }
 
-        if (res > sg.getStartRes())
-        {
-            sg.setEndRes(res);
-        }
-        else if (res < sg.getStartRes())
-        {
-            sg.setStartRes(res);
-        }
+    if (av.hasHiddenColumns)
+    {
+      res = av.getColumnSelection().adjustForHiddenColumns(res);
+    }
 
-        stretchingGroup = false;
-        ap.repaint();
+    if (res > av.alignment.getWidth())
+    {
+      res = av.alignment.getWidth() - 1;
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param evt DOCUMENT ME!
-     */
-    public void doMouseDragged(MouseEvent evt)
+    if (res < min)
     {
-        int x = evt.getX();
-        int res = (x / av.getCharWidth()) + av.getStartRes();
+      min = res;
+    }
 
-        if (res < min)
+    if (res > max)
+    {
+      max = res;
+    }
+
+    SequenceGroup sg = av.getSelectionGroup();
+
+    if (sg != null)
+    {
+      stretchingGroup = true;
+
+      if (!av.getColumnSelection().contains(res))
+      {
+        av.getColumnSelection().addElement(res);
+      }
+
+      if (res > sg.getStartRes())
+      {
+        sg.setEndRes(res);
+      }
+      if (res < sg.getStartRes())
+      {
+        sg.setStartRes(res);
+      }
+
+      for (int i = min; i <= max; i++)
+      {
+        if ( (i < sg.getStartRes()) || (i > sg.getEndRes()))
         {
-            min = res;
+          av.getColumnSelection().removeElement(i);
         }
-
-        if (res > max)
+        else
         {
-            max = res;
+          av.getColumnSelection().addElement(i);
         }
+      }
 
-        SequenceGroup sg = av.getSelectionGroup();
-
-        if (sg != null)
-        {
-            stretchingGroup = true;
+      ap.paintAlignment(true);
+    }
+  }
 
-            if (!av.getColumnSelection().contains(res))
-            {
-                av.getColumnSelection().addElement(res);
-            }
+  public void mouseEntered(MouseEvent evt)
+  {
+    if (mouseDragging)
+    {
+      ap.seqPanel.scrollCanvas(null);
+    }
+  }
 
-            if (res > sg.getStartRes())
-            {
-                sg.setEndRes(res);
-            }
-            else if (res < sg.getStartRes())
-            {
-                sg.setStartRes(res);
-            }
+  public void mouseExited(MouseEvent evt)
+  {
+    if (mouseDragging)
+    {
+      ap.seqPanel.scrollCanvas(evt);
+    }
+  }
 
-            for (int i = min; i <= max; i++)
-            {
-                if ((i < sg.getStartRes()) || (i > sg.getEndRes()))
-                {
-                    av.getColumnSelection().removeElement(i);
-                    ap.annotationPanel.removeEditableColumn(res);
-                }
-                else
-                {
-                    av.getColumnSelection().addElement(i);
-                }
-            }
+  public void mouseClicked(MouseEvent evt)
+  {}
 
-            ap.repaint();
-        }
+  public void mouseMoved(MouseEvent evt)
+  {
+    if (!av.hasHiddenColumns)
+    {
+      return;
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param g DOCUMENT ME!
-     */
-    public void paintComponent(Graphics g)
+    int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
+
+    res = av.getColumnSelection().adjustForHiddenColumns(res);
+
+    reveal = null;
+    for (int i = 0; i < av.getColumnSelection().getHiddenColumns().size(); i++)
     {
-        drawScale(g, av.getStartRes(), av.getEndRes(), getWidth(), getHeight());
+      int[] region = (int[]) av.getColumnSelection().getHiddenColumns().
+          elementAt(i);
+      if (res + 1 == region[0] || res - 1 == region[1])
+      {
+        reveal = region;
+        ToolTipManager.sharedInstance().registerComponent(this);
+        this.setToolTipText("Reveal Hidden Columns with Right Mouse Button");
+        break;
+      }
+      else
+      {
+        this.setToolTipText(null);
+      }
+
     }
 
-    // scalewidth will normally be screenwidth,
-    public void drawScale(Graphics g, int startx, int endx, int width,
-        int height)
+    repaint();
+  }
+
+  int[] reveal;
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param g DOCUMENT ME!
+   */
+  public void paintComponent(Graphics g)
+  {
+    drawScale(g, av.getStartRes(), av.getEndRes(), getWidth(), getHeight());
+  }
+
+  // scalewidth will normally be screenwidth,
+  public void drawScale(Graphics g, int startx, int endx, int width,
+                        int height)
+  {
+    Graphics2D gg = (Graphics2D) g;
+    gg.setFont(av.getFont());
+
+    if (av.antiAlias)
     {
-        Graphics2D gg = (Graphics2D) g;
-        gg.setFont(av.getFont());
-        gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-            RenderingHints.VALUE_ANTIALIAS_ON);
-
-        //Fill in the background
-        gg.setColor(Color.white);
-        gg.fillRect(0, 0, width, height);
-        gg.setColor(Color.black);
+      gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+                          RenderingHints.VALUE_ANTIALIAS_ON);
+    }
 
-        //Fill the selected columns
-        ColumnSelection cs = av.getColumnSelection();
-        gg.setColor(new Color(220, 0, 0));
+    //Fill in the background
+    gg.setColor(Color.white);
+    gg.fillRect(0, 0, width, height);
+    gg.setColor(Color.black);
 
-        for (int i = 0; i < cs.size(); i++)
-        {
-            int sel = cs.columnAt(i);
+    //Fill the selected columns
+    ColumnSelection cs = av.getColumnSelection();
+    gg.setColor(new Color(220, 0, 0));
 
-            if ((sel >= startx) && (sel <= endx))
-            {
-                gg.fillRect((sel - startx) * av.charWidth, 0, av.charWidth,
+    for (int i = 0; i < cs.size(); i++)
+    {
+      int sel = cs.columnAt(i);
+      if (av.hasHiddenColumns)
+      {
+        sel = av.getColumnSelection().findColumnPosition(sel);
+      }
+
+      if ( (sel >= startx) && (sel <= endx))
+      {
+        gg.fillRect( (sel - startx) * av.charWidth, 0, av.charWidth,
                     getHeight());
-            }
-        }
+      }
+    }
 
-        // Draw the scale numbers
-        gg.setColor(Color.black);
+    // Draw the scale numbers
+    gg.setColor(Color.black);
 
-        int scalestartx = (startx / 10) * 10;
+    int scalestartx = (startx / 10) * 10;
 
-        FontMetrics fm = gg.getFontMetrics(av.getFont());
-        int y = av.charHeight - fm.getDescent();
+    FontMetrics fm = gg.getFontMetrics(av.getFont());
+    int y = av.charHeight - fm.getDescent();
 
-        if ((scalestartx % 10) == 0)
+    if ( (scalestartx % 10) == 0)
+    {
+      scalestartx += 5;
+    }
+
+    String string;
+    int maxX = 0;
+
+    for (int i = scalestartx; i < endx; i += 5)
+    {
+      if ( (i % 10) == 0)
+      {
+        string = String.valueOf(av.getColumnSelection().adjustForHiddenColumns(
+            i));
+        if ( (i - startx - 1) * av.charWidth > maxX)
         {
-            scalestartx += 5;
+          gg.drawString(string,
+                        (i - startx - 1) * av.charWidth, y);
+          maxX = (i - startx + 1) * av.charWidth + fm.stringWidth(string);
         }
 
-        for (int i = scalestartx; i < endx; i += 5)
+        gg.drawLine( (int) ( ( (i - startx - 1) * av.charWidth) +
+                            (av.charWidth / 2)), y + 2,
+                    (int) ( ( (i - startx - 1) * av.charWidth) +
+                           (av.charWidth / 2)),
+                    y + (fm.getDescent() * 2));
+
+      }
+      else
+      {
+        gg.drawLine( (int) ( ( (i - startx - 1) * av.charWidth) +
+                            (av.charWidth / 2)), y + fm.getDescent(),
+                    (int) ( ( (i - startx - 1) * av.charWidth) +
+                           (av.charWidth / 2)), y + (fm.getDescent() * 2));
+      }
+    }
+
+    if (av.hasHiddenColumns)
+    {
+      gg.setColor(Color.blue);
+      int res;
+      if (av.getShowHiddenMarkers())
+      {
+        for (int i = 0; i < av.getColumnSelection().getHiddenColumns().size();
+             i++)
         {
-            if ((i % 10) == 0)
-            {
-                gg.drawString(String.valueOf(i),
-                    (i - startx - 1) * av.charWidth, y);
-                gg.drawLine((int) (((i - startx - 1) * av.charWidth) +
-                    (av.charWidth / 2)), y + 2,
-                    (int) (((i - startx - 1) * av.charWidth) +
-                    (av.charWidth / 2)), y + (fm.getDescent() * 2));
-            }
-            else
-            {
-                gg.drawLine((int) (((i - startx - 1) * av.charWidth) +
-                    (av.charWidth / 2)), y + fm.getDescent(),
-                    (int) (((i - startx - 1) * av.charWidth) +
-                    (av.charWidth / 2)), y + (fm.getDescent() * 2));
-            }
+
+          res = av.getColumnSelection().findHiddenRegionPosition(i) -
+              startx;
+
+          if (res < 0 || res > endx - scalestartx)
+          {
+            continue;
+          }
+
+          gg.fillPolygon(new int[]
+                         {res * av.charWidth - av.charHeight / 4,
+                         res * av.charWidth + av.charHeight / 4,
+                         res * av.charWidth},
+                         new int[]
+                         {
+                         y - av.charHeight / 2, y - av.charHeight / 2,
+                         y + 8
+          }, 3);
+
         }
+      }
+
+      if (reveal != null && reveal[0] > startx && reveal[0] < endx)
+      {
+        gg.drawString("Reveal Columns", reveal[0] * av.charWidth, 0);
+      }
     }
+
+  }
 }