/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
* Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
*
* This file is part of Jalview.
height += aa[i].height;
}
}
- else
+ if (height == 0)
{
+ // set minimum
height = 20;
}
public void actionPerformed(ActionEvent evt)
{
AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation();
+ if (aa == null)
+ {
+ return;
+ }
Annotation[] anot = aa[activeRow].annotations;
if (anot.length < av.getColumnSelection().getMax())
if (v == column)
{
- g
- .fillRect(x * av.charWidth, y, av.charWidth,
- av.charHeight);
+ g.fillRect(x * av.charWidth, y, av.charWidth, av.charHeight);
}
}
}
if (sCol == 0 || row.annotations[sCol - 1] == null
|| row.annotations[sCol - 1].secondaryStructure != 'H')
{
- g
- .fillArc(lastSSX, y + 4 + iconOffset, av.charWidth, 8,
- 90, 180);
+ g.fillArc(lastSSX, y + 4 + iconOffset, av.charWidth, 8, 90, 180);
x1 += av.charWidth / 2;
}
// group(aa.groupRef.cs==null)
// ? av.textColour2 :
// cs.findColour(dc));
- g.drawChars(dc, 0, 1, x * av.charWidth, (int) (ht + lm
- .getHeight()));
+ g.drawChars(dc, 0, 1, x * av.charWidth,
+ (int) (ht + lm.getHeight()));
// ht+=g.getFontMetrics().getAscent()-g.getFontMetrics().getDescent();
}
}
&& aa.groupRef.isShowSequenceLogo())
{
return AAFrequency.extractProfile(
- aa.groupRef.consensusData[column], aa.groupRef
- .getIgnoreGapsConsensus());
+ aa.groupRef.consensusData[column],
+ aa.groupRef.getIgnoreGapsConsensus());
}
// TODO extend annotation row to enable dynamic and static profile data to
// be stored
if (aa.groupRef == null && aa.sequenceRef == null
&& av.isShowSequenceLogo())
{
- return AAFrequency.extractProfile(av.hconsensus[column], av
- .getIgnoreGapsConsensus());
+ return AAFrequency.extractProfile(av.hconsensus[column],
+ av.getIgnoreGapsConsensus());
}
}
return null;