JAL-2587 Progress bar sizing tweaks

[jalview.git] / src / jalview / renderer / OverviewRenderer.java

diff --git a/src/jalview/renderer/OverviewRenderer.java b/src/jalview/renderer/OverviewRenderer.java
index 913c870..b9d57a4 100644 (file)
--- a/src/jalview/renderer/OverviewRenderer.java
+++ b/src/jalview/renderer/OverviewRenderer.java
@@ -22,6 +22,7 @@ package jalview.renderer;
 
 import jalview.api.AlignmentColsCollectionI;
 import jalview.api.AlignmentRowsCollectionI;
+import jalview.api.RendererListenerI;
 import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.Annotation;
 import jalview.datamodel.SequenceI;
@@ -32,9 +33,15 @@ import jalview.viewmodel.OverviewDimensions;
 import java.awt.Color;
 import java.awt.Graphics;
 import java.awt.image.BufferedImage;
+import java.beans.PropertyChangeSupport;
 
 public class OverviewRenderer
 {
+  public static final String UPDATE = "OverviewUpdate";
+
+  protected PropertyChangeSupport changeSupport = new PropertyChangeSupport(
+          this);
+
   private FeatureColourFinder finder;
 
   private jalview.api.SequenceRenderer sr;
@@ -48,8 +55,11 @@ public class OverviewRenderer
   // raw number of pixels to allocate to each row
   private float pixelsPerSeq;
 
+  // height in pixels of graph
+  private int graphHeight;
+
   // flag to indicate whether to halt drawing
-  private boolean redraw = false;
+  private volatile boolean redraw = false;
 
   public OverviewRenderer(jalview.api.SequenceRenderer seqRenderer,
           FeatureRenderer fr, OverviewDimensions od)
@@ -59,6 +69,7 @@ public class OverviewRenderer
 
     pixelsPerCol = od.getPixelsPerCol();
     pixelsPerSeq = od.getPixelsPerSeq();
+    graphHeight = od.getGraphHeight();
     miniMe = new BufferedImage(od.getWidth(), od.getHeight(),
             BufferedImage.TYPE_INT_RGB);
   }
@@ -78,6 +89,9 @@ public class OverviewRenderer
     int rgbcolor = Color.white.getRGB();
     int seqIndex = 0;
     int pixelRow = 0;
+    int alignmentHeight = miniMe.getHeight() - graphHeight;
+
+    changeSupport.firePropertyChange(UPDATE, -1, 0);
 
     for (int alignmentRow : rows)
     {
@@ -131,9 +145,31 @@ public class OverviewRenderer
         }
         colIndex++;
       }
-      pixelRow = endRow + 1;
+
+      if (pixelRow != endRow + 1)
+      {
+        changeSupport.firePropertyChange(UPDATE,
+                Math.round(100 * (float) pixelRow / alignmentHeight),
+                Math.round(
+                        100 * ((float) (endRow + 1) / alignmentHeight)));
+        pixelRow = endRow + 1;
+      }
       seqIndex++;
     }
+
+    // final update to progress bar if present
+    if (redraw)
+    {
+      changeSupport.firePropertyChange(UPDATE,
+              Math.round(100 * (float) (pixelRow - 1) / alignmentHeight),
+              0);
+    }
+    else
+    {
+      changeSupport.firePropertyChange(UPDATE,
+              Math.round(100 * alignmentHeight / miniMe.getHeight() - 1),
+              Math.round(100 * alignmentHeight / miniMe.getHeight()));
+    }
     return miniMe;
   }
 
@@ -186,8 +222,10 @@ public class OverviewRenderer
     {
       if (redraw)
       {
+        changeSupport.firePropertyChange(UPDATE, 99, 0);
         break;
       }
+
       if (alignmentCol >= annotations.length)
       {
         break; // no more annotations to draw here
@@ -221,6 +259,7 @@ public class OverviewRenderer
         colIndex++;
       }
     }
+    changeSupport.firePropertyChange(UPDATE, 99, 100);
   }
 
   public void setRedraw(boolean b)
@@ -230,4 +269,14 @@ public class OverviewRenderer
       redraw = b;
     }
   }
+
+  public void addPropertyChangeListener(RendererListenerI listener)
+  {
+    changeSupport.addPropertyChangeListener(listener);
+  }
+
+  public void removePropertyChangeListener(RendererListenerI listener)
+  {
+    changeSupport.removePropertyChangeListener(listener);
+  }
 }