Better Chart Legend labels for Heat Strips.

Author: chrtannus

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/legend/LegendPanel.java

@@ -508,13 +508,20 @@ private JPanel getNodeChartPanel() {
 			nodeChartPanel = createStyleLegendPanel(null);
 			nodeChartPanel.setToolTipText("Node Charts");
 
+			int h = 200;
+			
+			if (options.getChartOptions() != null
+					&& options.getChartOptions().getType() == ChartType.HEAT_STRIPS
+					&& options.getDataSets().size() > 4)
+				h = 300;
+			
 			GroupLayout layout = (GroupLayout) nodeChartPanel.getLayout();
 
 			layout.setHorizontalGroup(layout.createSequentialGroup()
 					.addComponent(chartLegendPanel, DEFAULT_SIZE, DEFAULT_SIZE, Short.MAX_VALUE)
 			);
 			layout.setVerticalGroup(layout.createSequentialGroup()
-					.addComponent(chartLegendPanel, PREFERRED_SIZE, 200, 200)
+					.addComponent(chartLegendPanel, PREFERRED_SIZE, h, h)
 			);
 		}
 

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/util/ChartUtil.java

@@ -210,7 +210,7 @@ public static JFreeChart createHeatMapLegend(List<EMDataSet> dataSets, ChartOpti
         chart.setBorderVisible(false);
         chart.setBackgroundPaint(UIManager.getColor("Table.background"));
         chart.setBackgroundImageAlpha(0.0f);
-        chart.setPadding(new RectangleInsets(0.0, 0.0, 0.0, 0.0));
+        chart.setPadding(new RectangleInsets(0.0, 0.0, 0.0, 20.0));
 
         final CategoryPlot plot = (CategoryPlot) chart.getPlot();
 		plot.setOutlineVisible(false);
@@ -281,27 +281,33 @@ public static JFreeChart createHeatStripsLegend(List<EMDataSet> dataSets, ChartO
 				false); // urls
 
 		chart.setAntiAlias(true);
-        chart.setBorderVisible(false);
-        chart.setBackgroundPaint(UIManager.getColor("Table.background"));
-        chart.setBackgroundImageAlpha(0.0f);
-        chart.setPadding(new RectangleInsets(0.0, 0.0, 0.0, 0.0));
-		
-        final CategoryPlot plot = (CategoryPlot) chart.getPlot();
+		chart.setBorderVisible(false);
+		chart.setBackgroundPaint(UIManager.getColor("Table.background"));
+		chart.setBackgroundImageAlpha(0.0f);
+		chart.setPadding(new RectangleInsets(0.0, 0.0, 0.0, 0.0));
+
+		final CategoryPlot plot = (CategoryPlot) chart.getPlot();
 		plot.setOutlineVisible(false);
 		plot.setBackgroundPaint(UIManager.getColor("Table.background"));
 		plot.setInsets(new RectangleInsets(0.0, 0.0, 0.0, 0.0));
 		plot.setDomainGridlinesVisible(false);
-	    plot.setRangeGridlinesVisible(false);
-		
+		plot.setRangeGridlinesVisible(false);
+
 		final CategoryAxis domainAxis = (CategoryAxis) plot.getDomainAxis();
-        domainAxis.setVisible(true);
-        domainAxis.setAxisLineVisible(false);
-        domainAxis.setTickMarksVisible(false);
-        domainAxis.setTickLabelFont(UIManager.getFont("Label.font").deriveFont(LookAndFeelUtil.getSmallFontSize()));
-        domainAxis.setLabelPaint(UIManager.getColor("Label.foreground"));
-        domainAxis.setCategoryLabelPositions(CategoryLabelPositions.UP_90);
-        domainAxis.setMaximumCategoryLabelLines(1);
-        domainAxis.setCategoryMargin(0.0);
+		domainAxis.setVisible(true);
+		domainAxis.setAxisLineVisible(false);
+		domainAxis.setTickMarksVisible(false);
+		domainAxis.setTickLabelFont(UIManager.getFont("Label.font").deriveFont(LookAndFeelUtil.getSmallFontSize()));
+		domainAxis.setLabelPaint(UIManager.getColor("Label.foreground"));
+		domainAxis.setMaximumCategoryLabelLines(1);
+		domainAxis.setCategoryMargin(0.0);
+        
+        if (total > 4) {
+	        domainAxis.setCategoryLabelPositions(CategoryLabelPositions.UP_90);
+	        domainAxis.setMaximumCategoryLabelWidthRatio(0.5f);
+        } else {
+        	domainAxis.setMaximumCategoryLabelLines(2);
+        }
 
         final NumberAxis rangeAxis = (NumberAxis) plot.getRangeAxis();
 		rangeAxis.setVisible(false);