X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FScalePanel.java;h=32283ce8654192f0c8eea61795782ec0e3f571c2;hb=0452450533728e478ef8c893ea2cb3483c740fb3;hp=7fa3abd3bb116a2c7b5e7a4e66108be3e4750248;hpb=3098f4ad5ced6a2dce2327dfa8547c6c0b129e13;p=jalview.git

diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index 7fa3abd..32283ce 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
@@ -43,6 +43,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
     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)
@@ -72,49 +73,95 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
         min = res;
         max = res;
 
-        if(reveal != null)
+        if (SwingUtilities.isRightMouseButton(evt))
         {
-          av.getColumnSelection().revealHiddenColumns(reveal[0], av);
-          reveal = null;
-          return;
-        }
-
-        if (av.getColumnSelection().contains(res))
-        {
-          if( SwingUtilities.isRightMouseButton(evt))
+          JPopupMenu pop = new JPopupMenu();
+          if (reveal != null)
           {
-            JPopupMenu pop = new JPopupMenu();
-            JMenuItem item = new JMenuItem("Hide Columns");
+            JMenuItem item = new JMenuItem("Reveal");
             item.addActionListener(new ActionListener()
             {
               public void actionPerformed(ActionEvent e)
               {
-                av.getColumnSelection().hideColumns(res, av);
+                av.showColumn(reveal[0]);
+                reveal = null;
+                ap.repaint();
+                if (ap.overviewPanel != null)
+                  ap.overviewPanel.updateOverviewImage();
               }
             });
             pop.add(item);
-            pop.show(this, evt.getX(), evt.getY());
 
+            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
+          else if (av.getColumnSelection().contains(res))
           {
-            av.getColumnSelection().removeElement(res);
-            ap.annotationPanel.removeEditableColumn(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()==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);
-            SequenceGroup sg = new SequenceGroup();
+          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);
 
-            for (int i = 0; i < av.alignment.getSequences().size(); i++)
+          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);
         }
 
 
@@ -128,20 +175,18 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
      */
     public void mouseReleased(MouseEvent evt)
     {
-        int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
+        mouseDragging = false;
 
-        if(av.hasHiddenColumns)
-          res = av.getColumnSelection().adjustForHiddenColumns(res);
+        int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
 
-        if (av.getColumnSelection() != null)
+        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();
@@ -151,15 +196,16 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
 
         SequenceGroup sg = av.getSelectionGroup();
 
-        if (res > sg.getStartRes())
-        {
+        if(sg!=null){
+          if (res > sg.getStartRes())
+          {
             sg.setEndRes(res);
-        }
-        else if (res < sg.getStartRes())
-        {
+          }
+          else if (res < sg.getStartRes())
+          {
             sg.setStartRes(res);
+          }
         }
-
         stretchingGroup = false;
         ap.repaint();
     }
@@ -171,11 +217,21 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
      */
     public void mouseDragged(MouseEvent evt)
     {
+        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;
@@ -186,6 +242,8 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
             max = res;
         }
 
+
+
         SequenceGroup sg = av.getSelectionGroup();
 
         if (sg != null)
@@ -201,7 +259,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
             {
                 sg.setEndRes(res);
             }
-            else if (res < sg.getStartRes())
+            if (res < sg.getStartRes())
             {
                 sg.setStartRes(res);
             }
@@ -211,7 +269,6 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
                 if ((i < sg.getStartRes()) || (i > sg.getEndRes()))
                 {
                     av.getColumnSelection().removeElement(i);
-                    ap.annotationPanel.removeEditableColumn(res);
                 }
                 else
                 {
@@ -223,8 +280,18 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
         }
     }
 
-    public void mouseEntered(MouseEvent evt){}
-    public void mouseExited(MouseEvent evt){}
+    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)
@@ -243,8 +310,13 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
         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();
@@ -308,16 +380,27 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
             scalestartx += 5;
         }
 
+        String string;
+        int maxX=0;
+
         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));
+                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
             {
@@ -332,19 +415,29 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
         {
           gg.setColor(Color.blue);
           int res;
-          for (int i = 0; i < av.getColumnSelection().getHiddenColumns().size(); i++)
+          if(av.getShowHiddenMarkers())
           {
-            res = av.getColumnSelection().findHiddenRegionPosition( i )-startx;
+            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(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)