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

diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index 486b87a..7ed0146 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) 2006 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
@@ -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;
 
@@ -43,6 +43,7 @@ public class ScalePanel extends JPanel
     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)
@@ -50,25 +51,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,35 +60,111 @@ 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 (av.getColumnSelection().contains(res))
+        if (SwingUtilities.isRightMouseButton(evt))
         {
-            av.getColumnSelection().removeElement(res);
-            ap.annotationPanel.removeEditableColumn(res);
+          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.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))
+          {
+            JMenuItem item = new JMenuItem("Hide Columns");
+            item.addActionListener(new ActionListener()
+            {
+              public void actionPerformed(ActionEvent e)
+              {
+                av.hideColumns(res, res);
+                if(av.getSelectionGroup()!=null
+                   && av.getSelectionGroup().getSize(false)==av.alignment.getHeight())
+                  av.setSelectionGroup(null);
+
+                ap.repaint();
+                if (ap.overviewPanel != null)
+                  ap.overviewPanel.updateOverviewImage();
+              }
+            });
+            pop.add(item);
+            pop.show(this, evt.getX(), evt.getY());
+          }
         }
-        else
+        else // LEFT MOUSE TO SELECT
         {
-            av.getColumnSelection().addElement(res);
-            sg = new SequenceGroup();
-
-            for (int i = 0; i < av.alignment.getSequences().size(); i++)
+          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++)
             {
-                sg.addSequence(av.alignment.getSequenceAt(i), false);
+                av.getColumnSelection().addElement(i);
             }
+            sg.setStartRes(min);
+            sg.setEndRes(max);
+          }
+
 
-            sg.setStartRes(res);
-            sg.setEndRes(res);
         }
 
-        av.setSelectionGroup(sg);
+
         ap.repaint();
     }
 
@@ -113,20 +173,20 @@ 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();
+        mouseDragging = false;
 
-        if (av.getColumnSelection() != null)
+        int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
+
+        if(res> av.alignment.getWidth())
         {
-            for (int i = 0; i < av.getColumnSelection().size(); i++)
-            {
-                ap.annotationPanel.addEditableColumn(av.getColumnSelection()
-                                                       .columnAt(i));
-            }
+          res = av.alignment.getWidth()-1;
         }
 
+        if(av.hasHiddenColumns)
+          res = av.getColumnSelection().adjustForHiddenColumns(res);
+
         if (!stretchingGroup)
         {
             ap.repaint();
@@ -154,10 +214,22 @@ 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();
+        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)
         {
@@ -169,6 +241,8 @@ public class ScalePanel extends JPanel
             max = res;
         }
 
+
+
         SequenceGroup sg = av.getSelectionGroup();
 
         if (sg != null)
@@ -184,7 +258,7 @@ public class ScalePanel extends JPanel
             {
                 sg.setEndRes(res);
             }
-            else if (res < sg.getStartRes())
+            if (res < sg.getStartRes())
             {
                 sg.setStartRes(res);
             }
@@ -194,7 +268,6 @@ public class ScalePanel extends JPanel
                 if ((i < sg.getStartRes()) || (i > sg.getEndRes()))
                 {
                     av.getColumnSelection().removeElement(i);
-                    ap.annotationPanel.removeEditableColumn(res);
                 }
                 else
                 {
@@ -206,6 +279,50 @@ public class ScalePanel extends JPanel
         }
     }
 
+    public void mouseEntered(MouseEvent evt)
+    {
+      if(mouseDragging)
+        ap.seqPanel.scrollCanvas(null);
+    }
+
+    public void mouseExited(MouseEvent evt)
+    {
+      if(mouseDragging)
+        ap.seqPanel.scrollCanvas(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;
+          ToolTipManager.sharedInstance().registerComponent(this);
+          this.setToolTipText("Reveal Hidden Columns with Right Mouse Button");
+          break;
+        }
+        else
+          this.setToolTipText(null);
+
+      }
+
+      repaint();
+    }
+
+    int [] reveal;
+
     /**
      * DOCUMENT ME!
      *
@@ -222,8 +339,10 @@ public class ScalePanel extends JPanel
     {
         Graphics2D gg = (Graphics2D) g;
         gg.setFont(av.getFont());
-        gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-            RenderingHints.VALUE_ANTIALIAS_ON);
+
+        if(av.antiAlias)
+          gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
+                              RenderingHints.VALUE_ANTIALIAS_ON);
 
         //Fill in the background
         gg.setColor(Color.white);
@@ -237,6 +356,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))
             {
@@ -258,16 +379,27 @@ public class ScalePanel extends JPanel
             scalestartx += 5;
         }
 
+        String string;
+        int maxX=0;
+
         for (int i = scalestartx; i < endx; i += 5)
         {
             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));
+                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
             {
@@ -277,5 +409,42 @@ public class ScalePanel extends JPanel
                     (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);
+          }
+        }
+
+
     }
 }