From 848bef9fdc243cfab564acb0b82fc7ee3bcffe9f Mon Sep 17 00:00:00 2001
From: amwaterhouse <Andrew Waterhouse>
Date: Thu, 22 Dec 2005 15:59:52 +0000
Subject: [PATCH] graph now has type, not a boolean

---
 src/jalview/datamodel/AlignmentAnnotation.java |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/jalview/datamodel/AlignmentAnnotation.java b/src/jalview/datamodel/AlignmentAnnotation.java
index 9cfdff6..e4d64fa 100755
--- a/src/jalview/datamodel/AlignmentAnnotation.java
+++ b/src/jalview/datamodel/AlignmentAnnotation.java
@@ -36,8 +36,6 @@ public class AlignmentAnnotation
     /** DOCUMENT ME!! */
     public Annotation[] annotations;
 
-    /** DOCUMENT ME!! */
-    public boolean isGraph = false;
 
     /** DOCUMENT ME!! */
     public float graphMin;
@@ -45,8 +43,6 @@ public class AlignmentAnnotation
     /** DOCUMENT ME!! */
     public float graphMax;
 
-    /** DOCUMENT ME!! */
-    public int windowLength;
 
     // Graphical hints and tips
 
@@ -65,6 +61,14 @@ public class AlignmentAnnotation
     /** DOCUMENT ME!! */
     public int height = 0;
 
+    public int graph = 0;
+
+    public static int NO_GRAPH = 0;
+
+    public static int BAR_GRAPH = 1;
+
+    public static int LINE_GRAPH = 2;
+
     /**
      * Creates a new AlignmentAnnotation object.
      *
@@ -109,13 +113,13 @@ public class AlignmentAnnotation
      * @param winLength DOCUMENT ME!
      */
     public AlignmentAnnotation(String label, String description,
-        Annotation[] annotations, float min, float max, int winLength)
+        Annotation[] annotations, float min, float max, int graphType)
     {
         // graphs are not editable
         this.label = label;
         this.description = description;
         this.annotations = annotations;
-        isGraph = true;
+        graph = graphType;
 
         if (min == max)
         {
@@ -140,7 +144,6 @@ public class AlignmentAnnotation
 
         graphMin = min;
         graphMax = max;
-        windowLength = winLength;
 
         for (int i = 0; i < annotations.length; i++)
         {
@@ -172,7 +175,7 @@ public class AlignmentAnnotation
         {
             if (annotations[i] != null)
             {
-                if (isGraph)
+                if (graph!=0)
                 {
                     buffer.append(annotations[i].value);
                 }
-- 
1.7.10.2