From: amwaterhouse <Andrew Waterhouse>
Date: Fri, 24 Feb 2006 11:44:36 +0000 (+0000)
Subject: First attempt at hidden regions
X-Git-Tag: Root_VamJalview_2_07b+~94
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=3098f4ad5ced6a2dce2327dfa8547c6c0b129e13;p=jalview.git

First attempt at hidden regions
---

diff --git a/src/jalview/gui/ColumnSelection.java b/src/jalview/gui/ColumnSelection.java
index a7fd83a..02810a4 100755
--- a/src/jalview/gui/ColumnSelection.java
+++ b/src/jalview/gui/ColumnSelection.java
@@ -28,6 +28,9 @@ public class ColumnSelection
 {
     Vector selected = new Vector();
 
+    //Vector of int [] {startCol, endCol}
+    Vector hiddenColumns;
+
     /**
      * DOCUMENT ME!
      *
@@ -151,15 +154,6 @@ public class ColumnSelection
         return min;
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public Vector asVector()
-    {
-        return selected;
-    }
 
     /**
      * DOCUMENT ME!
@@ -179,4 +173,147 @@ public class ColumnSelection
             }
         }
     }
+
+    /**
+     * This Method is used to return all the HiddenColumn regions
+     * less than the given index.
+     * @param end int
+     * @return Vector
+     */
+    public Vector getHiddenColumns()
+    {
+      return hiddenColumns;
+    }
+
+    public int adjustForHiddenColumns(int column)
+    {
+      int result = column;
+      if (hiddenColumns != null)
+      {
+        for (int i = 0; i < hiddenColumns.size(); i++)
+        {
+          int[] region = (int[]) hiddenColumns.elementAt(i);
+          if (result >= region[0])
+          {
+            result += region[1] - region[0] + 1;
+          }
+        }
+      }
+      return result;
+    }
+
+    /**
+     * Use this method to find out where a visible column is in the alignment
+     * when hidden columns exist
+     * @param hiddenColumn int
+     * @return int
+     */
+    public int findColumnPosition(int hiddenColumn)
+    {
+      int result = hiddenColumn;
+      if (hiddenColumns != null)
+      {
+        int index = 0;
+        int gaps = 0;
+        do
+        {
+          int[] region = (int[]) hiddenColumns.elementAt(index);
+          if (hiddenColumn > region[1])
+          {
+            result -= region[1]+1-region[0];
+          }
+          index++;
+        }
+        while (index < hiddenColumns.size());
+
+        result -= gaps;
+      }
+
+      return result;
+    }
+
+    /**
+     * Use this method to determine where the next hiddenRegion starts
+    */
+    public int findHiddenRegionPosition(int hiddenRegion)
+    {
+      int result = 0;
+      if (hiddenColumns != null)
+      {
+        int index = 0;
+        int gaps = 0;
+        do
+        {
+          int[] region = (int[]) hiddenColumns.elementAt(index);
+          if(hiddenRegion==0)
+          {
+            return region[0];
+          }
+
+            gaps +=  region[1] +1 - region[0];
+            result = region[1] +1;
+            index++;
+        }
+        while(index < hiddenRegion+1);
+
+        result -= gaps;
+      }
+
+      return result;
+    }
+
+
+
+    public void hideColumns(int res, AlignViewport av)
+    {
+      if(hiddenColumns==null)
+        hiddenColumns = new Vector();
+
+      // First find out range of columns to hide
+      int min = res, max = res+1;
+      while( contains(min) )
+      {  removeElement(min); min --;  }
+
+      while( contains(max) )
+      { removeElement(max);  max ++;  }
+
+      min++; max--;
+
+      boolean added = false;
+      for(int i=0; i<hiddenColumns.size(); i++)
+      {
+        int [] region = (int[])hiddenColumns.elementAt(i);
+        if( max < region[0])
+        {
+          hiddenColumns.insertElementAt(new int[]{min, max}, i);
+          added = true;
+          break;
+        }
+      }
+
+      if(!added)
+        hiddenColumns.addElement(new int[]{min, max});
+
+
+      av.setSelectionGroup(null);
+      av.hasHiddenColumns = true;
+    }
+
+    public void revealHiddenColumns(int res, AlignViewport av)
+    {
+      for(int i=0; i<hiddenColumns.size(); i++)
+      {
+        int [] region = (int[])hiddenColumns.elementAt(i);
+        if( res == region[0])
+        {
+          hiddenColumns.remove(region);
+          break;
+        }
+      }
+
+
+      if(hiddenColumns.size()<1)
+        av.hasHiddenColumns = false;
+    }
+
 }
diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index 19b26c8..7fa3abd 100755
--- a/src/jalview/gui/ScalePanel.java
+++ b/src/jalview/gui/ScalePanel.java
@@ -32,7 +32,7 @@ import javax.swing.*;
  * @author $author$
  * @version $Revision$
  */
-public class ScalePanel extends JPanel
+public class ScalePanel extends JPanel implements MouseMotionListener, MouseListener
 {
     protected int offy = 4;
 
@@ -50,25 +50,8 @@ public class ScalePanel extends JPanel
         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);
-                }
-            });
+        addMouseListener(this);
+        addMouseMotionListener(this);
     }
 
     /**
@@ -76,24 +59,53 @@ public class ScalePanel extends JPanel
      *
      * @param evt DOCUMENT ME!
      */
-    public void doMousePressed(MouseEvent evt)
+    public void mousePressed(MouseEvent evt)
     {
-        int x = evt.getX();
-        int res = (x / av.getCharWidth()) + av.getStartRes();
-        SequenceGroup sg = null;
+        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);
-            sg = new SequenceGroup();
+            SequenceGroup sg = new SequenceGroup();
 
             for (int i = 0; i < av.alignment.getSequences().size(); i++)
             {
@@ -102,9 +114,10 @@ public class ScalePanel extends JPanel
 
             sg.setStartRes(res);
             sg.setEndRes(res);
+            av.setSelectionGroup(sg);
         }
 
-        av.setSelectionGroup(sg);
+
         ap.repaint();
     }
 
@@ -113,10 +126,12 @@ public class ScalePanel extends JPanel
      *
      * @param evt DOCUMENT ME!
      */
-    public void doMouseReleased(MouseEvent evt)
+    public void mouseReleased(MouseEvent evt)
     {
-        int x = evt.getX();
-        int res = (x / av.getCharWidth()) + av.getStartRes();
+        int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
+
+        if(av.hasHiddenColumns)
+          res = av.getColumnSelection().adjustForHiddenColumns(res);
 
         if (av.getColumnSelection() != null)
         {
@@ -154,10 +169,12 @@ public class ScalePanel extends JPanel
      *
      * @param evt DOCUMENT ME!
      */
-    public void doMouseDragged(MouseEvent evt)
+    public void mouseDragged(MouseEvent evt)
     {
-        int x = evt.getX();
-        int res = (x / av.getCharWidth()) + av.getStartRes();
+        int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
+
+        if(av.hasHiddenColumns)
+          res = av.getColumnSelection().adjustForHiddenColumns(res);
 
         if (res < min)
         {
@@ -206,6 +223,35 @@ public class ScalePanel extends JPanel
         }
     }
 
+    public void mouseEntered(MouseEvent evt){}
+    public void mouseExited(MouseEvent evt){}
+    public void mouseClicked(MouseEvent evt){}
+
+    public void mouseMoved(MouseEvent evt)
+    {
+      if(!av.hasHiddenColumns)
+        return;
+
+      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++)
+      {
+        int [] region = (int[])av.getColumnSelection().getHiddenColumns().elementAt(i);
+        if(res+1==region[0] || res-1==region[1])
+        {
+          reveal = region;
+          break;
+        }
+      }
+
+      repaint();
+    }
+
+    int [] reveal;
+
     /**
      * DOCUMENT ME!
      *
@@ -239,6 +285,8 @@ public class ScalePanel extends JPanel
         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))
             {
@@ -264,7 +312,7 @@ public class ScalePanel extends JPanel
         {
             if ((i % 10) == 0)
             {
-                gg.drawString(String.valueOf(i),
+                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,
@@ -279,5 +327,32 @@ public class ScalePanel extends JPanel
                     (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);
+          }
+        }
+
+
     }
 }