X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FScalePanel.java;h=2ec45702b476374a45d4b00e1afa458400720619;hb=e7ed63f1ea56432246a6ed1553f0fe56d26f56ea;hp=d550651baac0b7d3f41a8e7732fb247eda499f03;hpb=c65705aaa543f77ae4340ddb9d3691041c210f14;p=jalview.git

diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index d550651..2ec4570 100755
--- a/src/jalview/gui/ScalePanel.java
+++ b/src/jalview/gui/ScalePanel.java
@@ -8,9 +8,7 @@ import javax.swing.*;
 public class ScalePanel extends JPanel
 {
 
-  protected ScaleCanvas scaleCanvas;
-
-  protected int offy;
+  protected int offy = 4;
   public    int width;
 
   protected AlignViewport av;
@@ -23,9 +21,6 @@ public class ScalePanel extends JPanel
     this.av         = av;
     this.ap = ap;
 
-    scaleCanvas = new ScaleCanvas(av);
-    setLayout(new BorderLayout());
-    add(scaleCanvas, BorderLayout.CENTER);
     addMouseListener(new MouseAdapter()
     {
       public void mousePressed(MouseEvent evt)
@@ -48,13 +43,6 @@ public class ScalePanel extends JPanel
 
   }
 
-  public Dimension getMinimumSize() {
-    return scaleCanvas.getMinimumSize();
-  }
-
-  public Dimension getPreferredSize() {
-    return scaleCanvas.getPreferredSize();
-  }
 
   public void doMousePressed(MouseEvent evt) {
     int x = evt.getX();
@@ -73,9 +61,11 @@ public class ScalePanel extends JPanel
 
       sg.setStartRes(res);
       sg.setEndRes(res);
+
+      ap.annotationPanel.addEditableColumn(res);
     }
-    av.setRubberbandGroup(sg);
-    ap.RefreshPanels();
+    av.setSelectionGroup(sg);
+    ap.repaint();
   }
 
   public void doMouseReleased(MouseEvent evt)
@@ -89,7 +79,7 @@ public class ScalePanel extends JPanel
    if (! av.getColumnSelection().contains(res))
      av.getColumnSelection().addElement(res);
 
-   SequenceGroup sg = av.getRubberbandGroup();
+   SequenceGroup sg = av.getSelectionGroup();
 
    if(res>sg.getStartRes())
      sg.setEndRes(res);
@@ -97,7 +87,7 @@ public class ScalePanel extends JPanel
      sg.setStartRes(res);
 
    stretchingGroup = false;
-   ap.RefreshPanels();
+   ap.repaint();
   }
 
   public void doMouseDragged(MouseEvent evt)
@@ -105,7 +95,7 @@ public class ScalePanel extends JPanel
     int x = evt.getX();
     int res = x/av.getCharWidth() + av.getStartRes();
 
-    SequenceGroup sg = av.getRubberbandGroup();
+    SequenceGroup sg = av.getSelectionGroup();
     if(sg!=null)
     {
       stretchingGroup = true;
@@ -114,8 +104,69 @@ public class ScalePanel extends JPanel
       else if (res < sg.getStartRes())
         sg.setStartRes(res);
 
-      ap.RefreshPanels();
+       ap.annotationPanel.addEditableColumn(res);
+      ap.repaint();
+    }
+  }
+
+  public void paintComponent(Graphics g)
+  {
+    drawScale(g, av.getStartRes(), av.getEndRes(), getWidth(), getHeight());
+  }
+
+// scalewidth will normally be screenwidth,
+  public void drawScale(Graphics g, int startx, int endx, int width, int height)
+  {
+    Graphics2D gg = (Graphics2D)g;
+    gg.setFont(av.getFont());
+    gg.setRenderingHint(RenderingHints.KEY_ANTIALIASING,RenderingHints.VALUE_ANTIALIAS_ON);
+
+    //Fill in the background
+    gg.setColor(Color.white);
+    gg.fillRect(0,0,width, height);
+    gg.setColor(Color.black);
+
+
+    //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,getHeight());
     }
 
+
+    // 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)
+      scalestartx+=5;
+
+    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);
+      }
+      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);
+
+
+    }
   }
+
+
 }