Better caching of color gradients. Refs #290

Author: mikekucera

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/model/EMDataSet.java

@@ -129,35 +129,6 @@ public DataSetFiles getDataSetFiles() {
 		return dataSetFiles;
 	}
 
-	@Override
-	public int hashCode() {
-		final int prime = 11;
-		int result = 5;
-		result = prime * result + ((method == null) ? 0 : method.hashCode());
-		result = prime * result + ((getName() == null) ? 0 : getName().hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		EMDataSet other = (EMDataSet) obj;
-		if (method != other.method)
-			return false;
-		if (getName() == null) {
-			if (other.getName() != null)
-				return false;
-		} else if (!getName().equals(other.getName())) {
-			return false;
-		}
-		return true;
-	}
-
 	@Override
 	public String toString() {
 		return "EMDataSet [name=" + getName() + ", method=" + method + "]";

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/heatmap/HeatMapMainPanel.java

@@ -142,6 +142,9 @@ private JPanel createTablePanel() {
 		table.setCellSelectionEnabled(true);
 		table.setAutoCreateRowSorter(true);
 		table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+		
+		table.setDefaultRenderer(Double.class, new HeatMapCellRenderer());
+		table.setDefaultRenderer(RankValue.class, new RankValueRenderer());
 
 		JPanel panel = new JPanel(new BorderLayout());
 		panel.add(scrollPane, BorderLayout.CENTER);
@@ -486,8 +489,8 @@ public void updateSetting_RankOption(RankingOption rankOption) {
 	}
 
 	private void updateSetting_ShowValues(boolean showValues) {
-		table.setDefaultRenderer(Double.class, new HeatMapCellRenderer(showValues));
-		table.setDefaultRenderer(RankValue.class, new RankValueRenderer());
+		HeatMapCellRenderer renderer = (HeatMapCellRenderer) table.getDefaultRenderer(Double.class);
+		renderer.setShowValues(showValues);
 		clearTableHeader();
 		createTableHeader(showValues ? COLUMN_WIDTH_VALUE : COLUMN_WIDTH_COLOR);
 		table.revalidate();

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/heatmap/table/DataSetColorRange.java

@@ -21,7 +21,6 @@ private DataSetColorRange(ColorGradientTheme theme, ColorGradientRange range) {
 	 * Reset color gradients based on a change in the data transformation.
 	 */
 	public static Optional<DataSetColorRange> create(GeneExpressionMatrix expression, Transform transform) {
-		System.out.println("DataSetColorRange.create()");
 		float[] minMax = expression.getMinMax(transform);
 		if(minMax == null || minMax.length < 2)
 			return Optional.empty();

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/heatmap/table/HeatMapCellRenderer.java

@@ -15,22 +15,22 @@
 import javax.swing.border.Border;
 import javax.swing.table.TableCellRenderer;
 
+import org.apache.commons.lang3.tuple.Pair;
 import org.baderlab.csplugins.enrichmentmap.model.EMDataSet;
 import org.baderlab.csplugins.enrichmentmap.view.heatmap.HeatMapParams.Transform;
 import org.baderlab.csplugins.org.mskcc.colorgradient.ColorGradientRange;
 import org.baderlab.csplugins.org.mskcc.colorgradient.ColorGradientTheme;
 
 public class HeatMapCellRenderer implements TableCellRenderer {
 
-	private final Map<EMDataSet,Optional<DataSetColorRange>> colorRanges = new HashMap<>();
+	private final Map<Pair<EMDataSet,Transform>,Optional<DataSetColorRange>> colorRanges = new HashMap<>();
 	private final DecimalFormat format = new DecimalFormat("###.##");
-	private final boolean showValue;
+	private boolean showValue;
 
 
-	public HeatMapCellRenderer(boolean showValue) {
+	public void setShowValues(boolean showValue) {
 		this.showValue = showValue;
 	}
-
 
 	@Override
 	public JLabel getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int col) {
@@ -82,7 +82,9 @@ public Color getColor(HeatMapTableModel model, int col, double d) {
 
 	public Optional<DataSetColorRange> getRange(EMDataSet dataset, Transform transform) {
 		// creating the color range for Transform.ROW_NORMALIZED consumes memory, so cache the value
-		return colorRanges.computeIfAbsent(dataset, ds -> DataSetColorRange.create(ds.getExpressionSets(), transform));
+		return colorRanges.computeIfAbsent(Pair.of(dataset, transform), 
+			pair -> DataSetColorRange.create(pair.getLeft().getExpressionSets(), pair.getRight())
+		);
 	}