X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FScalePanel.java;h=e2fd20b3b33cab9a254db5264f68a1d16a48f079;hb=c865a01627208f07db46ae7d28c06f39d83924ee;hp=73be8735e7f96301ecf45bf860075780fd761153;hpb=dc7f045c7a410ac471c981bf356d8b1ab62f2f15;p=jalview.git

diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index 73be873..e2fd20b 100755
--- a/src/jalview/gui/ScalePanel.java
+++ b/src/jalview/gui/ScalePanel.java
@@ -1,8 +1,8 @@
 package jalview.gui;
 
+import jalview.datamodel.*;
 import java.awt.*;
 import java.awt.event.*;
-
 import javax.swing.*;
 
 public class ScalePanel extends JPanel
@@ -14,9 +14,12 @@ public class ScalePanel extends JPanel
   public    int width;
 
   protected AlignViewport av;
+  AlignmentPanel ap;
 
-  public ScalePanel(AlignViewport av) {
+  public ScalePanel(AlignViewport av, AlignmentPanel ap)
+  {
     this.av         = av;
+    this.ap = ap;
 
     scaleCanvas = new ScaleCanvas(av);
     setLayout(new BorderLayout());
@@ -27,7 +30,20 @@ public class ScalePanel extends JPanel
       {
         doMousePressed(evt);
       }
+      public void mouseReleased(MouseEvent evt)
+      {
+        doMouseReleased(evt);
+      }
+
+    });
+    addMouseMotionListener(new MouseMotionAdapter()
+    {
+      public void mouseDragged(MouseEvent evt)
+      {
+        doMouseDragged(evt);
+      }
     });
+
   }
 
   public Dimension getMinimumSize() {
@@ -44,9 +60,51 @@ public class ScalePanel extends JPanel
 
     if (! av.getColumnSelection().contains(res))
       av.getColumnSelection().addElement(res);
-     else
-      av.getColumnSelection().removeElement(res);
+    else
+      return;
+
+    SequenceGroup sg = new SequenceGroup();
+    for(int i=0; i<av.alignment.getSequences().size(); i++)
+        sg.addSequence(av.alignment.getSequenceAt(i));
+
+    sg.setStartRes(res);
+    sg.setEndRes(res);
+    av.setRubberbandGroup(sg);
+    ap.RefreshPanels();
+  }
+
+  public void doMouseReleased(MouseEvent evt)
+  {
+    int x = evt.getX();
+    int res = x/av.getCharWidth() + av.getStartRes();
+
+   if (! av.getColumnSelection().contains(res))
+     av.getColumnSelection().addElement(res);
+
+   SequenceGroup sg = av.getRubberbandGroup();
+
+   if(res>sg.getStartRes())
+     sg.setEndRes(res);
+   else if(res<sg.getStartRes())
+     sg.setStartRes(res);
+
+   ap.RefreshPanels();
+  }
+
+  public void doMouseDragged(MouseEvent evt)
+  {
+    int x = evt.getX();
+    int res = x/av.getCharWidth() + av.getStartRes();
+
+    SequenceGroup sg = av.getRubberbandGroup();
+
+    if(res>sg.getStartRes())
+      sg.setEndRes(res);
+    else if(res<sg.getStartRes())
+      sg.setStartRes(res);
+
+
+    ap.RefreshPanels();
 
-    repaint();
   }
 }