X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fworkers%2FColumnCounterWorker.java;h=dd56aaf78c070fd68801536b57aa9d4453bad4dc;hb=a42904684c75b2729d763af933e5a991a3424f67;hp=947b3c7d225e4e31a0e561cdda6f4a3f3fdedf19;hpb=f8e603128476ca6e093ea2fc65435d1294978c53;p=jalview.git diff --git a/src/jalview/workers/ColumnCounterWorker.java b/src/jalview/workers/ColumnCounterWorker.java index 947b3c7..dd56aaf 100644 --- a/src/jalview/workers/ColumnCounterWorker.java +++ b/src/jalview/workers/ColumnCounterWorker.java @@ -89,7 +89,6 @@ class ColumnCounterWorker extends AlignCalcWorker return; } - removeAnnotation(); if (alignViewport.getAlignment() != null) { try @@ -159,20 +158,28 @@ class ColumnCounterWorker extends AlignCalcWorker { Color color = ColorUtils.getGraduatedColour(count, 0, Color.cyan, max, Color.blue); - anns[i] = new Annotation(String.valueOf(count), - String.valueOf(count), '0', count, color); + String str = String.valueOf(count); + anns[i] = new Annotation(str, str, '0', count, color); } } /* - * construct the annotation, save it and add it to the displayed alignment + * construct or update the annotation */ - AlignmentAnnotation ann = new AlignmentAnnotation(counter.getName(), - counter.getDescription(), anns); + AlignmentAnnotation ann = alignViewport.getAlignment() + .findOrCreateAnnotation(counter.getName(), + counter.getDescription(), false, null, null); + ann.description = counter.getDescription(); ann.showAllColLabels = true; + ann.scaleColLabel = true; ann.graph = AlignmentAnnotation.BAR_GRAPH; - ourAnnots.add(ann); - alignViewport.getAlignment().addAnnotation(ann); + ann.annotations = anns; + setGraphMinMax(ann, anns); + ann.validateRangeAndDisplay(); + if (!ourAnnots.contains(ann)) + { + ourAnnots.add(ann); + } } /**