add newly added annotation to header

mpschr · mpschr · commit 617d54e37f05 · 2016-01-22T18:02:11.000+01:00
diff --git a/org.gitools.ui.app/src/main/java/org/gitools/ui/app/actions/edit/EditAnnotationValueAction.java b/org.gitools.ui.app/src/main/java/org/gitools/ui/app/actions/edit/EditAnnotationValueAction.java
@@ -24,6 +24,7 @@
 import org.gitools.api.analysis.Clusters;
 import org.gitools.api.matrix.MatrixDimensionKey;
 import org.gitools.heatmap.Heatmap;
+import org.gitools.heatmap.HeatmapDimension;
 import org.gitools.heatmap.header.ColoredLabel;
 import org.gitools.heatmap.header.HeatmapColoredLabelsHeader;
 import org.gitools.heatmap.header.HeatmapHeader;
@@ -51,6 +52,7 @@
 import java.util.List;
 
 import static org.gitools.ui.app.commands.AddHeaderColoredLabelsCommand.makeAnnotationClustering;
+import static org.gitools.ui.app.commands.AddHeaderColoredLabelsCommand.updateFromClusterResults;
 
 public class EditAnnotationValueAction extends HeatmapDimensionAction implements IHeatmapHeaderAction {
 
@@ -94,7 +96,7 @@ public void actionPerformed(ActionEvent e) {
         execute(header, position);
     }
 
-    public static void execute(final HeatmapHeader header, final HeatmapPosition position) {
+    public void execute(final HeatmapHeader header, final HeatmapPosition position) {
 
         final List<ISettingsSection> sections = new ArrayList<>();
         final Set<String> selected = header.getHeatmapDimension().getSelected();
@@ -206,11 +208,20 @@ private static void applyChanges(ChangeAnnotationValueSection section) {
         }
     }
 
-    private static void addNewAnnotation(AddNewManualAnnotationSection section) {
+    private void addNewAnnotation(AddNewManualAnnotationSection section) {
         AnnotationMatrix annotations = section.getAnnotations();
         for (String s : section.getSelected()) {
                 annotations.setAnnotation(s, section.getAnnotationLabel(), section.getAnnotationValue());
         }
+        HeatmapDimension dim = getHeader().getHeatmapDimension();
+        HeatmapColoredLabelsHeader newHeader = new HeatmapColoredLabelsHeader(dim);
+        newHeader.setAnnotationPattern("${" + section.getAnnotationLabel() + "}");
+        newHeader.setTitle(section.getAnnotationLabel());
+        Clusters results = makeAnnotationClustering(newHeader);
+        updateFromClusterResults(newHeader, results.getClusters());
+        dim.addHeader(newHeader);
+
+
     }
 
     @Override
diff --git a/org.gitools.ui.app/src/main/java/org/gitools/ui/app/heatmap/panel/settings/headers/AddNewManualAnnotationSection.java b/org.gitools.ui.app/src/main/java/org/gitools/ui/app/heatmap/panel/settings/headers/AddNewManualAnnotationSection.java
@@ -47,7 +47,7 @@ public class AddNewManualAnnotationSection extends AbstractSettingsSection {
     public AddNewManualAnnotationSection(final AnnotationMatrix annotations, final List<String> selected) {
         this.annotations = annotations;
         this.selected = selected;
-        this.explanationLabel.setText("<html><body><i>The annotation is not automatically added as header</i></body></html>");
+        this.explanationLabel.setText("<html><body><i>The annotation will automatically added as a colored header</i></body></html>");
 
 
         DocumentChangeListener docListener = new DocumentChangeListener() {
