X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fappletgui%2FScalePanel.java;h=ce1f330b344bb681b3f95c459a8b941a920e914c;hb=61505ac1511435b067e647f5c7c9050e5c1eef41;hp=f72ea7b7133a745f72a4c03ce661de207578305f;hpb=5cd5b6e7864fe435ceb3f5c2f339a436ea0aac93;p=jalview.git

diff --git a/src/jalview/appletgui/ScalePanel.java b/src/jalview/appletgui/ScalePanel.java
index f72ea7b..ce1f330 100755
--- a/src/jalview/appletgui/ScalePanel.java
+++ b/src/jalview/appletgui/ScalePanel.java
@@ -63,34 +63,18 @@ public class ScalePanel
 
     min = res;
     max = res;
-    if (reveal != null
-        && (evt.getModifiers() & InputEvent.BUTTON3_MASK)
+    if ((evt.getModifiers() & InputEvent.BUTTON3_MASK)
         == InputEvent.BUTTON3_MASK)
     {
-
-      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();
-        }
-      });
       PopupMenu pop = new PopupMenu();
-      pop.add(item);
-
-      if (av.getColumnSelection().getHiddenColumns().size() > 1)
+      if (reveal != null)
       {
-        item = new MenuItem("Reveal All");
+        MenuItem item = new MenuItem("Reveal");
         item.addActionListener(new ActionListener()
         {
           public void actionPerformed(ActionEvent e)
           {
-            av.showAllHiddenColumns();
+            av.showColumn(reveal[0]);
             reveal = null;
             ap.repaint();
             if (ap.overviewPanel != null)
@@ -98,16 +82,27 @@ public class ScalePanel
           }
         });
         pop.add(item);
-      }
 
-      this.add(pop);
-      pop.show(this, evt.getX(), evt.getY());
-
-    }
-    else if (av.getColumnSelection().contains(res))
-    {
-      if ( (evt.getModifiers() & InputEvent.BUTTON3_MASK)
-          == InputEvent.BUTTON3_MASK)
+        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()
@@ -120,22 +115,20 @@ public class ScalePanel
               ap.overviewPanel.updateOverviewImage();
           }
         });
-        PopupMenu pop = new PopupMenu();
         pop.add(item);
         this.add(pop);
         pop.show(this, evt.getX(), evt.getY());
       }
-      else
-      {
-        av.getColumnSelection().removeElement(res);
-        av.setSelectionGroup(null);
-      }
     }
-    else
+    else // LEFT MOUSE TO SELECT
     {
+      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);
@@ -144,7 +137,20 @@ public class ScalePanel
       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++)
+        {
+            av.getColumnSelection().addElement(i);
+        }
+        sg.setStartRes(min);
+        sg.setEndRes(max);
+      }
     }
+
     ap.repaint();
   }