for now, draw selection box bottom -1

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

diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index 248fb3d..75729c3 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
@@ -203,6 +206,8 @@ 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
@@ -272,35 +277,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
-\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
@@ -333,6 +343,8 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
 \r
   public void adjustmentValueChanged(AdjustmentEvent evt)\r
   {\r
+    int oldX = av.getStartRes();\r
+    int oldY = av.getStartSeq();\r
 \r
     if (evt.getSource() == hscroll)\r
     {\r
@@ -359,7 +371,17 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene
     if(overviewPanel!=null)\r
       overviewPanel.setBoxPosition();\r
 \r
-    repaint();\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
@@ -450,9 +472,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
@@ -526,6 +556,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
@@ -569,7 +603,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