JAL-1155 fix panel length calculation for grouped graphs and refactor to alignment...

[jalview.git] / src / jalview / appletgui / AnnotationPanel.java

diff --git a/src/jalview/appletgui/AnnotationPanel.java b/src/jalview/appletgui/AnnotationPanel.java
index 492683d..45a5f1e 100755 (executable)
--- a/src/jalview/appletgui/AnnotationPanel.java
+++ b/src/jalview/appletgui/AnnotationPanel.java
@@ -390,7 +390,7 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI, Adjustmen
         av.getAlignment().getAlignmentAnnotation()[graphStretch].graphHeight = 0;
       }
       graphStretchY = evt.getY();
-      calcPanelHeight();
+      av.calcPanelHeight();
       needValidating = true;
       ap.paintAlignment(true);
     }
@@ -464,7 +464,7 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI, Adjustmen
 
   public int adjustPanelHeight(boolean repaint)
   {
-    int height = calcPanelHeight();
+    int height = av.calcPanelHeight();
     this.setSize(new Dimension(getSize().width, height));
     if (repaint)
     {
@@ -477,54 +477,6 @@ public class AnnotationPanel extends Panel implements AwtRenderPanelI, Adjustmen
    * ABSTRACT GUI METHOD
    * @return total height of annotation
    */
-  public int calcPanelHeight()
-  {
-    // setHeight of panels
-    AlignmentAnnotation[] aa = av.getAlignment().getAlignmentAnnotation();
-    int height = 0;
-
-    if (aa != null)
-    {
-      for (int i = 0; i < aa.length; i++)
-      {
-        if (!aa[i].visible)
-        {
-          continue;
-        }
-
-        aa[i].height = 0;
-
-        if (aa[i].hasText)
-        {
-          aa[i].height += av.charHeight;
-        }
-
-        if (aa[i].hasIcons)
-        {
-          aa[i].height += 16;
-        }
-
-        if (aa[i].graph > 0)
-        {
-          aa[i].height += aa[i].graphHeight;
-        }
-
-        if (aa[i].height == 0)
-        {
-          aa[i].height = 20;
-        }
-
-        height += aa[i].height;
-      }
-    }
-    if (height == 0)
-    {
-      height = 20;
-    }
-
-    return height;
-
-  }
 
   public void addEditableColumn(int i)
   {