set gap char modified

[jalview.git] / src / jalview / gui / ScalePanel.java

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