Node grid all done and apparently stable.

1 files changed, 10 insertions, 12 deletions

diff --git a/src/jcgp/GUI.java b/src/jcgp/GUI.java
index 284f9ae..669a4e2 100644
--- a/src/jcgp/GUI.java
+++ b/src/jcgp/GUI.java
@@ -8,26 +8,26 @@ import javafx.scene.control.Tab;
 import javafx.scene.control.TabPane;
 import javafx.scene.control.TabPane.TabClosingPolicy;
 import javafx.scene.input.MouseDragEvent;
+import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.BorderPane;
 import javafx.stage.Stage;
-import jcgp.CGP.Resources;
+import jcgp.JCGP.Resources;
 import jcgp.gui.Console;
 import jcgp.gui.SettingsPane;
 import jcgp.gui.population.ChromosomePane;
 import jcgp.gui.population.GUIGene;
-import jcgp.gui.population.GUINode;
-import jcgp.gui.population.GUIOutput;
 
 public class GUI extends Application {
 	
 	public static final String NEUTRAL_COLOUR = "#FFFFFF";
-	public static final String HARD_HIGHLIGHT_COLOUR = "#89AAD6";
+	public static final String HARD_HIGHLIGHT_COLOUR = "#5496FF";
+	public static final String MEDIUM_HIGHLIGHT_COLOUR = "#89AAD6";
 	public static final String SOFT_HIGHLIGHT_COLOUR = "#C7DFFF";
 	public static final String GOOD_SELECTION_COLOUR = "#BDFFC2";
 	public static final String NEUTRAL_SELECTION_COLOUR = "#FBFFB8";
 	public static final String BAD_SELECTION_COLOUR = "#FF9C9C";
 	
-	private static CGP cgp;
+	private static JCGP cgp;
 	public static Resources resources;
 	
 	
@@ -41,7 +41,7 @@ public class GUI extends Application {
 
 	public static void main(String[] args) {
 		
-		cgp = new CGP();
+		cgp = new JCGP();
 		resources = cgp.getResources();
 		
 		launch();
@@ -62,7 +62,7 @@ public class GUI extends Application {
 		chromosomes = new ChromosomePane[(int) cgp.getResources().get("popSize")];
 		Tab tab;
 		for (int i = 0; i < chromosomes.length; i++) {
-			chromosomes[i] = new ChromosomePane(cgp.getPopulation().getChromosome(i), cgp.getResources());
+			chromosomes[i] = new ChromosomePane(cgp.getPopulation().getChromosome(i));
 			tab = new Tab("Chr " + i);
 			tab.setContent(chromosomes[i]);
 			mainPane.getTabs().add(tab);
@@ -92,14 +92,12 @@ public class GUI extends Application {
 				}
 				event.consume();
 				((GUIGene) event.getGestureSource()).resetState();
-				if (event.getGestureSource() instanceof GUINode) {
-					((GUINode) event.getGestureSource()).updateLines();
-				} else if (event.getGestureSource() instanceof GUIOutput) {
-					((GUIOutput) event.getGestureSource()).updateLine();
-				}
+				((GUIGene) event.getGestureSource()).updateLines();
+				
 			}
 		});
 		
+	
 		primaryStage.setMinHeight(600);
 		primaryStage.setMinWidth(800);