X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAlignmentPanel.java;h=bcdffa095f04cd590a4f0aa227c7f33e81cbf84f;hb=f4fd7b0e74572c8fddbfe9e3e55bc624f8ba0c6a;hp=0423cbb37abbeb5852dd662d5a21882cea886ffb;hpb=df1c58f9669c477db082016aa919d6c6cc9da071;p=jalview.git

diff --git a/src/jalview/appletgui/AlignmentPanel.java b/src/jalview/appletgui/AlignmentPanel.java
index 0423cbb..bcdffa0 100755
--- a/src/jalview/appletgui/AlignmentPanel.java
+++ b/src/jalview/appletgui/AlignmentPanel.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -40,7 +40,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
   // this value is set false when selection area being dragged
   boolean fastPaint = true;
 
-  boolean MAC = false;
+
 
   public AlignmentPanel(AlignFrame af, final AlignViewport av)
   {
@@ -53,8 +53,6 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
       e.printStackTrace();
     }
 
-    if(System.getProperty("os.name").startsWith("Mac"))
-      MAC = true;
 
     alignFrame = af;
     this.av = av;
@@ -63,13 +61,15 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
     scalePanel = new ScalePanel(av, this);
     idwidthAdjuster = new IdwidthAdjuster(this);
     annotationPanel = new AnnotationPanel(this);
+
+    sequenceHolderPanel.add(annotationPanel, BorderLayout.SOUTH);
+
     alabels = new AnnotationLabels(this);
 
     setAnnotationVisible(av.showAnnotation);
 
     idPanelHolder.add(idPanel, BorderLayout.CENTER);
     idSpaceFillerPanel1.add(idwidthAdjuster, BorderLayout.CENTER);
-    annotationScroller.add(annotationPanel);
     annotationSpaceFillerHolder.add(alabels, BorderLayout.CENTER);
     scalePanelHolder.add(scalePanel, BorderLayout.CENTER);
     seqPanelHolder.add(seqPanel, BorderLayout.CENTER);
@@ -93,7 +93,6 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
     idPanel.idCanvas.setSize(d);
 
     hscrollFillerPanel.setSize(d.width, annotationPanel.getSize().height);
-    annotationScroller.setSize(annotationPanel.getSize());
 
     idPanel.idCanvas.setSize(d.width, seqPanel.seqCanvas.getSize().height);
     annotationSpaceFillerHolder.setSize(d.width,
@@ -107,12 +106,13 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
   {
     // set idCanvas bufferedImage to null
     // to prevent drawing old image
-    idPanel.idCanvas.image =null;
+    idPanel.idCanvas.image = null;
     FontMetrics fm = getFontMetrics(av.getFont());
 
     scalePanel.setSize(new Dimension(10, av.charHeight + fm.getDescent()));
     idwidthAdjuster.setSize(new Dimension(10, av.charHeight + fm.getDescent()));
 
+    annotationPanel.image = null;
     int ap = annotationPanel.adjustPanelHeight();
     annotationPanel.repaint();
     Dimension d = calculateIdWidth();
@@ -138,16 +138,14 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
 
   Dimension calculateIdWidth()
   {
-    Frame frame = new Frame();
-    frame.addNotify();
-    Graphics g = frame.getGraphics();
-    if (g == null)
+    if (av.nullFrame == null)
     {
-      Frame f = new Frame();
-      f.addNotify();
-      g = f.getGraphics();
+      av.nullFrame = new Frame();
+      av.nullFrame.addNotify();
     }
 
+    Graphics g = av.nullFrame.getGraphics();
+
     FontMetrics fm = g.getFontMetrics(av.font);
     AlignmentI al = av.getAlignment();
 
@@ -170,7 +168,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
     i = 0;
     if (al.getAlignmentAnnotation() != null)
     {
-      fm = g.getFontMetrics(frame.getFont());
+      fm = g.getFontMetrics(av.nullFrame.getFont());
       while (i < al.getAlignmentAnnotation().length)
       {
         String label = al.getAlignmentAnnotation()[i].label;
@@ -219,19 +217,24 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
         }
         else
         {
-          int cwidth = seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.
-              seqCanvas.getSize().width);
-          if (start < av.getStartRes() || start > (av.getStartRes() + cwidth))
-          {
-            vscroll.setValue(start / cwidth);
-            av.startRes = vscroll.getValue() * cwidth;
-          }
+          scrollToWrappedVisible(start);
         }
     }
 
     repaint();
   }
 
+  void scrollToWrappedVisible(int res)
+  {
+    int cwidth = seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getSize().width);
+    if (res <= av.getStartRes() || res >= (av.getStartRes() + cwidth))
+    {
+      vscroll.setValue(res / cwidth);
+      av.startRes = vscroll.getValue() * cwidth;
+    }
+  }
+
+
   public OverviewPanel getOverviewPanel()
   {
     return overviewPanel;
@@ -247,7 +250,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
     if (!av.wrapAlignment)
     {
       annotationSpaceFillerHolder.setVisible(b);
-      annotationScroller.setVisible(b);
+      annotationPanel.setVisible(b);
     }
     validate();
     repaint();
@@ -264,12 +267,12 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
 
     if (wrap)
     {
-      annotationScroller.setVisible(false);
+      annotationPanel.setVisible(false);
       annotationSpaceFillerHolder.setVisible(false);
     }
     else if (av.showAnnotation)
     {
-      annotationScroller.setVisible(true);
+      annotationPanel.setVisible(true);
       annotationSpaceFillerHolder.setVisible(true);
     }
 
@@ -296,8 +299,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
       {
         return false;
       }
-      fastPaint = false;
-      vscroll.setValue(vscroll.getValue() - 1);
+      setScrollValues(hscroll.getValue(), vscroll.getValue()-1);
     }
     else
     {
@@ -305,24 +307,22 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
       {
         return false;
       }
-      fastPaint = false;
-      vscroll.setValue(vscroll.getValue() + 1);
+      setScrollValues(hscroll.getValue(), vscroll.getValue()+1);
     }
-    fastPaint = true;
+
+    repaint();
     return true;
   }
 
   public boolean scrollRight(boolean right)
   {
-
-    if (right)
+    if (!right)
     {
       if (hscroll.getValue() < 1)
       {
         return false;
       }
-      fastPaint = false;
-      hscroll.setValue(hscroll.getValue() - 1);
+      setScrollValues(hscroll.getValue()-1, vscroll.getValue());
     }
     else
     {
@@ -330,40 +330,47 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
       {
         return false;
       }
-      fastPaint = false;
-      hscroll.setValue(hscroll.getValue() + 1);
+      setScrollValues(hscroll.getValue()+1, vscroll.getValue());
     }
-    fastPaint = true;
+
+    repaint();
     return true;
   }
 
   public void setScrollValues(int x, int y)
   {
+    int width = av.alignment.getWidth();
+    int height = av.alignment.getHeight();
+
+    if(av.hasHiddenColumns)
+     width = av.getColumnSelection().findColumnPosition(width);
 
     av.setStartRes(x);
     av.setStartSeq(y);
-    av.setEndRes(x + seqPanel.seqCanvas.getSize().width / av.getCharWidth() - 1);
+
+    av.setEndRes( (x + (seqPanel.seqCanvas.getSize().width / av.charWidth)) -1);
 
     hextent = seqPanel.seqCanvas.getSize().width / av.charWidth;
     vextent = seqPanel.seqCanvas.getSize().height / av.charHeight;
 
-    if (hextent > av.alignment.getWidth())
+    if (hextent > width)
     {
-      hextent = av.alignment.getWidth();
+      hextent = width;
     }
-    if (vextent > av.alignment.getHeight())
+
+    if (vextent > height)
     {
-      vextent = av.alignment.getHeight();
+      vextent = height;
     }
 
-    if (hextent + x > av.getAlignment().getWidth())
+    if ( (hextent + x) > width)
     {
-      x = av.getAlignment().getWidth() - hextent;
+      x = width - hextent;
     }
 
-    if (vextent + y > av.getAlignment().getHeight())
+    if ( (vextent + y) > height)
     {
-      y = av.getAlignment().getHeight() - vextent;
+      y = height - vextent;
     }
 
     if (y < 0)
@@ -386,6 +393,9 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
     hscroll.setValues(x, hextent, 0, av.getAlignment().getWidth());
     vscroll.setValues(y, vextent, 0, av.getAlignment().getHeight());
 
+    if(overviewPanel!=null)
+          overviewPanel.setBoxPosition();
+
   }
 
   public void adjustmentValueChanged(AdjustmentEvent evt)
@@ -393,6 +403,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
     int oldX = av.getStartRes();
     int oldY = av.getStartSeq();
 
+
     if (evt==null || evt.getSource() == hscroll)
     {
       int x = hscroll.getValue();
@@ -401,6 +412,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
                    1);
     }
 
+
     if (evt==null || evt.getSource() == vscroll)
     {
       int offy = vscroll.getValue();
@@ -427,16 +439,18 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
     int scrollX = av.startRes - oldX;
     int scrollY = av.startSeq - oldY;
 
-    if (av.getWrapAlignment() || !fastPaint || MAC)
+    if (av.getWrapAlignment() || !fastPaint || av.MAC)
     {
       repaint();
     }
-    else if(!seqPanel.seqCanvas.fastPaint)
+    else
     {
       // Make sure we're not trying to draw a panel
       // larger than the visible window
       if(scrollX>av.endRes-av.startRes)
-        scrollX = av.endRes-av.startRes;
+      {
+        scrollX = av.endRes - av.startRes;
+      }
       else if(scrollX<av.startRes-av.endRes)
         scrollX = av.startRes - av.endRes;
 
@@ -460,6 +474,7 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
 
   public void paint(Graphics g)
   {
+    invalidate();
     Dimension d = idPanel.idCanvas.getSize();
     idPanel.idCanvas.setSize(d.width, seqPanel.seqCanvas.getSize().height);
     annotationSpaceFillerHolder.setSize(d.width,
@@ -469,9 +484,15 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
 
     if (av.getWrapAlignment())
     {
-      int max = av.alignment.getWidth() /
-          seqPanel.seqCanvas.
-          getWrappedCanvasWidth(seqPanel.seqCanvas.getSize().width) +1;
+      int maxwidth = av.alignment.getWidth();
+
+      if (av.hasHiddenColumns)
+        maxwidth = av.getColumnSelection().findColumnPosition(maxwidth) - 1;
+
+      int max = maxwidth /
+          seqPanel.seqCanvas.getWrappedCanvasWidth(seqPanel.seqCanvas.getSize().width) +
+          1;
+
       vscroll.setMaximum(max);
       vscroll.setUnitIncrement(1);
       vscroll.setVisibleAmount(1);
@@ -513,7 +534,6 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
   BorderLayout borderLayout10 = new BorderLayout();
   protected Panel hscrollFillerPanel = new Panel();
   BorderLayout borderLayout11 = new BorderLayout();
-  public Panel annotationScroller = new Panel();
   BorderLayout borderLayout4 = new BorderLayout();
   BorderLayout borderLayout2 = new BorderLayout();
 
@@ -548,11 +568,9 @@ public class AlignmentPanel extends Panel implements AdjustmentListener
       //  this.setPreferredSize(new Dimension(220, 166));
       seqPanelHolder.setBackground(Color.white);
       idPanelHolder.setBackground(Color.white);
-      annotationScroller.setLayout(borderLayout2);
       sequenceHolderPanel.add(scalePanelHolder, BorderLayout.NORTH);
       sequenceHolderPanel.add(seqPanelHolder, BorderLayout.CENTER);
       seqPanelHolder.add(vscroll, BorderLayout.EAST);
-      sequenceHolderPanel.add(annotationScroller, BorderLayout.SOUTH);
 
       //  Panel3.add(secondaryPanelHolder,  BorderLayout.SOUTH);
       this.add(idPanelHolder, BorderLayout.WEST);