X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fworkers%2FColumnCounterSetWorker.java;h=24cb717cf79fe1e8e9f4a807d4a466a256e36866;hb=8006c8339740c778275fe9fe0a292451a8d7223c;hp=8a1c8ecf073c9f406597763164e2f322dd5e9639;hpb=7ff8c3bd7a91e45a889765d7e2985bab04ff21a8;p=jalview.git diff --git a/src/jalview/workers/ColumnCounterSetWorker.java b/src/jalview/workers/ColumnCounterSetWorker.java index 8a1c8ec..24cb717 100644 --- a/src/jalview/workers/ColumnCounterSetWorker.java +++ b/src/jalview/workers/ColumnCounterSetWorker.java @@ -189,14 +189,12 @@ class ColumnCounterSetWorker extends AlignCalcWorker for (int i = 0; i < counts.length; i++) { int count = counts[i][anrow]; - if (count > 0) - { - Color color = ColorUtils.getGraduatedColour(count, 0, minColour, - max[anrow], maxColour); - String str = String.valueOf(count); - anns[i] = new Annotation(str, str, '0', count, color); - } - rmax = Long.max(count, rmax); + + Color color = ColorUtils.getGraduatedColour(count, 0, minColour, + max[anrow], maxColour); + String str = String.valueOf(count); + anns[i] = new Annotation(str, str, '0', count, color); + rmax = Math.max(count, rmax); } /* @@ -231,6 +229,7 @@ class ColumnCounterSetWorker extends AlignCalcWorker * * @param alignment * @param col + * (0..) * @param row * @param fr */ @@ -251,14 +250,12 @@ class ColumnCounterSetWorker extends AlignCalcWorker { return null; } - int pos = seq.findPosition(col); /* * compute a count for any displayed features at residue */ - // NB have to adjust pos if using AlignmentView.getVisibleAlignment // see JAL-2075 - List features = fr.findFeaturesAtRes(seq, pos); + List features = fr.findFeaturesAtColumn(seq, col + 1); int[] count = this.counter.count(String.valueOf(res), features); return count; }