diff options
Diffstat (limited to 'src/jcgp/gui/GUI.java')
| -rw-r--r-- | src/jcgp/gui/GUI.java | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/jcgp/gui/GUI.java b/src/jcgp/gui/GUI.java index 7e7f385..0902b21 100644 --- a/src/jcgp/gui/GUI.java +++ b/src/jcgp/gui/GUI.java @@ -22,16 +22,16 @@ public class GUI extends Application { * (no hovering, clicking, dragging or any other form of interaction). */ public static final String NEUTRAL_COLOUR = "#FFFFFF"; public static final String HARD_HIGHLIGHT_COLOUR = "#5496FF"; - // 89AAD6 public static final String MEDIUM_HIGHLIGHT_COLOUR = "#75BAFF"; public static final String SOFT_HIGHLIGHT_COLOUR = "#C7DFFF"; - // BDFFC2 - public static final String GOOD_SELECTION_COLOUR = "#38C25B"; - // FBFFB8 - public static final String NEUTRAL_SELECTION_COLOUR = "#EDEB72"; - // FF9C9C - public static final String BAD_SELECTION_COLOUR = "#F53D3D"; + public static final String GOOD_SELECTION_COLOUR = "#38C25B"; + public static final String NEUTRAL_SELECTION_COLOUR = "#FFEF73"; + public static final String BAD_SELECTION_COLOUR = "#FF5C5C"; + + public static final String INVALID_PARAMETER_STYLE = "-fx-border-color: C9C9C9; -fx-border-radius: 2; -fx-padding: 0; -fx-background-color: " + BAD_SELECTION_COLOUR; + public static final String WARNING_PARAMETER_STYLE = "-fx-border-color: C9C9C9; -fx-border-radius: 2; -fx-padding: 0; -fx-background-color: " + NEUTRAL_SELECTION_COLOUR; + public static final String VALID_PARAMETER_STYLE = "-fx-border-color: C9C9C9; -fx-border-radius: 2; -fx-padding: 0; -fx-background-color: " + NEUTRAL_COLOUR; /* Sizes and distances */ public static final double RESIZE_MARGIN = 5.0; @@ -71,7 +71,7 @@ public class GUI extends Application { public static void main(String[] args) { cgp = new JCGP(); - resources = cgp.getResources(); + resources = cgp.getResources(); launch(); } @@ -166,17 +166,20 @@ public class GUI extends Application { public void disableChromosomePanes(boolean value) { chromosomeTabs.setDisable(value); } + + public void disable(boolean value) { + chromosomeTabs.setDisable(value); + settings.disableSettings(value); + } public void playPause() { if (!evolving) { - settings.disableSettings(true); - disableChromosomePanes(true); + disable(true); unlockOutputs(); evolving = true; cgpService.restart(); } else { - settings.disableSettings(false); - disableChromosomePanes(false); + disable(false); updateNodeGrids(); evolving = false; cgpService.cancel(); @@ -201,11 +204,8 @@ public class GUI extends Application { } } - public void resetCGP() { - cgp.remakePopulation(); + public void reset() { + cgp.reset(); makeChromosomeTabPane(); - - resources.set("currentGen", 1); - resources.set("currentRun", 1); } } |