X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FScalePanel.java;h=262d1e1a26d184b448e3861fde87a37e4af6f179;hb=3596077c79b7aa2051b9aaa978481004b513101c;hp=551f262b5e366e655e2d234b2e04ff4670e91a93;hpb=92a3a0f396a86b2bc0a8d1a311680ceda4abec7b;p=jalview.git

diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index 551f262..262d1e1 100755
--- a/src/jalview/gui/ScalePanel.java
+++ b/src/jalview/gui/ScalePanel.java
@@ -18,198 +18,421 @@
  */
 package jalview.gui;
 
+import jalview.datamodel.*;
+
 import java.awt.*;
 import java.awt.event.*;
+
 import javax.swing.*;
 
-import jalview.datamodel.*;
 
-public class ScalePanel
-    extends JPanel
+/**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
+public class ScalePanel extends JPanel implements MouseMotionListener, MouseListener
 {
-  protected int offy = 4;
-  public int width;
-  protected AlignViewport av;
-  AlignmentPanel ap;
-  boolean stretchingGroup = false;
-
-  public ScalePanel(AlignViewport av, AlignmentPanel ap)
-  {
-    this.av = av;
-    this.ap = ap;
-
-    addMouseListener(new MouseAdapter()
+    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)
     {
-      public void mousePressed(MouseEvent evt)
-      {
-        doMousePressed(evt);
-      }
+        this.av = av;
+        this.ap = ap;
 
-      public void mouseReleased(MouseEvent evt)
-      {
-        doMouseReleased(evt);
-      }
-    });
-    addMouseMotionListener(new MouseMotionAdapter()
-    {
-      public void mouseDragged(MouseEvent evt)
-      {
-        doMouseDragged(evt);
-      }
-    });
-  }
-
-  public void doMousePressed(MouseEvent evt)
-  {
-    int x = evt.getX();
-    int res = (x / av.getCharWidth()) + av.getStartRes();
-    SequenceGroup sg = null;
+        addMouseListener(this);
+        addMouseMotionListener(this);
+    }
 
-    if (av.getColumnSelection().contains(res))
+    /**
+     * DOCUMENT ME!
+     *
+     * @param evt DOCUMENT ME!
+     */
+    public void mousePressed(MouseEvent evt)
     {
-      av.getColumnSelection().removeElement(res);
+        int x = (evt.getX() / av.getCharWidth()) + av.getStartRes();
+        final int res;
+
+        if(av.hasHiddenColumns)
+          res = av.getColumnSelection().adjustForHiddenColumns(x);
+        else
+          res = x;
+
+        min = res;
+        max = res;
+
+        if(reveal != null && SwingUtilities.isRightMouseButton(evt))
+          {
+            JPopupMenu pop = new JPopupMenu();
+            JMenuItem item = new JMenuItem("Reveal");
+            item.addActionListener(new ActionListener()
+            {
+              public void actionPerformed(ActionEvent e)
+              {
+                av.showColumn(reveal[0]);
+                reveal = null;
+                ap.repaint();
+                if(ap.overviewPanel != null)
+                    ap.overviewPanel.updateOverviewImage();
+              }
+            });
+            pop.add(item);
+
+            if(av.getColumnSelection().getHiddenColumns().size()>1)
+            {
+              item = new JMenuItem("Reveal All");
+              item.addActionListener(new ActionListener()
+              {
+                public void actionPerformed(ActionEvent e)
+                {
+                  av.showAllHiddenColumns();
+                  reveal = null;
+                  ap.repaint();
+                  if(ap.overviewPanel != null)
+                    ap.overviewPanel.updateOverviewImage();
+                }
+              });
+              pop.add(item);
+            }
+
+            pop.show(this, evt.getX(), evt.getY());
+
+          }
+        else
+      if (av.getColumnSelection().contains(res))
+        {
+          if( SwingUtilities.isRightMouseButton(evt))
+          {
+            JPopupMenu pop = new JPopupMenu();
+            JMenuItem item = new JMenuItem("Hide Columns");
+            item.addActionListener(new ActionListener()
+            {
+              public void actionPerformed(ActionEvent e)
+              {
+                av.hideColumns(res, res);
+                ap.repaint();
+                if(ap.overviewPanel != null)
+                  ap.overviewPanel.updateOverviewImage();
+              }
+            });
+            pop.add(item);
+            pop.show(this, evt.getX(), evt.getY());
+
+          }
+          else
+          {
+            av.getColumnSelection().removeElement(res);
+            av.setSelectionGroup(null);
+          }
+        }
+        else
+        {
+            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);
+        }
+
+
+        ap.repaint();
     }
-    else
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param evt DOCUMENT ME!
+     */
+    public void mouseReleased(MouseEvent evt)
     {
-      av.getColumnSelection().addElement(res);
+        mouseDragging = false;
 
-      sg = new SequenceGroup();
+        int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
 
-      for (int i = 0; i < av.alignment.getSequences().size(); i++)
-      {
-        sg.addSequence(av.alignment.getSequenceAt(i), false);
-      }
+        if(res> av.alignment.getWidth())
+        {
+          res = av.alignment.getWidth()-1;
+        }
 
-      sg.setStartRes(res);
-      sg.setEndRes(res);
+        if(av.hasHiddenColumns)
+          res = av.getColumnSelection().adjustForHiddenColumns(res);
 
-      ap.annotationPanel.addEditableColumn(res);
-    }
+        if (!stretchingGroup)
+        {
+            ap.repaint();
 
-    av.setSelectionGroup(sg);
-    ap.repaint();
-  }
+            return;
+        }
 
-  public void doMouseReleased(MouseEvent evt)
-  {
-    if (!stretchingGroup)
-    {
-      return;
-    }
+        SequenceGroup sg = av.getSelectionGroup();
 
-    int x = evt.getX();
-    int res = (x / av.getCharWidth()) + av.getStartRes();
+        if (res > sg.getStartRes())
+        {
+            sg.setEndRes(res);
+        }
+        else if (res < sg.getStartRes())
+        {
+            sg.setStartRes(res);
+        }
 
-    if (!av.getColumnSelection().contains(res))
-    {
-      av.getColumnSelection().addElement(res);
+        stretchingGroup = false;
+        ap.repaint();
     }
 
-    SequenceGroup sg = av.getSelectionGroup();
-
-    if (res > sg.getStartRes())
+    /**
+     * DOCUMENT ME!
+     *
+     * @param evt DOCUMENT ME!
+     */
+    public void mouseDragged(MouseEvent evt)
     {
-      sg.setEndRes(res);
+        mouseDragging = true;
+
+        int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
+        if(res<0)
+          res = 0;
+
+        if(av.hasHiddenColumns)
+          res = av.getColumnSelection().adjustForHiddenColumns(res);
+
+
+        if(res> av.alignment.getWidth())
+        {
+          res = av.alignment.getWidth()-1;
+        }
+
+        if (res < min)
+        {
+            min = res;
+        }
+
+        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()))
+                {
+                    av.getColumnSelection().removeElement(i);
+                }
+                else
+                {
+                    av.getColumnSelection().addElement(i);
+                }
+            }
+
+            ap.repaint();
+        }
     }
-    else if (res < sg.getStartRes())
+
+    public void mouseEntered(MouseEvent evt)
     {
-      sg.setStartRes(res);
+      if(mouseDragging)
+        ap.seqPanel.scrollCanvas(null);
     }
 
-    stretchingGroup = false;
-    ap.repaint();
-  }
-
-  public void doMouseDragged(MouseEvent evt)
-  {
-    int x = evt.getX();
-    int res = (x / av.getCharWidth()) + av.getStartRes();
+    public void mouseExited(MouseEvent evt)
+    {
+      if(mouseDragging)
+        ap.seqPanel.scrollCanvas(evt);
+    }
 
-    SequenceGroup sg = av.getSelectionGroup();
+    public void mouseClicked(MouseEvent evt){}
 
-    if (sg != null)
+    public void mouseMoved(MouseEvent evt)
     {
-      stretchingGroup = true;
+      if(!av.hasHiddenColumns)
+        return;
 
-      if (res > sg.getStartRes())
-      {
-        sg.setEndRes(res);
-      }
-      else if (res < sg.getStartRes())
-      {
-        sg.setStartRes(res);
-      }
+      int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
 
-      ap.annotationPanel.addEditableColumn(res);
-      ap.repaint();
-    }
-  }
-
-  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());
-    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);
-
-    //Fill the selected columns
-    ColumnSelection cs = av.getColumnSelection();
-    gg.setColor(new Color(220, 0, 0));
-
-    for (int i = 0; i < cs.size(); i++)
-    {
-      int sel = cs.columnAt(i);
+      res = av.getColumnSelection().adjustForHiddenColumns(res);
 
-      if ( (sel >= startx) && (sel <= endx))
+      reveal = null;
+      for(int i=0; i<av.getColumnSelection().getHiddenColumns().size(); i++)
       {
-        gg.fillRect( (sel - startx) * av.charWidth, 0, av.charWidth,
-                    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);
 
-    // Draw the scale numbers
-    gg.setColor(Color.black);
+      }
 
-    int scalestartx = (startx / 10) * 10;
+      repaint();
+    }
 
-    FontMetrics fm = gg.getFontMetrics(av.getFont());
-    int y = av.charHeight - fm.getDescent();
+    int [] reveal;
 
-    if ( (scalestartx % 10) == 0)
+    /**
+     * DOCUMENT ME!
+     *
+     * @param g DOCUMENT ME!
+     */
+    public void paintComponent(Graphics g)
     {
-      scalestartx += 5;
+        drawScale(g, av.getStartRes(), av.getEndRes(), getWidth(), getHeight());
     }
 
-    for (int i = scalestartx; i < endx; i += 5)
+    // scalewidth will normally be screenwidth,
+    public void drawScale(Graphics g, int startx, int endx, int width,
+        int height)
     {
-      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));
-      }
+        Graphics2D gg = (Graphics2D) g;
+        gg.setFont(av.getFont());
+
+        if(av.antiAlias)
+          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);
+
+        //Fill the selected columns
+        ColumnSelection cs = av.getColumnSelection();
+        gg.setColor(new Color(220, 0, 0));
+
+        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);
+
+        int scalestartx = (startx / 10) * 10;
+
+        FontMetrics fm = gg.getFontMetrics(av.getFont());
+        int y = av.charHeight - fm.getDescent();
+
+        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)
+                {
+                  gg.drawString(string,
+                                (i - startx - 1) * av.charWidth, y);
+                  maxX = (i - startx + 1) * av.charWidth + fm.stringWidth(string);
+                }
+
+                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++)
+            {
+
+              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);
+          }
+        }
+
+
     }
-  }
 }