From: amwaterhouse <Andrew Waterhouse>
Date: Thu, 10 Mar 2005 10:11:42 +0000 (+0000)
Subject: Scale canvas not needed
X-Git-Tag: Release_2_0~606
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=c3fb619456647802a17540f53227ad1afa01a10f;p=jalview.git

Scale canvas not needed
---

diff --git a/src/jalview/gui/ScaleCanvas.java b/src/jalview/gui/ScaleCanvas.java
deleted file mode 100755
index d708248..0000000
--- a/src/jalview/gui/ScaleCanvas.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package jalview.gui;
-
-import java.awt.*;
-import javax.swing.*;
-
-public class ScaleCanvas extends JPanel {
-
-  int      xoffset;
-
-  public static final int HEIGHT = 30;
-
-  boolean paintFlag = false;
-
-  protected AlignViewport av;
-
-  public ScaleCanvas(AlignViewport av) {
-    this.av         = av;
-
-  }
-  public void paintComponent(Graphics g)
-  {
-    drawScale(g, av.getStartRes(), av.getEndRes(), getWidth());
-  }
-
-// scalewidth will normally be screenwidth,
-  public void drawScale(Graphics gg, int startx, int endx, int scaleWidth)
-  {
-
-    int charWidth  = av.getCharWidth();
-
-    gg.setFont(av.getFont());
-
-    //Fill in the background
-
-    gg.setColor(Color.white);
-    gg.fillRect(0,0,scaleWidth, HEIGHT);
-
-    int resWidth = endx - startx + 1;
-
-    // We want roughly one tick every 50 pixels
-
-    double rough = scaleWidth/50.0;
-
-    double roughtick = resWidth/rough;
-
-    int   digits  = (int)(Math.log(roughtick)/Math.log(10));
-    int   num     = (int)(roughtick/Math.pow(10,digits));
-
-    if (Math.abs(10-num) < 3)
-        num = 10;
-    else if (Math.abs(5-num) >= 2)
-        num = 5;
-  //   else
-  //  num = 2;
-
-    //System.out.println("Dig " + digits + " " + rough + " " + roughtick + " " + getWidth() + " " + num);
-
-    int space = (int)(num * Math.pow(10,digits));
-
-    //Set the text font
-
-    gg.setColor(Color.black);
-
-    int scalestartx = startx - startx%space + space;
-
-
-    //Fill the selected columns
-    ColumnSelection cs = av.getColumnSelection();
-    int width = charWidth;
-    if (width == 0)
-      width = 1;
-
-    gg.setColor(new Color(220,0,0));
-    for (int i=0; i<cs.size(); i++) {
-      int sel  = cs.columnAt(i);
-      //      System.out.println("Selection = " + sel);
-      if ( sel >= startx  && sel <= endx) {
-
-        gg.fillRect((sel-startx)*charWidth,0,width,getHeight());
-      }
-    }
-
-    // Draw the scale numbers
-    gg.setColor(Color.black);
-
-
-    for (int i=scalestartx;i < endx;i+= space) {
-
-      String string = String.valueOf(i);
-
-      gg.drawString(string,(i-startx-1)*charWidth,15);
-      gg.drawLine( (int)((i-startx-1)*charWidth +charWidth/2), 17, (int)((i-startx-1)*charWidth +charWidth/2), 24);
-
-    }
-
-
-  }
-
-  public Dimension getMinimumSize() {
-    return new Dimension(500,HEIGHT);
-  }
-
-  public Dimension getPreferredSize() {
-    return getMinimumSize();
-  }
-
-}
-
diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index d550651..8d6e331 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();
@@ -116,6 +104,83 @@ public class ScalePanel extends JPanel
 
       ap.RefreshPanels();
     }
+  }
+
+  public void paintComponent(Graphics g)
+  {
+    drawScale(g, av.getStartRes(), av.getEndRes(), getWidth());
+  }
+
+// scalewidth will normally be screenwidth,
+  public void drawScale(Graphics gg, int startx, int endx, int scaleWidth)
+  {
+    int charWidth  = av.getCharWidth();
+
+    gg.setFont(av.getFont());
+
+    //Fill in the background
+
+    gg.setColor(Color.white);
+    gg.fillRect(0,0,scaleWidth, getHeight());
+
+    int resWidth = endx - startx + 1;
+
+    // We want roughly one tick every 50 pixels
+
+    double rough = scaleWidth/50.0;
+
+    double roughtick = resWidth/rough;
+
+    int   digits  = (int)(Math.log(roughtick)/Math.log(10));
+    int   num     = (int)(roughtick/Math.pow(10,digits));
+
+    if (Math.abs(10-num) < 3)
+        num = 10;
+    else if (Math.abs(5-num) >= 2)
+        num = 5;
+  //   else
+  //  num = 2;
+
+    //System.out.println("Dig " + digits + " " + rough + " " + roughtick + " " + getWidth() + " " + num);
+
+    int space = (int)(num * Math.pow(10,digits));
+
+    //Set the text font
+
+    gg.setColor(Color.black);
+
+    int scalestartx = startx - startx%space + space;
+
+
+    //Fill the selected columns
+    ColumnSelection cs = av.getColumnSelection();
+    int width = charWidth;
+    if (width == 0)
+      width = 1;
+
+    gg.setColor(new Color(220,0,0));
+    for (int i=0; i<cs.size(); i++) {
+      int sel  = cs.columnAt(i);
+      //      System.out.println("Selection = " + sel);
+      if ( sel >= startx  && sel <= endx) {
+
+        gg.fillRect((sel-startx)*charWidth,0,width,getHeight());
+      }
+    }
+
+    // Draw the scale numbers
+    gg.setColor(Color.black);
+
+
+    for (int i=scalestartx;i < endx;i+= space) {
+
+      String string = String.valueOf(i);
 
+      gg.drawString(string,(i-startx-1)*charWidth,  av.charHeight / 2 +offy);
+      gg.drawLine( (int)((i-startx-1)*charWidth +charWidth/2), av.charHeight/2 +offy +2, (int)((i-startx-1)*charWidth +charWidth/2),av.charHeight/2 +offy+7);
+
+    }
   }
+
+
 }