Fixes edge colour legend: would show “compound” even when edges have different colours. And no longer checks EnrichmentMap.isDistinctExpressionSets() when filtering edges.

Author: chrtannus

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

@@ -791,7 +791,7 @@ private Set<CyNode> getFilteredInNodes(Set<AbstractDataSet> selectedDataSets) {
 
 		private Set<CyEdge> getFilteredInEdges(Set<AbstractDataSet> selectedDataSets) {
 			EMCreationParameters params = map.getParams();
-			boolean distinct = params.getCreateDistinctEdges() && map.isDistinctExpressionSets();
+			boolean distinct = params.getCreateDistinctEdges();
 
 			// Compound edges are not associated with a specific data set
 			Set<Long> dataSetEdges = distinct ? EnrichmentMap.getEdgesUnion(selectedDataSets) : null;

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

@@ -351,7 +351,7 @@ private void updateEdgeColorPanel(EnrichmentMap map) {
 		if (map != null) {
 			Dimension iconSize = new Dimension(LEGEND_ICON_SIZE, LEGEND_ICON_SIZE / 2);
 
-			if (map.getParams().getCreateDistinctEdges() && map.isDistinctExpressionSets()) {
+			if (map.getParams().getCreateDistinctEdges()) {
 				VisualMappingFunction<?, Paint> mf =
 						style.getVisualMappingFunction(BasicVisualLexicon.EDGE_STROKE_UNSELECTED_PAINT);