X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FScalePanel.java;h=9cde175ffe3b8d1c4c495687b885e870f096ea9a;hb=0452450533728e478ef8c893ea2cb3483c740fb3;hp=86884862a9d994a9f65e56e1ceb215d672042608;hpb=32c056ffe34e60a1fde83bf4061af6e82d41f958;p=jalview.git

diff --git a/src/jalview/appletgui/ScalePanel.java b/src/jalview/appletgui/ScalePanel.java
index 8688486..9cde175 100755
--- a/src/jalview/appletgui/ScalePanel.java
+++ b/src/jalview/appletgui/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
@@ -25,7 +25,7 @@ import java.awt.event.*;
 import jalview.datamodel.*;
 
 public class ScalePanel
-    extends Panel
+    extends Panel implements MouseMotionListener, MouseListener
 {
 
   protected int offy = 4;
@@ -35,6 +35,10 @@ public class ScalePanel
   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;
+  int [] reveal;
 
   public ScalePanel(AlignViewport av, AlignmentPanel ap)
   {
@@ -42,45 +46,94 @@ public class ScalePanel
     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);
 
   }
 
-  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;
 
-    if (av.getColumnSelection().contains(res))
+    min = res;
+    max = res;
+    if ((evt.getModifiers() & InputEvent.BUTTON3_MASK)
+        == InputEvent.BUTTON3_MASK)
     {
-      av.getColumnSelection().removeElement(res);
+      PopupMenu pop = new PopupMenu();
+      if (reveal != null)
+      {
+        MenuItem item = new MenuItem("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 MenuItem("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);
+        }
+        this.add(pop);
+        pop.show(this, evt.getX(), evt.getY());
+      }
+      else if (av.getColumnSelection().contains(res))
+      {
+        MenuItem item = new MenuItem("Hide Columns");
+        item.addActionListener(new ActionListener()
+        {
+          public void actionPerformed(ActionEvent e)
+          {
+            av.hideColumns(res, res);
+            if (av.getSelectionGroup() != null
+                &&
+                av.getSelectionGroup().getSize() == av.alignment.getHeight())
+              av.setSelectionGroup(null);
+
+            ap.repaint();
+            if (ap.overviewPanel != null)
+              ap.overviewPanel.updateOverviewImage();
+          }
+        });
+        pop.add(item);
+        this.add(pop);
+        pop.show(this, evt.getX(), evt.getY());
+      }
     }
-    else
+    else // LEFT MOUSE TO SELECT
     {
-      av.getColumnSelection().addElement(res);
+      if (!evt.isControlDown() && !evt.isShiftDown())
+      {
+        av.getColumnSelection().clear();
+      }
 
-      sg = new SequenceGroup();
+      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);
@@ -88,76 +141,164 @@ public class ScalePanel
 
       sg.setStartRes(res);
       sg.setEndRes(res);
+      av.setSelectionGroup(sg);
 
-      ap.annotationPanel.addEditableColumn(res);
+      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);
+      }
     }
-    av.setSelectionGroup(sg);
+
     ap.repaint();
   }
 
-  public void doMouseReleased(MouseEvent evt)
+  public void mouseReleased(MouseEvent evt)
   {
-    if (!stretchingGroup)
-    {
-      return;
-    }
+    mouseDragging = false;
 
-    int x = evt.getX();
-    int res = x / av.getCharWidth() + av.getStartRes();
+    int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
 
     if(res> av.alignment.getWidth())
     {
       res = av.alignment.getWidth()-1;
     }
 
-    if (!av.getColumnSelection().contains(res))
+    if(av.hasHiddenColumns)
+      res = av.getColumnSelection().adjustForHiddenColumns(res);
+
+    if (!stretchingGroup)
     {
-      av.getColumnSelection().addElement(res);
+        ap.repaint();
+
+        return;
     }
 
     SequenceGroup sg = av.getSelectionGroup();
 
     if (res > sg.getStartRes())
     {
-      sg.setEndRes(res);
+        sg.setEndRes(res);
     }
     else if (res < sg.getStartRes())
     {
-      sg.setStartRes(res);
+        sg.setStartRes(res);
     }
 
     stretchingGroup = false;
     ap.repaint();
   }
 
-  public void doMouseDragged(MouseEvent evt)
+  public void mouseDragged(MouseEvent evt)
   {
-    int x = evt.getX();
-    int res = x / av.getCharWidth() + av.getStartRes();
+    mouseDragging = true;
 
-    if(res> av.alignment.getWidth())
+    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;
+      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);
       }
-      else if (res < sg.getStartRes())
+      if (res < sg.getStartRes())
       {
         sg.setStartRes(res);
       }
 
-      ap.annotationPanel.addEditableColumn(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();
     }
   }
 
+
+  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;
+        break;
+      }
+    }
+
+    repaint();
+  }
+
   public void update(Graphics g)
   {
     paint(g);
@@ -175,6 +316,7 @@ public class ScalePanel
   {
     gg.setFont(av.getFont());
 
+
     //Fill in the background
     gg.setColor(Color.white);
     gg.fillRect(0, 0, width, height);
@@ -183,26 +325,32 @@ public class ScalePanel
     //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 (sel >= startx && sel <= endx)
-      {
-        gg.fillRect( (sel - startx) * av.charWidth, 0, av.charWidth,
-                    getSize().height);
-      }
+        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,
+                getSize().height);
+        }
     }
 
     // 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)
+    if ((scalestartx % 10) == 0)
     {
-      scalestartx += 5;
+        scalestartx += 5;
     }
 
     String string;
@@ -210,30 +358,67 @@ public class ScalePanel
 
     for (int i = scalestartx; i < endx; i += 5)
     {
-      if (i % 10 == 0)
-      {
-        string = String.valueOf(i);
-        if ( (i - startx - 1) * av.charWidth > maxX)
+        if ((i % 10) == 0)
         {
-          gg.drawString(string,
-                        (i - startx - 1) * av.charWidth, y);
-          maxX = (i - startx + 1) * av.charWidth + fm.stringWidth(string);
+            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));
+        }
+    }
 
-        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
+    if (av.hasHiddenColumns)
+    {
+      gg.setColor(Color.blue);
+      int res;
+      if(av.getShowHiddenMarkers())
       {
-        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);
+        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);
+      }
     }
+
   }
 
 }