Add "sparser"/"denser" to slider labels.

Refs #224

Author: mikekucera

EnrichmentMapPlugin/src/main/java/org/baderlab/csplugins/enrichmentmap/view/control/ControlPanel.java

@@ -6,19 +6,9 @@
 import static javax.swing.GroupLayout.Alignment.LEADING;
 import static javax.swing.GroupLayout.Alignment.TRAILING;
 import static org.baderlab.csplugins.enrichmentmap.EMBuildProps.HELP_URL_CONTROL;
-import static org.baderlab.csplugins.enrichmentmap.view.util.IconUtil.EM_ICON_COLORS;
-import static org.baderlab.csplugins.enrichmentmap.view.util.IconUtil.GENEMANIA_ICON;
-import static org.baderlab.csplugins.enrichmentmap.view.util.IconUtil.GENEMANIA_ICON_COLOR;
-import static org.baderlab.csplugins.enrichmentmap.view.util.IconUtil.LAYERED_EM_ICON;
-import static org.baderlab.csplugins.enrichmentmap.view.util.IconUtil.LAYERED_STRING_ICON;
-import static org.baderlab.csplugins.enrichmentmap.view.util.IconUtil.STRING_ICON_COLORS;
-import static org.baderlab.csplugins.enrichmentmap.view.util.IconUtil.getIconFont;
+import static org.baderlab.csplugins.enrichmentmap.view.util.IconUtil.*;
 import static org.baderlab.csplugins.enrichmentmap.view.util.SwingUtil.makeSmall;
-import static org.cytoscape.util.swing.IconManager.ICON_BARS;
-import static org.cytoscape.util.swing.IconManager.ICON_FILE;
-import static org.cytoscape.util.swing.IconManager.ICON_PLUS;
-import static org.cytoscape.util.swing.IconManager.ICON_REFRESH;
-import static org.cytoscape.util.swing.IconManager.ICON_STAR;
+import static org.cytoscape.util.swing.IconManager.*;
 import static org.cytoscape.util.swing.LookAndFeelUtil.isAquaLAF;
 
 import java.awt.BorderLayout;
@@ -697,6 +687,7 @@ private JPanel createFilterPanel() {
 				similaritySliderPanel = createSimilaritySlider(map);
 				sliderPanelFields.add(similaritySliderPanel.getTextField());
 
+				vGroup.addGap(15);
 				hGroup.addComponent(similaritySliderPanel);
 				vGroup.addComponent(similaritySliderPanel);
 
@@ -787,7 +778,10 @@ private SliderBarPanel createPvalueSlider(EnrichmentMap map) {
 			return new SliderBarPanel(
 					(pvalueMin == 1 || pvalueMin >= pvalue ? 0 : pvalueMin),
 					pvalue,
-					pvalue
+					pvalue,
+					null,
+					"sparser", 
+					"denser"
 			);
 		}
 
@@ -798,7 +792,10 @@ private SliderBarPanel createQvalueSlider(EnrichmentMap map) {
 			return new SliderBarPanel(
 					(qvalueMin == 1 || qvalueMin >= qvalue ? 0 : qvalueMin),
 					qvalue,
-					qvalue
+					qvalue,
+					null, 
+					"sparser", 
+					"denser"
 			);
 		}
 
@@ -809,7 +806,9 @@ private SliderBarPanel createSimilaritySlider(EnrichmentMap map) {
 					similarityCutOff,
 					1,
 					similarityCutOff,
-					"Edge Cutoff (Similarity):"
+					"Edge Cutoff (Similarity):", 
+					"denser", 
+					"sparser"
 			);
 		}
 

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

@@ -99,15 +99,25 @@ public class SliderBarPanel extends JPanel {
 	private final DecimalFormat format;
 	private boolean ignore;
 
+	private String minExtraLabel;
+	private String maxExtraLabel;
+	
+	
 	public SliderBarPanel(double min, double max, double value) {
-		this(min, max, value, null);
+		this(min, max, value, null, null, null);
 	}
 
 	public SliderBarPanel(double min, double max, double value, String title) {
+		this(min, max, value, title, null, null);
+	}
+	
+	public SliderBarPanel(double min, double max, double value, String title, String minLabel, String maxLabel) {
 		this.min = min;
 		this.max = max;
 		this.value = value;
 		this.title = title;
+		this.minExtraLabel = minLabel;
+		this.maxExtraLabel = maxLabel;
 		listeners = new ArrayList<>();
 
 		String pattern = getFormatPattern(min, max, value);
@@ -120,6 +130,7 @@ public SliderBarPanel(double min, double max, double value, String title) {
 
 		init();
 	}
+	
 
 	@SuppressWarnings("unchecked")
 	protected void init() {
@@ -219,6 +230,16 @@ public void focusLost(FocusEvent e) {
 		return textField;
 	}
 
+	
+	private JLabel createTickLabel(double val, String extra) {
+		var valText = format.format(val);
+		if(extra == null)
+			return new JLabel(valText);
+		else
+			return new JLabel("<html><div style='text-align: center'>" + valText + "<br>" + extra + "</div></html>");
+	}
+	
+	
 	JSlider getSlider() {
 		if (slider == null) {
 			slider = new JSlider(S_MIN, S_MAX);
@@ -241,12 +262,12 @@ JSlider getSlider() {
 					slider.setMinorTickSpacing(S_RANGE / (n * 2));
 			}
 
-			labelTable.put(S_MIN, new JLabel(format.format(min)));
+			labelTable.put(S_MIN, createTickLabel(min, minExtraLabel));
 
 			if ((S_MIN + S_RANGE / 2) % 2 == 0)
 				labelTable.put(S_MIN + S_RANGE / 2, new JLabel(format.format(min + range / 2)));
 
-			labelTable.put(S_MAX, new JLabel(format.format(max)));
+			labelTable.put(S_MAX, createTickLabel(max, maxExtraLabel));
 
 			slider.setLabelTable(labelTable);
 			slider.setPaintTicks(true);