X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Frenderer%2FAnnotationRenderer.java;h=23726dfb6d859d0b93998ef821bc4dedbdae2df9;hb=28b416f0fdb491114107ef88f7b60baaca1d00d7;hp=b699543883ad291e3692317495304c0dc943763d;hpb=d7c00f48b00e3ede57c46ae4daf6a9203b9b6059;p=jalview.git
diff --git a/src/jalview/renderer/AnnotationRenderer.java b/src/jalview/renderer/AnnotationRenderer.java
index b699543..23726df 100644
--- a/src/jalview/renderer/AnnotationRenderer.java
+++ b/src/jalview/renderer/AnnotationRenderer.java
@@ -1,4 +1,20 @@
-
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
+ * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ */
package jalview.renderer;
import jalview.analysis.AAFrequency;
@@ -19,23 +35,35 @@ import java.awt.Image;
import java.awt.font.LineMetrics;
import java.awt.geom.AffineTransform;
import java.awt.image.ImageObserver;
+import java.util.BitSet;
import java.util.Hashtable;
import com.stevesoft.pat.Regex;
public class AnnotationRenderer
{
+ /**
+ * flag indicating if timing and redraw parameter info should be output
+ */
+ private final boolean debugRedraw;
public AnnotationRenderer()
{
- // TODO Auto-generated constructor stub
+ this(false);
+ }
+ /**
+ * Create a new annotation Renderer
+ * @param debugRedraw flag indicating if timing and redraw parameter info should be output
+ */
+ public AnnotationRenderer(boolean debugRedraw)
+ {
+ this.debugRedraw=debugRedraw;
}
public void drawStemAnnot(Graphics g, Annotation[] row_annotations,
int lastSSX, int x, int y, int iconOffset, int startRes,
int column, boolean validRes, boolean validEnd)
{
-
g.setColor(STEM_COLOUR);
int sCol = (lastSSX / charWidth) + startRes;
int x1 = lastSSX;
@@ -128,6 +156,22 @@ public class AnnotationRenderer
* width of image to render in panel
*/
private int imgWidth;
+ /**
+ * offset to beginning of visible area
+ */
+ private int sOffset;
+ /**
+ * offset to end of visible area
+ */
+ private int visHeight;
+ /**
+ * indicate if the renderer should only render the visible portion of the annotation given the current view settings
+ */
+ private boolean useClip=true;
+ /**
+ * master flag indicating if renderer should ever try to clip. not enabled for jalview 2.8.1
+ */
+ private boolean canClip=false;
public void drawNotCanonicalAnnot(Graphics g, Color nonCanColor, Annotation[] row_annotations,
@@ -197,6 +241,22 @@ public class AnnotationRenderer
annotationPanel = annotPanel;
fadedImage = annotPanel.getFadedImage();
imgWidth = annotPanel.getFadedImageWidth();
+ // visible area for rendering
+ int[] bounds=annotPanel.getVisibleVRange();
+ if (bounds!=null)
+ {
+ sOffset = bounds[0];
+ visHeight = bounds[1];
+ if (visHeight==0)
+ {
+ useClip=false;
+ } else {
+ useClip=canClip;
+ }
+ } else {
+ useClip=false;
+ }
+
updateFromAlignViewport(av);
}
@@ -276,6 +336,7 @@ public class AnnotationRenderer
/**
* Render the annotation rows associated with an alignment.
+ *
* @param annotPanel
* container frame
* @param av
@@ -288,19 +349,25 @@ public class AnnotationRenderer
* first column that will be drawn
* @param endRes
* last column that will be drawn
- * @return true if the fadedImage was used for any alignment annotation rows currently being calculated
+ * @return true if the fadedImage was used for any alignment annotation rows
+ * currently being calculated
*/
- public boolean drawComponent(AwtRenderPanelI annotPanel, AlignViewportI av,
- Graphics g, int activeRow, int startRes, int endRes)
+ public boolean drawComponent(AwtRenderPanelI annotPanel,
+ AlignViewportI av, Graphics g, int activeRow, int startRes,
+ int endRes)
{
- boolean usedFaded=false;
+ long stime=System.currentTimeMillis();
+ boolean usedFaded = false;
// NOTES:
// AnnotationPanel needs to implement: ImageObserver, access to
// AlignViewport
updateFromAwtRenderPanel(annotPanel, av);
fm = g.getFontMetrics();
AlignmentAnnotation[] aa = av.getAlignment().getAlignmentAnnotation();
-
+ if (aa==null)
+ {
+ return false;
+ }
int x = 0, y = 0;
int column = 0;
char lastSS;
@@ -312,16 +379,20 @@ public class AnnotationRenderer
boolean centreColLabels, centreColLabelsDef = av
.getCentreColumnLabels();
boolean scaleColLabel = false;
- boolean[] graphGroupDrawn = new boolean[aa.length];
+
+ BitSet graphGroupDrawn = new BitSet();
int charOffset = 0; // offset for a label
float fmWidth, fmScaling = 1f; // scaling for a label to fit it into a
// column.
Font ofont = g.getFont();
// \u03B2 \u03B1
+ // debug ints
+ int yfrom=0,f_i=0,yto=0,f_to=0;
+ boolean clipst=false,clipend=false;
for (int i = 0; i < aa.length; i++)
{
AlignmentAnnotation row = aa[i];
- Annotation[] row_annotations=row.annotations;
+ Annotation[] row_annotations = row.annotations;
if (!row.visible)
{
continue;
@@ -331,10 +402,20 @@ public class AnnotationRenderer
scaleColLabel = row.scaleColLabel;
lastSS = ' ';
lastSSX = 0;
+
+ if (!useClip || ((y-charHeight)=sOffset))
+ {// if_in_visible_region
+ if (!clipst)
+ {
+ clipst=true;
+ yfrom=y;
+ f_i=i;
+ }
+ yto = y;
+ f_to=i;
if (row.graph > 0)
{
- if (row.graphGroup > -1 && graphGroupDrawn[row.graphGroup])
- {
+ if (row.graphGroup > -1 && graphGroupDrawn.get(row.graphGroup)) {
continue;
}
@@ -360,7 +441,7 @@ public class AnnotationRenderer
if (row.autoCalculated && av.isCalculationInProgress(row))
{
y += charHeight;
- usedFaded=true;
+ usedFaded = true;
g.drawImage(fadedImage, 0, y - row.height, imgWidth, y, 0, y
- row.height, imgWidth, y, annotationPanel);
g.setColor(Color.black);
@@ -372,22 +453,22 @@ public class AnnotationRenderer
/*
* else if (annotationPanel.av.updatingConservation &&
* aa[i].label.equals("Conservation")) {
- *
+ *
* y += charHeight; g.drawImage(annotationPanel.fadedImage, 0, y -
* row.height, annotationPanel.imgWidth, y, 0, y - row.height,
* annotationPanel.imgWidth, y, annotationPanel);
- *
+ *
* g.setColor(Color.black); //
* g.drawString("Calculating Conservation.....",20, y-row.height/2);
- *
+ *
* continue; } else if (annotationPanel.av.updatingConservation &&
* aa[i].label.equals("Quality")) {
- *
+ *
* y += charHeight; g.drawImage(annotationPanel.fadedImage, 0, y -
* row.height, annotationPanel.imgWidth, y, 0, y - row.height,
* annotationPanel.imgWidth, y, annotationPanel); g.setColor(Color.black);
* // / g.drawString("Calculating Quality....",20, y-row.height/2);
- *
+ *
* continue; }
*/
// first pass sets up state for drawing continuation from left-hand column
@@ -789,19 +870,23 @@ public class AnnotationRenderer
switch (lastSS)
{
case 'H':
- drawHelixAnnot(g, row_annotations, lastSSX, x, y, iconOffset, startRes,
- column, validRes, validEnd);
+ drawHelixAnnot(g, row_annotations, lastSSX, x, y,
+ iconOffset, startRes, column, validRes, validEnd);
break;
case 'E':
- drawSheetAnnot(g, row_annotations, lastSSX, x, y, iconOffset, startRes,
- column, validRes, validEnd);
+ drawSheetAnnot(g, row_annotations, lastSSX, x, y,
+ iconOffset, startRes, column, validRes, validEnd);
break;
case '(': // Stem case for RNA secondary structure
case ')': // and opposite direction
drawStemAnnot(g, row_annotations, lastSSX, x, y, iconOffset, startRes,
column, validRes, validEnd);
+// case 'S': // Stem case for RNA secondary structure
+// case 's': // and opposite direction
+// drawStemAnnot(g, row_annotations, lastSSX, x, y,
+// iconOffset, startRes, column, validRes, validEnd);
break;
case '{':
case '}':
@@ -917,18 +1002,18 @@ public class AnnotationRenderer
switch (lastSS)
{
case 'H':
- drawHelixAnnot(g, row_annotations, lastSSX, x, y, iconOffset, startRes,
- column, validRes, validEnd);
+ drawHelixAnnot(g, row_annotations, lastSSX, x, y, iconOffset,
+ startRes, column, validRes, validEnd);
break;
case 'E':
- drawSheetAnnot(g, row_annotations, lastSSX, x, y, iconOffset, startRes,
- column, validRes, validEnd);
+ drawSheetAnnot(g, row_annotations, lastSSX, x, y, iconOffset,
+ startRes, column, validRes, validEnd);
break;
case 's':
case 'S': // Stem case for RNA secondary structure
- drawStemAnnot(g, row_annotations, lastSSX, x, y, iconOffset, startRes,
- column, validRes, validEnd);
+ drawStemAnnot(g, row_annotations, lastSSX, x, y, iconOffset,
+ startRes, column, validRes, validEnd);
break;
case '{':
case '}':
@@ -992,8 +1077,8 @@ public class AnnotationRenderer
column, validRes, validEnd);
break;
default:
- drawGlyphLine(g, row_annotations, lastSSX, x, y, iconOffset, startRes,
- column, validRes, validEnd);
+ drawGlyphLine(g, row_annotations, lastSSX, x, y, iconOffset,
+ startRes, column, validRes, validEnd);
break;
}
}
@@ -1002,8 +1087,9 @@ public class AnnotationRenderer
{
if (row.graph == AlignmentAnnotation.LINE_GRAPH)
{
- if (row.graphGroup > -1 && !graphGroupDrawn[row.graphGroup])
+ if (row.graphGroup > -1 && !graphGroupDrawn.get(row.graphGroup))
{
+ // TODO: JAL-1291 revise rendering model so the graphGroup map is computed efficiently for all visible labels
float groupmax = -999999, groupmin = 9999999;
for (int gg = 0; gg < aa.length; gg++)
{
@@ -1016,7 +1102,6 @@ public class AnnotationRenderer
{
aa[gg].visible = false;
}
-
if (aa[gg].graphMax > groupmax)
{
groupmax = aa[gg].graphMax;
@@ -1031,26 +1116,31 @@ public class AnnotationRenderer
{
if (aa[gg].graphGroup == row.graphGroup)
{
- drawLineGraph(g, aa[gg], aa[gg].annotations, startRes, endRes, y, groupmin,
- groupmax, row.graphHeight);
+ drawLineGraph(g, aa[gg], aa[gg].annotations, startRes,
+ endRes, y, groupmin, groupmax, row.graphHeight);
}
}
- graphGroupDrawn[row.graphGroup] = true;
+ graphGroupDrawn.set(row.graphGroup);
}
else
{
- drawLineGraph(g, row, row_annotations, startRes, endRes, y, row.graphMin,
- row.graphMax, row.graphHeight);
+ drawLineGraph(g, row, row_annotations, startRes, endRes, y,
+ row.graphMin, row.graphMax, row.graphHeight);
}
}
else if (row.graph == AlignmentAnnotation.BAR_GRAPH)
{
- drawBarGraph(g, row, row_annotations, startRes, endRes, row.graphMin,
- row.graphMax, y);
+ drawBarGraph(g, row, row_annotations, startRes, endRes,
+ row.graphMin, row.graphMax, y);
}
}
-
+ } else {
+ if (clipst && !clipend)
+ {
+ clipend = true;
+ }
+ }// end if_in_visible_region
if (row.graph > 0 && row.hasText)
{
y += charHeight;
@@ -1061,6 +1151,27 @@ public class AnnotationRenderer
y += aa[i].height;
}
}
+ if (debugRedraw)
+ {
+ if (canClip)
+ {
+ if (clipst)
+ {
+ System.err.println("Start clip at : " + yfrom + " (index " + f_i
+ + ")");
+ }
+ if (clipend)
+ {
+ System.err.println("End clip at : " + yto + " (index " + f_to
+ + ")");
+ }
+ }
+ ;
+ System.err.println("Annotation Rendering time:"
+ + (System.currentTimeMillis() - stime));
+ }
+ ;
+
return !usedFaded;
}
@@ -1074,22 +1185,21 @@ public class AnnotationRenderer
private Color sdNOTCANONICAL_COLOUR;
- public void drawGlyphLine(Graphics g, Annotation[] row,
- int lastSSX, int x, int y, int iconOffset, int startRes,
- int column, boolean validRes, boolean validEnd)
+ public void drawGlyphLine(Graphics g, Annotation[] row, int lastSSX,
+ int x, int y, int iconOffset, int startRes, int column,
+ boolean validRes, boolean validEnd)
{
g.setColor(GLYPHLINE_COLOR);
g.fillRect(lastSSX, y + 6 + iconOffset, (x * charWidth) - lastSSX, 2);
}
- public void drawSheetAnnot(Graphics g, Annotation[] row,
-
- int lastSSX, int x, int y, int iconOffset, int startRes,
- int column, boolean validRes, boolean validEnd)
+ public void drawSheetAnnot(Graphics g, Annotation[] row, int lastSSX,
+ int x, int y, int iconOffset, int startRes, int column,
+ boolean validRes, boolean validEnd)
{
g.setColor(SHEET_COLOUR);
- if (!validEnd || !validRes || row==null || row[column] == null
+ if (!validEnd || !validRes || row == null || row[column] == null
|| row[column].secondaryStructure != 'E')
{
g.fillRect(lastSSX, y + 4 + iconOffset,
@@ -1108,9 +1218,9 @@ public class AnnotationRenderer
}
- public void drawHelixAnnot(Graphics g, Annotation[] row,
- int lastSSX, int x, int y, int iconOffset, int startRes,
- int column, boolean validRes, boolean validEnd)
+ public void drawHelixAnnot(Graphics g, Annotation[] row, int lastSSX,
+ int x, int y, int iconOffset, int startRes, int column,
+ boolean validRes, boolean validEnd)
{
g.setColor(HELIX_COLOUR);
@@ -1168,8 +1278,9 @@ public class AnnotationRenderer
g.fillRect(x1, y + 4 + iconOffset, x2 - x1, 8);
}
- public void drawLineGraph(Graphics g, AlignmentAnnotation _aa, Annotation[] aa_annotations, int sRes,
- int eRes, int y, float min, float max, int graphHeight)
+ public void drawLineGraph(Graphics g, AlignmentAnnotation _aa,
+ Annotation[] aa_annotations, int sRes, int eRes, int y,
+ float min, float max, int graphHeight)
{
if (sRes > aa_annotations.length)
{
@@ -1257,8 +1368,9 @@ public class AnnotationRenderer
}
}
- public void drawBarGraph(Graphics g, AlignmentAnnotation _aa, Annotation[] aa_annotations, int sRes,
- int eRes, float min, float max, int y)
+ public void drawBarGraph(Graphics g, AlignmentAnnotation _aa,
+ Annotation[] aa_annotations, int sRes, int eRes, float min,
+ float max, int y)
{
if (sRes > aa_annotations.length)
{
@@ -1394,7 +1506,7 @@ public class AnnotationRenderer
// g.drawRect(x*av.charWidth, (int)ht, av.charWidth,
// (int)(scl));
// g.setColor(profcolour.findColour(dc[0]).darker());
- g.setColor(profcolour.findColour(dc[0], column,null));
+ g.setColor(profcolour.findColour(dc[0], column, null));
hght = (ht + (scl - lm.getDescent() - lm.getBaselineOffsets()[lm
.getBaselineIndex()]));
@@ -1415,15 +1527,16 @@ public class AnnotationRenderer
BasicStroke.JOIN_ROUND, 3f, new float[]
{ 5f, 3f }, 0f));
- y2 = (int) (y - ((_aa.threshold.value - min) / range) * _aa.graphHeight);
+ y2 = (int) (y - ((_aa.threshold.value - min) / range)
+ * _aa.graphHeight);
g.drawLine(0, y2, (eRes - sRes) * charWidth, y2);
g2.setStroke(new BasicStroke());
}
}
// used by overview window
- public void drawGraph(Graphics g, AlignmentAnnotation _aa, Annotation[] aa_annotations, int width,
- int y, int sRes, int eRes)
+ public void drawGraph(Graphics g, AlignmentAnnotation _aa,
+ Annotation[] aa_annotations, int width, int y, int sRes, int eRes)
{
eRes = Math.min(eRes, aa_annotations.length);
g.setColor(Color.white);