X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FScalePanel.java;h=7fa3abd3bb116a2c7b5e7a4e66108be3e4750248;hb=59c22b05925dd3b4d148c1ce0e43eea12bc64ba7;hp=e49eb17b822f8543028d097c8a543cf0d6564346;hpb=79f4b175e12f4c16d598b4cb56ffe62532b592a1;p=jalview.git

diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index e49eb17..7fa3abd 100755
--- a/src/jalview/gui/ScalePanel.java
+++ b/src/jalview/gui/ScalePanel.java
@@ -1,195 +1,358 @@
+/*
+ * 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 jalview.datamodel.*;
+
 import java.awt.*;
 import java.awt.event.*;
-import javax.swing.*;
-
-public class ScalePanel extends JPanel
-{
-
-  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;
+import javax.swing.*;
 
-    addMouseListener(new MouseAdapter()
-    {
-      public void mousePressed(MouseEvent evt)
-      {
-        doMousePressed(evt);
-      }
-      public void mouseReleased(MouseEvent evt)
-      {
-        doMouseReleased(evt);
-      }
 
-    });
-    addMouseMotionListener(new MouseMotionAdapter()
+/**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
+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)
     {
-      public void mouseDragged(MouseEvent evt)
-      {
-        doMouseDragged(evt);
-      }
-    });
-
-  }
-
+        this.av = av;
+        this.ap = ap;
 
-  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))
-      av.getColumnSelection().removeElement(res);
-    else
+    /**
+     * DOCUMENT ME!
+     *
+     * @param evt DOCUMENT ME!
+     */
+    public void mousePressed(MouseEvent evt)
     {
-      av.getColumnSelection().addElement(res);
-
-      sg = new SequenceGroup();
-      for (int i = 0; i < av.alignment.getSequences().size(); i++)
-        sg.addSequence(av.alignment.getSequenceAt(i));
-
-      sg.setStartRes(res);
-      sg.setEndRes(res);
-
-      ap.annotationPanel.addEditableColumn(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)
+        {
+          av.getColumnSelection().revealHiddenColumns(reveal[0], av);
+          reveal = null;
+          return;
+        }
+
+        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.getColumnSelection().hideColumns(res, av);
+              }
+            });
+            pop.add(item);
+            pop.show(this, evt.getX(), evt.getY());
+
+          }
+          else
+          {
+            av.getColumnSelection().removeElement(res);
+            ap.annotationPanel.removeEditableColumn(res);
+          }
+        }
+        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();
     }
-    av.setSelectionGroup(sg);
-    ap.repaint();
-  }
-
-  public void doMouseReleased(MouseEvent evt)
-  {
-    if(!stretchingGroup)
-      return;
-
-    int x = evt.getX();
-    int res = x/av.getCharWidth() + av.getStartRes();
-
-   if (! av.getColumnSelection().contains(res))
-     av.getColumnSelection().addElement(res);
-
-   SequenceGroup sg = av.getSelectionGroup();
-
-   if(res>sg.getStartRes())
-     sg.setEndRes(res);
-   else if(res<sg.getStartRes())
-     sg.setStartRes(res);
-
-   stretchingGroup = false;
-   ap.repaint();
-  }
 
-  public void doMouseDragged(MouseEvent evt)
-  {
-    int x = evt.getX();
-    int res = x/av.getCharWidth() + av.getStartRes();
-
-    SequenceGroup sg = av.getSelectionGroup();
-    if(sg!=null)
+    /**
+     * DOCUMENT ME!
+     *
+     * @param evt DOCUMENT ME!
+     */
+    public void mouseReleased(MouseEvent evt)
     {
-      stretchingGroup = true;
-      if (res > sg.getStartRes())
-        sg.setEndRes(res);
-      else if (res < sg.getStartRes())
-        sg.setStartRes(res);
-
-       ap.annotationPanel.addEditableColumn(res);
-      ap.repaint();
+        int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
+
+        if(av.hasHiddenColumns)
+          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.repaint();
+
+            return;
+        }
+
+        SequenceGroup sg = av.getSelectionGroup();
+
+        if (res > sg.getStartRes())
+        {
+            sg.setEndRes(res);
+        }
+        else if (res < sg.getStartRes())
+        {
+            sg.setStartRes(res);
+        }
+
+        stretchingGroup = false;
+        ap.repaint();
     }
-  }
-
-  public void paintComponent(Graphics g)
-  {
-    drawScale(g, av.getStartRes(), av.getEndRes(), getWidth());
-  }
-
-// scalewidth will normally be screenwidth,
-  public void drawScale(Graphics g, int startx, int endx, int scaleWidth)
-  {
-    Graphics2D gg = (Graphics2D)g;
-    gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,RenderingHints.VALUE_ANTIALIAS_ON);
-    int charWidth  = av.getCharWidth();
-
-    gg.setFont(av.getFont());
-
-    //Fill in the background
-
-    gg.setColor(Color.white);
-    gg.fillRect(0,0,scaleWidth, getHeight());
-
-    int resWidth = endx - startx + 1;
-
-    // We want roughly one tick every 50 pixels
-
-    double rough = scaleWidth/50.0;
-
-    double roughtick = resWidth/rough;
-
-    int   digits  = (int)(Math.log(roughtick)/Math.log(10));
-    int   num     = (int)(roughtick/Math.pow(10,digits));
-
-    if (roughtick>5)
-        num = 10;
-    else
-        num = 5;
-
-  //   else
-  //  num = 2;
-
-  //  System.out.println("Dig " + digits + " " + rough + " " + roughtick + " " + getWidth() + " " + num);
-
-    int space = (int)(num * Math.pow(10,digits));
-
-    //Set the text font
-
-    gg.setColor(Color.black);
 
+    /**
+     * DOCUMENT ME!
+     *
+     * @param evt DOCUMENT ME!
+     */
+    public void mouseDragged(MouseEvent evt)
+    {
+        int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
+
+        if(av.hasHiddenColumns)
+          res = av.getColumnSelection().adjustForHiddenColumns(res);
+
+        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);
+            }
+            else 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);
+                    ap.annotationPanel.removeEditableColumn(res);
+                }
+                else
+                {
+                    av.getColumnSelection().addElement(i);
+                }
+            }
+
+            ap.repaint();
+        }
+    }
 
-    int scalestartx = 0;
-    if(space>0)
-      scalestartx = startx - startx%space + space;
+    public void mouseEntered(MouseEvent evt){}
+    public void mouseExited(MouseEvent evt){}
+    public void mouseClicked(MouseEvent evt){}
 
+    public void mouseMoved(MouseEvent evt)
+    {
+      if(!av.hasHiddenColumns)
+        return;
 
-    //Fill the selected columns
-    ColumnSelection cs = av.getColumnSelection();
-    int width = charWidth;
-    if (width == 0)
-      width = 1;
+      int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
 
-    gg.setColor(new Color(220,0,0));
-    for (int i=0; i<cs.size(); i++) {
-      int sel  = cs.columnAt(i);
-      //      System.out.println("Selection = " + sel);
-      if ( sel >= startx  && sel <= endx) {
+      res = av.getColumnSelection().adjustForHiddenColumns(res);
 
-        gg.fillRect((sel-startx)*charWidth,0,width,getHeight());
+      reveal = null;
+      for(int i=0; i<av.getColumnSelection().getHiddenColumns().size(); i++)
+      {
+        int [] region = (int[])av.getColumnSelection().getHiddenColumns().elementAt(i);
+        if(res+1==region[0] || res-1==region[1])
+        {
+          reveal = region;
+          break;
+        }
       }
-    }
 
-    // Draw the scale numbers
-    gg.setColor(Color.black);
+      repaint();
+    }
 
+    int [] reveal;
 
-    for (int i=scalestartx;i < endx;i+= space) {
+    /**
+     * DOCUMENT ME!
+     *
+     * @param g DOCUMENT ME!
+     */
+    public void paintComponent(Graphics g)
+    {
+        drawScale(g, av.getStartRes(), av.getEndRes(), getWidth(), getHeight());
+    }
 
-      String string = String.valueOf(i);
+    // 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)
+          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;
+        }
+
+        for (int i = scalestartx; i < endx; i += 5)
+        {
+            if ((i % 10) == 0)
+            {
+                gg.drawString(String.valueOf(av.getColumnSelection().adjustForHiddenColumns(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));
+            }
+        }
+
+        if (av.hasHiddenColumns)
+        {
+          gg.setColor(Color.blue);
+          int res;
+          for (int i = 0; i < av.getColumnSelection().getHiddenColumns().size(); i++)
+          {
+            res = av.getColumnSelection().findHiddenRegionPosition( i )-startx;
+
+            gg.fillPolygon(new int[] { res*av.charWidth - 4,
+                                         res*av.charWidth + 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);
+          }
+        }
 
-      gg.drawString(string,(i-startx-1)*charWidth,  av.charHeight / 2 +offy);
-      gg.drawLine( (int)((i-startx-1)*charWidth +charWidth/2), av.charHeight/2 +offy +2, (int)((i-startx-1)*charWidth +charWidth/2),av.charHeight/2 +offy+7);
 
     }
-  }
-
-
 }