git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2228 always set minimum for count to zero for annotation row
[jalview.git]
/
src
/
jalview
/
workers
/
ColumnCounterSetWorker.java
diff --git
a/src/jalview/workers/ColumnCounterSetWorker.java
b/src/jalview/workers/ColumnCounterSetWorker.java
index
6c5707d
..
8a1c8ec
100644
(file)
--- a/
src/jalview/workers/ColumnCounterSetWorker.java
+++ b/
src/jalview/workers/ColumnCounterSetWorker.java
@@
-182,8
+182,9
@@
class ColumnCounterSetWorker extends AlignCalcWorker
for (int anrow = 0; anrow < rows; anrow++)
{
Annotation[] anns = new Annotation[width];
for (int anrow = 0; anrow < rows; anrow++)
{
Annotation[] anns = new Annotation[width];
+ long rmax = 0;
/*
/*
- * add non-zero counts as annotations
+ * add counts as annotations. zeros are needed since select-by-annotation ignores empty annotation positions
*/
for (int i = 0; i < counts.length; i++)
{
*/
for (int i = 0; i < counts.length; i++)
{
@@
-195,6
+196,7
@@
class ColumnCounterSetWorker extends AlignCalcWorker
String str = String.valueOf(count);
anns[i] = new Annotation(str, str, '0', count, color);
}
String str = String.valueOf(count);
anns[i] = new Annotation(str, str, '0', count, color);
}
+ rmax = Long.max(count, rmax);
}
/*
}
/*
@@
-212,7
+214,8
@@
class ColumnCounterSetWorker extends AlignCalcWorker
ann.scaleColLabel = true;
ann.graph = AlignmentAnnotation.BAR_GRAPH;
ann.annotations = anns;
ann.scaleColLabel = true;
ann.graph = AlignmentAnnotation.BAR_GRAPH;
ann.annotations = anns;
- setGraphMinMax(ann, anns);
+ ann.graphMin = 0f; // minimum always zero count
+ ann.graphMax = rmax; // maximum count from loop over feature columns
ann.validateRangeAndDisplay();
if (!ourAnnots.contains(ann))
{
ann.validateRangeAndDisplay();
if (!ourAnnots.contains(ann))
{