diff options
Diffstat (limited to 'src/jcgp/gui/population/GUIOutput.java')
| -rw-r--r-- | src/jcgp/gui/population/GUIOutput.java | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/src/jcgp/gui/population/GUIOutput.java b/src/jcgp/gui/population/GUIOutput.java index a3f5a28..d715138 100644 --- a/src/jcgp/gui/population/GUIOutput.java +++ b/src/jcgp/gui/population/GUIOutput.java @@ -12,6 +12,7 @@ import jcgp.backend.population.Input; import jcgp.backend.population.Node; import jcgp.backend.population.Output; import jcgp.gui.GUI; +import jcgp.gui.constants.Constants; public class GUIOutput extends GUIGene { @@ -25,14 +26,14 @@ public class GUIOutput extends GUIGene { this.output = output; this.sourceLine = line; - relocate(((gui.getExperiment().getResources().columns() + 1) * (2 * NODE_RADIUS + SPACING)) + NODE_RADIUS, - (output.getIndex() * (2 * NODE_RADIUS + SPACING)) + NODE_RADIUS); + relocate(((gui.getExperiment().getResources().columns() + 1) * (2 * Constants.NODE_RADIUS + Constants.SPACING)) + Constants.NODE_RADIUS, + (output.getIndex() * (2 * Constants.NODE_RADIUS + Constants.SPACING)) + Constants.NODE_RADIUS); // set the line ends correctly updateLines(); updateText(); - Circle socket = new Circle(-NODE_RADIUS, 0, SOCKET_RADIUS, Paint.valueOf("white")); + Circle socket = new Circle(-Constants.NODE_RADIUS, 0, Constants.SOCKET_RADIUS, Paint.valueOf("white")); socket.setId(String.valueOf(0)); socket.setStroke(Paint.valueOf("black")); @@ -193,32 +194,32 @@ public class GUIOutput extends GUIGene { case ACTIVE_HOVER: break; case INVALID_TARGET: - mainCircle.setFill(Paint.valueOf(GUI.BAD_SELECTION_COLOUR)); + mainCircle.setFill(Paint.valueOf(Constants.BAD_SELECTION_COLOUR)); break; case HOVER: - mainCircle.setFill(Paint.valueOf(GUI.MEDIUM_HIGHLIGHT_COLOUR)); + mainCircle.setFill(Paint.valueOf(Constants.MEDIUM_HIGHLIGHT_COLOUR)); sourceLine.setVisible(true); if (!isLocked()) { setConnectionStates(GUIGeneState.ACTIVE_HOVER); } break; case INDIRECT_HOVER: - mainCircle.setFill(Paint.valueOf(GUI.SOFT_HIGHLIGHT_COLOUR)); + mainCircle.setFill(Paint.valueOf(Constants.SOFT_HIGHLIGHT_COLOUR)); break; case NEUTRAL: - mainCircle.setFill(Paint.valueOf(GUI.NEUTRAL_COLOUR)); + mainCircle.setFill(Paint.valueOf(Constants.NEUTRAL_COLOUR)); sourceLine.setVisible(false); break; case NO_CHANGE_TARGET: - mainCircle.setFill(Paint.valueOf(GUI.NEUTRAL_SELECTION_COLOUR)); + mainCircle.setFill(Paint.valueOf(Constants.NEUTRAL_SELECTION_COLOUR)); break; case SOURCE: - mainCircle.setFill(Paint.valueOf(GUI.HARD_HIGHLIGHT_COLOUR)); + mainCircle.setFill(Paint.valueOf(Constants.HARD_HIGHLIGHT_COLOUR)); setConnectionStates(GUIGeneState.NEUTRAL); setConnectionStates(GUIGeneState.INDIRECT_HOVER); break; case VALID_TARGET: - mainCircle.setFill(Paint.valueOf(GUI.GOOD_SELECTION_COLOUR)); + mainCircle.setFill(Paint.valueOf(Constants.GOOD_SELECTION_COLOUR)); break; default: break; @@ -230,12 +231,12 @@ public class GUIOutput extends GUIGene { if (output.getSource() instanceof Node) { int row = ((Node) output.getSource()).getRow(), column = ((Node) output.getSource()).getColumn(); - sourceLine.setEndX(((column + 1) * (2 * NODE_RADIUS + SPACING)) + 2 * NODE_RADIUS); - sourceLine.setEndY((row * (2 * NODE_RADIUS + SPACING)) + NODE_RADIUS); + sourceLine.setEndX(((column + 1) * (2 * Constants.NODE_RADIUS + Constants.SPACING)) + 2 * Constants.NODE_RADIUS); + sourceLine.setEndY((row * (2 * Constants.NODE_RADIUS + Constants.SPACING)) + Constants.NODE_RADIUS); } else if (output.getSource() instanceof Input) { int inputIndex = ((Input) output.getSource()).getIndex(); - sourceLine.setEndX(2 * NODE_RADIUS); - sourceLine.setEndY(inputIndex * (2 * NODE_RADIUS + SPACING) + NODE_RADIUS); + sourceLine.setEndX(2 * Constants.NODE_RADIUS); + sourceLine.setEndY(inputIndex * (2 * Constants.NODE_RADIUS + Constants.SPACING) + Constants.NODE_RADIUS); } } @@ -287,7 +288,7 @@ public class GUIOutput extends GUIGene { @Override public void setConnectionLine(GUIGene gene) { - sourceLine.setEndX(gene.getLayoutX() + NODE_RADIUS); + sourceLine.setEndX(gene.getLayoutX() + Constants.NODE_RADIUS); sourceLine.setEndY(gene.getLayoutY()); } |