Merge pull request #285 from ProgrammingLife2016/feat/node-to-tree-highlight

Node selection highlightts tree

Author: Pathemeous

PL2/PL2-gui/src/main/java/nl/tudelft/pl2016gr2/gui/view/graph/ViewGraphNodeEllipse.java

@@ -16,7 +16,7 @@
  */
 public class ViewGraphNodeEllipse extends Ellipse implements IViewGraphNode {
 
-  private final GraphNode dataNode;
+  public final GraphNode dataNode;
 
   /**
    * Construct a node circle.

PL2/PL2-gui/src/main/java/nl/tudelft/pl2016gr2/gui/view/graph/ViewGraphNodeRectangle.java

@@ -20,7 +20,7 @@ public class ViewGraphNodeRectangle extends Rectangle implements IViewGraphNode
 
   private final DoubleProperty centerXProperty = new SimpleDoubleProperty();
   private final DoubleProperty centerYProperty = new SimpleDoubleProperty();
-  private final GraphNode dataNode;
+  public final GraphNode dataNode;
 
   /**
    * Constructor.

PL2/PL2-gui/src/main/java/nl/tudelft/pl2016gr2/gui/view/tree/TreeNodeCircle.java

@@ -16,11 +16,14 @@
 import javafx.scene.shape.Rectangle;
 import javafx.util.Duration;
 import nl.tudelft.pl2016gr2.gui.view.events.AnimationEvent;
+import nl.tudelft.pl2016gr2.gui.view.graph.IViewGraphNode;
+import nl.tudelft.pl2016gr2.gui.view.graph.ViewGraphNodeEllipse;
 import nl.tudelft.pl2016gr2.gui.view.selection.ISelectable;
 import nl.tudelft.pl2016gr2.gui.view.selection.ISelectionInfo;
 import nl.tudelft.pl2016gr2.gui.view.selection.TreeLeafDescription;
 import nl.tudelft.pl2016gr2.gui.view.selection.TreeNodeDescription;
 import nl.tudelft.pl2016gr2.model.GenomeMap;
+import nl.tudelft.pl2016gr2.model.graph.nodes.GraphNode;
 import nl.tudelft.pl2016gr2.model.phylogenetictree.IPhylogeneticTreeNode;
 import nl.tudelft.pl2016gr2.thirdparty.testing.utility.TestId;
 

PL2/PL2-gui/src/main/java/nl/tudelft/pl2016gr2/gui/view/tree/TreePaneController.java

@@ -12,9 +12,12 @@
 import javafx.scene.layout.Pane;
 import nl.tudelft.pl2016gr2.gui.view.MetadataPropertyMap;
 import nl.tudelft.pl2016gr2.gui.view.graph.GraphPaneController;
+import nl.tudelft.pl2016gr2.gui.view.graph.ViewGraphNodeEllipse;
+import nl.tudelft.pl2016gr2.gui.view.graph.ViewGraphNodeRectangle;
 import nl.tudelft.pl2016gr2.gui.view.selection.ISelectable;
 import nl.tudelft.pl2016gr2.gui.view.selection.SelectionManager;
 import nl.tudelft.pl2016gr2.gui.view.tree.heatmap.HeatmapManager;
+import nl.tudelft.pl2016gr2.model.graph.nodes.GraphNode;
 import nl.tudelft.pl2016gr2.model.phylogenetictree.IPhylogeneticTreeNode;
 import nl.tudelft.pl2016gr2.model.phylogenetictree.IPhylogeneticTreeRoot;
 import nl.tudelft.pl2016gr2.thirdparty.testing.utility.TestId;
@@ -91,6 +94,19 @@ public void setup(SelectionManager selectionManager, GraphPaneController graphPa
     this.selectionManager = selectionManager;
     this.graphPaneController = graphPaneController;
     selectionManager.addListener((observable, oldValue, newValue) -> {
+      {
+        GraphNode dataNode = null;
+        if (newValue instanceof ViewGraphNodeEllipse) {
+          dataNode = ((ViewGraphNodeEllipse) newValue).dataNode;
+        } else if (newValue instanceof ViewGraphNodeRectangle) {
+          dataNode = ((ViewGraphNodeRectangle) newValue).dataNode;
+        }
+        if (dataNode != null) {
+          selectionManager.getSearchBoxSelectedGenomes().setAll(dataNode.getGenomes());
+        } else {
+          selectionManager.getSearchBoxSelectedGenomes().clear();
+        }
+      }
       checkSelectedForNodeAndLeaves(currentRoot);
     });
     initializeTopGraphSelectionManger();