Export heat map pdf respects show values checkbox

Author: mikekucera

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

@@ -186,14 +186,15 @@ private PdfPCell createRankCell(int modelRow) {
 
 	private PdfPCell createExpressionCell(int row, int col) {
 		double value = (double) getModel().getValueAt(row, col);
-		Color color = getCellRenderer().getColor(getModel(), col, value);
+		HeatMapCellRenderer cellRenderer = getCellRenderer();
+		Color color = cellRenderer.getColor(getModel(), col, value);
+		boolean showValues = cellRenderer.getShowValues();
 
 		PdfPCell cell = new PdfPCell();
 		cell.setBackgroundColor(color(color));
-		if(Double.isFinite(value)) {
+		if(showValues && Double.isFinite(value)) {
 			cell.setPhrase(new Phrase(ExportTXTTask.getExpressionText(value)));
 		}
-		
 		return cell;
 	}
 
@@ -206,11 +207,11 @@ private void setColumnWidths(PdfPTable table) throws DocumentException {
 		widths[1] = getPreferredColumnWidth(table, 1);
 		widths[2] = getPreferredColumnWidth(table, 2);
 
-		float maxExpression = 0;
+		// equalize widths of expression columns
+		float maxExpression = 30;
 		for(int col = 3; col < n; col++) {
 			maxExpression = Math.max(maxExpression, getPreferredColumnWidth(table, col));
 		}
-		
 		for(int col = 3; col < n; col++) {
 			widths[col] = maxExpression;
 		}

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

@@ -28,10 +28,6 @@ public class HeatMapCellRenderer implements TableCellRenderer {
 	private 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) {
 		JLabel label = new JLabel();
@@ -59,6 +55,16 @@ public JLabel getTableCellRendererComponent(JTable table, Object value, boolean
 		return label;
 	}
 
+	
+	public void setShowValues(boolean showValue) {
+		this.showValue = showValue;
+	}
+	
+	public boolean getShowValues() {
+		return showValue;
+	}
+	
+	
 	public static String getText(double d) {
 		return Double.isFinite(d) ? format.format(d) : "NaN";
 	}