Unselect previously selected gene when selecting new gene.

Author: mathieupost

resources/stylesheet.css

@@ -30,4 +30,8 @@ node.BOX {
 
 node.FixWrapper {
     visibility-mode: hidden;
+}
+
+node.SELECTED {
+    fill-color: red;
 }

src/main/java/tudelft/ti2806/pl3/Application.java

@@ -162,7 +162,7 @@ public void makeGraphFromFiles() {
 		try {
 			File nodeFile = FileSelector.selectFile(Constants.DIALOG_SELECT_NODE_FILE, this, Constants.EXTENSION_NODE);
 			File edgeFile = FileSelector.getOtherExtension(nodeFile,
-					Constants.EXTENSION_EDGE, Constants.EXTENSION_NODE);
+					Constants.EXTENSION_NODE, Constants.EXTENSION_EDGE);
 			makeGraph(nodeFile, edgeFile, null, null);
 		} catch (FileSelectorException exception) {
 			if (DialogUtil.confirm(Constants.DIALOG_TITLE_ERROR, Constants.DIALOG_FILE_NOT_FOUND)) {

src/main/java/tudelft/ti2806/pl3/visualization/GraphView.java

@@ -12,6 +12,7 @@
 import tudelft.ti2806.pl3.controls.MouseManager;
 import tudelft.ti2806.pl3.data.gene.Gene;
 import tudelft.ti2806.pl3.data.graph.DataNode;
+import tudelft.ti2806.pl3.data.wrapper.FixWrapper;
 import tudelft.ti2806.pl3.data.wrapper.Wrapper;
 import tudelft.ti2806.pl3.data.wrapper.WrapperClone;
 import tudelft.ti2806.pl3.exception.EdgeZeroWeightException;
@@ -285,13 +286,16 @@ public void centerOnNode(DataNode node, Gene selected) throws NodeNotFoundExcept
 	 */
 	private void colorGene() {
 		if (selectedGene != null) {
+			String fixWrapper = FixWrapper.class.getSimpleName();
 			for (Node graphNode : graph.getNodeSet()) {
-				graphNode.removeAttribute("ui.style");
+				if (!fixWrapper.equals(graphNode.getAttribute("ui.class"))) {
+					graphNode.removeAttribute("ui.class");
+				}
 				WrapperClone wrapper = graphNode.getAttribute("node", WrapperClone.class);
 				wrapper.getLabels().stream()
 						.filter(label -> label.getText().equals(selectedGene.getName()))
-						.forEach(label -> graphNode.addAttribute("ui.style",
-								"fill-color: red;"));
+						.forEach(label -> graphNode.addAttribute("ui.class",
+								"SELECTED"));
 			}
 		}
 	}