X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FOverviewPanel.java;h=c844315a41da24e1da5948bf738a93eddf4f5273;hb=8c2e72fec911f86333cbc82aaed4d29fadac542c;hp=d7220dfec4b26dcdb17d5eebce2fc6a554ff93da;hpb=d423f22792e47dbc800ae220a58677f988971d06;p=jalview.git

diff --git a/src/jalview/gui/OverviewPanel.java b/src/jalview/gui/OverviewPanel.java
index d7220df..c844315 100755
--- a/src/jalview/gui/OverviewPanel.java
+++ b/src/jalview/gui/OverviewPanel.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
  * 
@@ -17,6 +17,8 @@
  */
 package jalview.gui;
 
+import jalview.renderer.AnnotationRenderer;
+
 import java.awt.*;
 import java.awt.event.*;
 import java.awt.image.*;
@@ -36,6 +38,7 @@ public class OverviewPanel extends JPanel implements Runnable
 
   AlignmentPanel ap;
 
+  final AnnotationRenderer renderer = new AnnotationRenderer();
   float scalew = 1f;
 
   float scaleh = 1f;
@@ -80,15 +83,15 @@ public class OverviewPanel extends JPanel implements Runnable
     fr = new FeatureRenderer(ap);
 
     // scale the initial size of overviewpanel to shape of alignment
-    float initialScale = (float) av.alignment.getWidth()
-            / (float) av.alignment.getHeight();
+    float initialScale = (float) av.getAlignment().getWidth()
+            / (float) av.getAlignment().getHeight();
 
-    if (av.conservation == null)
+    if (av.getAlignmentConservationAnnotation()== null)
     {
       graphHeight = 0;
     }
 
-    if (av.alignment.getWidth() > av.alignment.getHeight())
+    if (av.getAlignment().getWidth() > av.getAlignment().getHeight())
     {
       // wider
       width = 400;
@@ -175,7 +178,7 @@ public class OverviewPanel extends JPanel implements Runnable
 
     if (boxX > (width - boxWidth))
     {
-      if (av.hasHiddenColumns)
+      if (av.hasHiddenColumns())
       {
         // Try smallest possible box
         boxWidth = (int) ((av.endRes - av.startRes + 1) * av.getCharWidth() * scalew);
@@ -186,7 +189,7 @@ public class OverviewPanel extends JPanel implements Runnable
     int col = (int) (boxX / scalew / av.getCharWidth());
     int row = (int) (boxY / scaleh / av.getCharHeight());
 
-    if (av.hasHiddenColumns)
+    if (av.hasHiddenColumns())
     {
       if (!av.getColumnSelection().isVisible(col))
       {
@@ -196,9 +199,9 @@ public class OverviewPanel extends JPanel implements Runnable
       col = av.getColumnSelection().findColumnPosition(col);
     }
 
-    if (av.hasHiddenRows)
+    if (av.hasHiddenRows())
     {
-      row = av.alignment.getHiddenSequences().findIndexWithoutHiddenSeqs(
+      row = av.getAlignment().getHiddenSequences().findIndexWithoutHiddenSeqs(
               row);
     }
 
@@ -248,9 +251,9 @@ public class OverviewPanel extends JPanel implements Runnable
       fr.transferSettings(ap.seqPanel.seqCanvas.getFeatureRenderer());
     }
 
-    int alwidth = av.alignment.getWidth();
-    int alheight = av.alignment.getHeight()
-            + av.alignment.getHiddenSequences().getSize();
+    int alwidth = av.getAlignment().getWidth();
+    int alheight = av.getAlignment().getHeight()
+            + av.getAlignment().getHiddenSequences().getSize();
 
     setPreferredSize(new Dimension(width, sequencesHeight + graphHeight));
 
@@ -291,15 +294,15 @@ public class OverviewPanel extends JPanel implements Runnable
       lastrow = (int) (row * sampleRow);
 
       hiddenRow = false;
-      if (av.hasHiddenRows)
+      if (av.hasHiddenRows())
       {
-        seq = av.alignment.getHiddenSequences().getHiddenSequence(lastrow);
+        seq = av.getAlignment().getHiddenSequences().getHiddenSequence(lastrow);
         if (seq == null)
         {
-          int index = av.alignment.getHiddenSequences()
+          int index = av.getAlignment().getHiddenSequences()
                   .findIndexWithoutHiddenSeqs(lastrow);
 
-          seq = av.alignment.getSequenceAt(index);
+          seq = av.getAlignment().getSequenceAt(index);
         }
         else
         {
@@ -308,7 +311,7 @@ public class OverviewPanel extends JPanel implements Runnable
       }
       else
       {
-        seq = av.alignment.getSequenceAt(lastrow);
+        seq = av.getAlignment().getSequenceAt(lastrow);
       }
 
       if (seq == null)
@@ -343,7 +346,7 @@ public class OverviewPanel extends JPanel implements Runnable
         }
 
         if (hiddenRow
-                || (av.hasHiddenColumns && !av.getColumnSelection()
+                || (av.hasHiddenColumns() && !av.getColumnSelection()
                         .isVisible(lastcol)))
         {
           color = new Color(color).darker().darker().getRGB();
@@ -354,14 +357,15 @@ public class OverviewPanel extends JPanel implements Runnable
       }
     }
 
-    if (av.conservation != null)
+    if (av.getAlignmentConservationAnnotation()!= null)
     {
+      renderer.updateFromAlignViewport(av); 
       for (col = 0; col < width; col++)
       {
         lastcol = (int) (col * sampleCol);
         {
           mg.translate(col, sequencesHeight);
-          ap.annotationPanel.drawGraph(mg, av.conservation,
+          renderer.drawGraph(mg, av.getAlignmentConservationAnnotation(),
                   (int) (sampleCol) + 1, graphHeight,
                   (int) (col * sampleCol), (int) (col * sampleCol) + 1);
           mg.translate(-col, -sequencesHeight);
@@ -386,15 +390,14 @@ public class OverviewPanel extends JPanel implements Runnable
    */
   public void setBoxPosition()
   {
-    int fullsizeWidth = av.alignment.getWidth() * av.getCharWidth();
-    int fullsizeHeight = (av.alignment.getHeight() + av.alignment
-            .getHiddenSequences().getSize())
-            * av.getCharHeight();
+    int fullsizeWidth = av.getAlignment().getWidth() * av.getCharWidth();
+    int fullsizeHeight = (av.getAlignment().getHeight() + av.getAlignment()
+            .getHiddenSequences().getSize()) * av.getCharHeight();
 
     int startRes = av.getStartRes();
     int endRes = av.getEndRes();
 
-    if (av.hasHiddenColumns)
+    if (av.hasHiddenColumns())
     {
       startRes = av.getColumnSelection().adjustForHiddenColumns(startRes);
       endRes = av.getColumnSelection().adjustForHiddenColumns(endRes);
@@ -403,12 +406,12 @@ public class OverviewPanel extends JPanel implements Runnable
     int startSeq = av.startSeq;
     int endSeq = av.endSeq;
 
-    if (av.hasHiddenRows)
+    if (av.hasHiddenRows())
     {
-      startSeq = av.alignment.getHiddenSequences().adjustForHiddenSeqs(
+      startSeq = av.getAlignment().getHiddenSequences().adjustForHiddenSeqs(
               startSeq);
 
-      endSeq = av.alignment.getHiddenSequences()
+      endSeq = av.getAlignment().getHiddenSequences()
               .adjustForHiddenSeqs(endSeq);
 
     }
@@ -419,7 +422,7 @@ public class OverviewPanel extends JPanel implements Runnable
     boxX = (int) (startRes * av.getCharWidth() * scalew);
     boxY = (int) (startSeq * av.getCharHeight() * scaleh);
 
-    if (av.hasHiddenColumns)
+    if (av.hasHiddenColumns())
     {
       boxWidth = (int) ((endRes - startRes + 1) * av.getCharWidth() * scalew);
     }