Synchronize data set list with network selection.

Refs #474

Author: mikekucera

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

@@ -76,6 +76,7 @@
 import org.baderlab.csplugins.enrichmentmap.task.SelectNodesEdgesTask;
 import org.baderlab.csplugins.enrichmentmap.task.UpdateAssociatedStyleTask;
 import org.baderlab.csplugins.enrichmentmap.task.postanalysis.RemoveSignatureDataSetsTask;
+import org.baderlab.csplugins.enrichmentmap.util.CoalesceTimer;
 import org.baderlab.csplugins.enrichmentmap.util.NetworkUtil;
 import org.baderlab.csplugins.enrichmentmap.util.TaskUtil;
 import org.baderlab.csplugins.enrichmentmap.view.control.ControlPanel.AbstractViewControlPanel;
@@ -106,6 +107,9 @@
 import org.cytoscape.model.CyNode;
 import org.cytoscape.model.CyRow;
 import org.cytoscape.model.CyTable;
+import org.cytoscape.model.CyTableUtil;
+import org.cytoscape.model.events.RowsSetEvent;
+import org.cytoscape.model.events.RowsSetListener;
 import org.cytoscape.service.util.CyServiceRegistrar;
 import org.cytoscape.util.swing.LookAndFeelUtil;
 import org.cytoscape.util.swing.TextIcon;
@@ -122,7 +126,8 @@
 import com.google.inject.Singleton;
 
 @Singleton
-public class ControlPanelMediator implements SetCurrentNetworkViewListener, EnrichmentMapAddedListener, EnrichmentMapAboutToBeRemovedListener, AssociatedEnrichmentMapsChangedListener {
+public class ControlPanelMediator implements SetCurrentNetworkViewListener, EnrichmentMapAddedListener,
+	EnrichmentMapAboutToBeRemovedListener, AssociatedEnrichmentMapsChangedListener, RowsSetListener {
 
 	@Inject private Provider<ControlPanel> controlPanelProvider;
 	@Inject private Provider<LegendPanelMediator> legendPanelMediatorProvider;
@@ -151,6 +156,7 @@ public class ControlPanelMediator implements SetCurrentNetworkViewListener, Enri
 
 	private FilterMode filterMode = FilterMode.HIDE;
 
+	private final CoalesceTimer selectionEventTimer = new CoalesceTimer(200, 1);
 	private Map<CyNetworkView, Timer> filterTimers = new HashMap<>();
 
 	private boolean firstTime = true;
@@ -369,6 +375,45 @@ public void handleEvent(SetCurrentNetworkViewEvent e) {
 			updateLegends(viewPanel);
 		});
 	}
+	
+	@Override
+	public void handleEvent(RowsSetEvent e) {
+		// TODO Auto-generated method stub
+		if(e.containsColumn(CyNetwork.SELECTED)) {
+			CyNetworkView networkView = applicationManager.getCurrentNetworkView();
+			if(networkView != null) {
+				CyNetwork network = networkView.getModel();
+				// only handle event if it is a selected node
+				if(e.getSource() == network.getDefaultEdgeTable() || e.getSource() == network.getDefaultNodeTable()) {
+					selectionEventTimer.coalesce(() -> updateFromNodeSelection(networkView));
+				}
+			}
+		}
+	}
+	
+	private void updateFromNodeSelection(CyNetworkView networkView) {
+		if(networkView == null)
+			return;
+		
+		EnrichmentMap map = getCurrentMap();
+		if(map == null)
+			return;
+		
+		EMViewControlPanel controlPanel = getControlPanel().getViewControlPanel(networkView);
+		if(controlPanel == null)
+			return;
+		
+		CyNetwork network = networkView.getModel();
+		List<CyNode> selectedNodes = CyTableUtil.getNodesInState(network, CyNetwork.SELECTED, true);
+		List<CyEdge> selectedEdges = CyTableUtil.getEdgesInState(network, CyNetwork.SELECTED, true);
+
+		List<AbstractDataSet> dataSets = new ArrayList<>(map.getDataSetList());
+		dataSets.addAll(map.getSignatureSetList());
+				
+		dataSets = HeatMapMediator.filterDataSetsForSelection(dataSets, map, selectedNodes, selectedEdges);
+		
+		controlPanel.getDataSetSelector().setHighlightedDataSets(dataSets);
+	}
 
 	@Override
 	public void handleEvent(EnrichmentMapAddedEvent e) {

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

@@ -14,6 +14,7 @@
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
@@ -32,6 +33,7 @@
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
 import javax.swing.JTextField;
+import javax.swing.ListSelectionModel;
 import javax.swing.UIManager;
 import javax.swing.border.Border;
 import javax.swing.border.EmptyBorder;
@@ -73,10 +75,6 @@ public class DataSetSelector extends JPanel {
 	private JMenuItem selectNoneMenuItem;
 	private JMenuItem selectNodesMenuItem;
 	private JMenuItem deleteSignatureMenuItem;
-//	private JButton addButton;
-//	private JButton colorButton;
-//	private JButton selectAllButton;
-//	private JButton selectNoneButton;
 	private JButton optionButton;
 
 	private final EnrichmentMap map;
@@ -152,6 +150,19 @@ public void setCheckedItems(Set<AbstractDataSet> newValue) {
 		firePropertyChange(PROP_CHECKED_DATA_SETS, oldValue, getCheckedItems());
 	}
 
+	public void setHighlightedDataSets(Collection<AbstractDataSet> dataSets) {
+		ListSelectionModel selectionModel = getTable().getSelectionModel();
+		selectionModel.clearSelection();
+		
+		final int rowCount = getTable().getRowCount();
+		for (int i = 0; i < rowCount; i++) {
+			AbstractDataSet ds = (AbstractDataSet) getTable().getValueAt(i, NAME_COL_IDX);
+			if(dataSets != null && dataSets.contains(ds)) {
+				selectionModel.addSelectionInterval(i, i);
+			}
+		}
+	}
+	
 	public Set<AbstractDataSet> getSelectedItems() {
 		Set<AbstractDataSet> set = new HashSet<>();
 		int[] selectedRows = getTable().getSelectedRows();

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

@@ -336,27 +336,39 @@ private List<AbstractDataSet> getEnabledDataSets(
 
 		// Remove Data Sets that are not part of the selected nodes/edges
 		if(propertyManager.isTrue(PropertyManager.HEATMAP_SELECT_SYNC)) {
-			boolean distinctEdges = map.getParams().getCreateDistinctEdges();
+			dataSets = filterDataSetsForSelection(dataSets, map, selectedNodes, selectedEdges);
+		}
+		
+		return dataSets;
+	}
+	
+	/**
+	 * Removes data sets from the dataSets List parameter that are not included by any of the selected nodes or edges.
+	 */
+	public static List<AbstractDataSet> filterDataSetsForSelection(
+			List<AbstractDataSet> dataSets, EnrichmentMap map, 
+			Collection<CyNode> selectedNodes, Collection<CyEdge> selectedEdges
+	) {
+		boolean distinctEdges = map.getParams().getCreateDistinctEdges();
+		List<AbstractDataSet> filteredDataSets = new ArrayList<>(dataSets);
+		
+		Iterator<AbstractDataSet> iter = filteredDataSets.iterator();
+		while(iter.hasNext()) {
+			AbstractDataSet ds = iter.next();
+			boolean remove = true;
+			if(ds.containsAnyNode(selectedNodes))
+				remove = false;
+			else if(!distinctEdges && !selectedEdges.isEmpty())
+				remove = false;
+			else if(distinctEdges && ds.containsAnyEdge(selectedEdges))
+				remove = false;
 
-			Iterator<AbstractDataSet> iter = dataSets.iterator();
-			while(iter.hasNext()) {
-				AbstractDataSet ds = iter.next();
-				
-				boolean remove = true;
-				if(ds.containsAnyNode(selectedNodes))
-					remove = false;
-				else if(!distinctEdges && !selectedEdges.isEmpty())
-					remove = false;
-				else if(distinctEdges && ds.containsAnyEdge(selectedEdges))
-					remove = false;
-				
-				if(remove) {
-					iter.remove();
-				}
+			if(remove) {
+				iter.remove();
 			}
 		}
 
-		return dataSets;
+		return filteredDataSets;
 	}