scale above, left right added

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

diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index 04b596a..73cee2d 100755 (executable)
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -27,6 +27,9 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
   AnnotationPanel annotationPanel;\r
   AnnotationLabels alabels;\r
 \r
+  // this value is set false when selection area being dragged\r
+  boolean fastPaint = true;\r
+\r
   public AlignmentPanel(AlignFrame af, final AlignViewport av)\r
   {\r
     alignFrame = af;\r
@@ -153,6 +156,20 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
          i++;\r
        }\r
 \r
+       // Also check annotation label widths\r
+       i=0;\r
+       if(al.getAlignmentAnnotation()!=null)\r
+       {\r
+         fm = g.getFontMetrics(alabels.getFont());\r
+         while (i < al.getAlignmentAnnotation().length)\r
+         {\r
+           String label = al.getAlignmentAnnotation()[i].label;\r
+           if (fm.stringWidth(label) > idWidth)\r
+             idWidth = fm.stringWidth(label);\r
+           i++;\r
+         }\r
+       }\r
+\r
        return new Dimension(idWidth, 12);\r
   }\r
 \r
@@ -203,11 +220,18 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
     scalePanelHolder.setVisible(!wrap);\r
     hscroll.setVisible(!wrap);\r
     idwidthAdjuster.setVisible(!wrap);\r
+\r
+    av.setShowAnnotation(!wrap);\r
     annotationScroller.setVisible(!wrap);\r
     annotationSpaceFillerHolder.setVisible(!wrap);\r
     idSpaceFillerPanel1.setVisible(!wrap);\r
-\r
-    RefreshPanels();\r
+    javax.swing.SwingUtilities.invokeLater(new Runnable()\r
+     {\r
+       public void run()\r
+       {\r
+         RefreshPanels();\r
+       }\r
+    });\r
 \r
   }\r
 \r
@@ -247,8 +271,7 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
 \r
     if (av.getWrapAlignment())\r
     {\r
-      int max = av.alignment.getWidth() /\r
-          (seqPanel.seqCanvas.getWidth() / av.charWidth) + 1;\r
+      int max = av.alignment.getWidth() / seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getWidth());\r
       vscroll.setValues(0, 1, 0, max);\r
     }\r
     else\r
@@ -272,34 +295,40 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
     {\r
       if(vscroll.getValue()<1)\r
         return false;\r
+      fastPaint  = false;\r
       vscroll.setValue(vscroll.getValue() - 1);\r
     }\r
     else\r
     {\r
      if(vextent+vscroll.getValue() >= av.getAlignment().getHeight())\r
        return false;\r
+      fastPaint  = false;\r
       vscroll.setValue(vscroll.getValue() + 1);\r
     }\r
+    fastPaint = true;\r
     return true;\r
   }\r
 \r
   public boolean scrollRight(boolean right)\r
   {\r
-    if(right)\r
-   {\r
-     if(hscroll.getValue()<1)\r
-       return false;\r
-     hscroll.setValue(hscroll.getValue() - 1);\r
-   }\r
-   else\r
-   {\r
-    if(hextent+hscroll.getValue() >= av.getAlignment().getWidth())\r
-      return false;\r
-     hscroll.setValue(hscroll.getValue() + 1);\r
-   }\r
 \r
-   return true;\r
- }\r
+    if (right)\r
+    {\r
+      if (hscroll.getValue() < 1)\r
+        return false;\r
+      fastPaint = false;\r
+      hscroll.setValue(hscroll.getValue() - 1);\r
+    }\r
+    else\r
+    {\r
+      if (hextent + hscroll.getValue() >= av.getAlignment().getWidth())\r
+        return false;\r
+      fastPaint = false;\r
+      hscroll.setValue(hscroll.getValue() + 1);\r
+    }\r
+    fastPaint = true;\r
+    return true;\r
+  }\r
 \r
 \r
   public void setScrollValues(int x, int y)\r
@@ -347,7 +376,9 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
       int offy = vscroll.getValue();\r
       if (av.getWrapAlignment())\r
       {\r
-        av.setStartRes( vscroll.getValue() * av.getChunkWidth());\r
+        int rowSize = seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getWidth());\r
+        av.setStartRes( vscroll.getValue() * rowSize );\r
+        av.setEndRes( (vscroll.getValue()+1) * rowSize );\r
       }\r
       else\r
       {\r
@@ -360,10 +391,17 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
     if(overviewPanel!=null)\r
       overviewPanel.setBoxPosition();\r
 \r
-    seqPanel.seqCanvas.fastPaint(av.getStartRes()-oldX, av.getStartSeq()-oldY);\r
-    idPanel.idCanvas.fastPaint( av.getStartSeq()-oldY );\r
-    scalePanel.repaint();\r
-    annotationPanel.fastPaint(av.getStartRes()-oldX);\r
+    if(av.getWrapAlignment() || !fastPaint)\r
+      repaint();\r
+    else\r
+    {\r
+      seqPanel.seqCanvas.fastPaint(av.getStartRes() - oldX,\r
+                                   av.getStartSeq() - oldY);\r
+      idPanel.idCanvas.fastPaint(av.getStartSeq() - oldY);\r
+      scalePanel.repaint();\r
+      if (av.getShowAnnotation())\r
+        annotationPanel.fastPaint(av.getStartRes() - oldX);\r
+    }\r
 \r
   }\r
 \r
@@ -454,9 +492,17 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
 \r
     // draw main sequence panel\r
     pg.translate(idWidth,0);\r
-    pg.setClip(0,0,pwidth-idWidth, pheight);\r
     seqPanel.seqCanvas.drawPanel(pg,startRes,endRes,startSeq,endSeq,startRes,startSeq,0);\r
 \r
+\r
+    if(av.getShowAnnotation())\r
+      {\r
+        pg.translate(-idWidth,(endSeq-startSeq)*av.charHeight);\r
+        alabels.drawComponent((Graphics2D)pg);\r
+        pg.translate(idWidth,0);\r
+        annotationPanel.drawComponent((Graphics2D) pg, startRes, endRes+1);\r
+      }\r
+\r
     return Printable.PAGE_EXISTS;\r
   }\r
 \r
@@ -530,6 +576,10 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
       height = (av.alignment.getHeight()+1) * av.charHeight + 30;\r
       width = idPanel.getWidth() + av.alignment.getWidth() * av.charWidth;\r
     }\r
+    if(av.getShowAnnotation())\r
+   {\r
+     height += annotationPanel.getPreferredSize().height;\r
+   }\r
 \r
     try\r
     {\r
@@ -573,7 +623,13 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
         width = idPanel.getWidth() + av.alignment.getWidth() * av.charWidth;\r
       }\r
 \r
+      if(av.getShowAnnotation())\r
+      {\r
+        height += annotationPanel.getPreferredSize().height;\r
+      }\r
+\r
 \r
+System.out.println(width +" "+height);\r
 \r
     try\r
     {\r