Skip to content

Commit 5519e7c

Browse files
author
Michael P Schroeder
committed
Release version 2.2.2
1 parent 4a2cc6b commit 5519e7c

File tree

20 files changed

+99
-18
lines changed

20 files changed

+99
-18
lines changed

‎changelog.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Gitools 2.2.2
55
* Bugfix: integer clustering
66
* Bugfix: Numeric header sorting
77
* Non-0 event function for linear numeric (color) scale
8+
* Numeric Header value formatter
89

910

1011
Gitools 2.2.1

‎doc/source/UserGuide_MutualExclusivity.rst‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@ Mutual exclusion and co-occurrence test
44

55
.. contents::
66

7-
When sorting heatmap rows according to mutual exclusivity of :doc:`UserGuide_DataEvents` it is possible to also carry
8-
out a test of significance for the mutual-exclusive or co-occurring distribution of those events
7+
There are two scenarios where Gitools can perform a mutex or co-oc test:
98

9+
#. When sorting heatmap rows according to mutual exclusivity of :doc:`UserGuide_DataEvents` it is possible to also carry
10+
out a test of significance for the mutual-exclusive or co-occurring distribution of those events
11+
#. Having row and/or column annotation which describe subgroups of each dimension allow to carry out a test for
12+
each combination of column-row group via the Analysis - menu
1013

1114
Data files needed
1215
----------------------------------------------

‎doc/source/conf.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
# The short X.Y version.
5353
version = '2.2'
5454
# The full version, including alpha/beta/rc tags.
55-
release = '2.2.1'
55+
release = '2.2.2'
5656

5757
# The language for content autogenerated by Sphinx. Refer to documentation
5858
# for a list of supported languages.

‎org.gitools.analysis/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>gitools</artifactId>
77
<groupId>org.gitools</groupId>
8-
<version>2.3.0-SNAPSHOT</version>
8+
<version>2.2.2</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎org.gitools.api/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>gitools</artifactId>
77
<groupId>org.gitools</groupId>
8-
<version>2.3.0-SNAPSHOT</version>
8+
<version>2.2.2</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎org.gitools.cli/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>org.gitools</groupId>
55
<artifactId>gitools</artifactId>
6-
<version>2.3.0-SNAPSHOT</version>
6+
<version>2.2.2</version>
77
</parent>
88

99
<modelVersion>4.0.0</modelVersion>

‎org.gitools.datasources/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>gitools</artifactId>
77
<groupId>org.gitools</groupId>
8-
<version>2.3.0-SNAPSHOT</version>
8+
<version>2.2.2</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎org.gitools.heatmap/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>gitools</artifactId>
77
<groupId>org.gitools</groupId>
8-
<version>2.3.0-SNAPSHOT</version>
8+
<version>2.2.2</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎org.gitools.heatmap/src/main/java/org/gitools/heatmap/header/HeatmapDecoratorHeader.java‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
import org.gitools.heatmap.decorator.impl.LinearDecorator;
3131
import org.gitools.matrix.filter.AnnotationFunction;
3232
import org.gitools.utils.formatter.HeatmapTextFormatter;
33+
import org.gitools.utils.formatter.ITextFormatter;
34+
import org.gitools.utils.formatter.ScientificHeatmapTextFormatter;
3335

3436
import javax.xml.bind.annotation.*;
3537
import java.awt.*;
@@ -41,6 +43,7 @@
4143
@XmlRootElement
4244
public class HeatmapDecoratorHeader extends HeatmapHeader {
4345

46+
public static final String PROPERTY_NUMERIC_FORMATTER = "numericFormatter";
4447
public enum LabelPositionEnum {
4548
leftOf,
4649
rightOf,
@@ -59,6 +62,9 @@ public enum LabelPositionEnum {
5962
@XmlElement
6063
private List<String> annotationLabels;
6164

65+
66+
private transient ITextFormatter numericFormatter = ScientificHeatmapTextFormatter.INSTANCE;
67+
6268
@XmlTransient
6369
private String sortLabel;
6470

@@ -121,7 +127,7 @@ public void decorate(Decoration decoration, String identifier, String annotation
121127

122128
decorator.decorate(
123129
decoration,
124-
HeatmapTextFormatter.TWO_DECIMALS,
130+
numericFormatter,
125131
annotations,
126132
annotations.getLayers().get(annotation),
127133
identifier);
@@ -202,6 +208,20 @@ public void setSortLabel(String label) {
202208

203209
}
204210

211+
212+
public ITextFormatter getNumericFormatter() {
213+
if (numericFormatter == null) {
214+
return ScientificHeatmapTextFormatter.INSTANCE;
215+
}
216+
return numericFormatter;
217+
}
218+
219+
public void setNumericFormatter(ITextFormatter numericFormatter) {
220+
this.numericFormatter = numericFormatter;
221+
firePropertyChange(PROPERTY_NUMERIC_FORMATTER, null, numericFormatter);
222+
}
223+
224+
205225
@Override
206226
public boolean isNumeric() {
207227
return true;

‎org.gitools.matrix/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>gitools</artifactId>
77
<groupId>org.gitools</groupId>
8-
<version>2.3.0-SNAPSHOT</version>
8+
<version>2.2.2</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

0 commit comments

Comments
 (0)