From 9cd8db4b0cb0e5f714dc458b20abfa2931634021 Mon Sep 17 00:00:00 2001
From: Kelly Zhang <kz49@duke.edu>
Date: Sat, 30 Sep 2017 14:25:30 -0400
Subject: [PATCH] added rps button, not in correct place though...

---
 images/rps.png                       | Bin 0 -> 1620 bytes
 src/cellsociety_UIUX/MenuWindow.java |  50 ++++++++++++++++-----------
 src/main.java                        |   1 +
 3 files changed, 30 insertions(+), 21 deletions(-)
 create mode 100644 images/rps.png

diff --git a/images/rps.png b/images/rps.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e747dd74a1958f4afdd3074cace61a97139b3e5
GIT binary patch
literal 1620
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
Sm4Pb&0000<MNUMnLSTZT3KhNp

literal 0
HcmV?d00001

diff --git a/src/cellsociety_UIUX/MenuWindow.java b/src/cellsociety_UIUX/MenuWindow.java
index 1d18e67..972b310 100644
--- a/src/cellsociety_UIUX/MenuWindow.java
+++ b/src/cellsociety_UIUX/MenuWindow.java
@@ -22,23 +22,23 @@ public class MenuWindow extends Window {
 	private static final String FIRE_TAG = "Fire";
 	private static final String PREDATORPREY_TAG = "PredatorPrey";
 	private static final String SEGREGATION_TAG = "Segregation";
+	private static final String RPS_TAG = "RockPaperScissors";
+
 	private static final String GAMEOFLIFE_PNG = "gameoflife.png";
 	private static final String FIRE_PNG = "fire.png";
 	private static final String WATOR_PNG = "wator.png";
 	private static final String SEGREGATION_PNG = "segregation.png";
+	private static final String RPS_PNG = "rps.png";
 	private static final double WIDTH = 1000;
 	private static final double HEIGHT = 500;
-	
+
 	private static final int BUTTONOFFSET = 50;
+	private static final int BUTTONS_PER_LINE = 4;
 	private List<Button> buttons;
-//	private Button newSimButton;
-	private double buttonPadding;
 
-//	private Stage simStage = new Stage();
-//	private boolean newSim = true;
 	private CellManager simChoice;
 	private Driver simDriver;
-	
+
 	public MenuWindow(Stage s) {
 		super(s);
 		simChoice = null;
@@ -52,7 +52,7 @@ public void setupScene() {
 		addButtons();
 		addTitle();
 	}
-	
+
 	protected void setupSceneDimensions() {
 		myScene = new Scene(myRoot, WIDTH, HEIGHT);
 	}
@@ -81,14 +81,14 @@ public void chooseSim() { //http://www.java2s.com/Code/Java/JavaFX/AddClickactio
 					//System.out.println(file);
 				}
 			});
-			
+
 		}
 	}
-	
+
 	public void resetMenu() {
 		simChoice = null;
 	}
-	
+
 	private CellManager getSimFromFile(Button buttonPressed) {
 		String simFileString = buttonPressed.getAccessibleText();
 		simFileString += ".xml";
@@ -98,35 +98,43 @@ private CellManager getSimFromFile(Button buttonPressed) {
 		parser.buttonChooseFile(simFile);
 		return parser.getSimulation();
 	}
-	
+
 	private void addButtons() { //https://stackoverflow.com/questions/40883858/how-to-evenly-distribute-elements-of-a-javafx-vbox
 		//http://docs.oracle.com/javafx/2/ui_controls/button.htm
 		Button segregationButton = createMenuButton(SEGREGATION_PNG, SEGREGATION_TAG);
 		Button watorButton = createMenuButton(WATOR_PNG, PREDATORPREY_TAG);
 		Button fireButton = createMenuButton(FIRE_PNG, FIRE_TAG);
 		Button gameoflifeButton = createMenuButton(GAMEOFLIFE_PNG, GAMEOFLIFE_TAG);
-		
-		buttons = new ArrayList<Button>(Arrays.asList(segregationButton, watorButton, fireButton, gameoflifeButton));
-		buttonPadding = (WIDTH - BUTTONOFFSET*2 - buttons.get(0).getWidth())/buttons.size();
-		
-		for (int i = 0; i < buttons.size(); i++) {
-			Button button = buttons.get(i);
-			setMenuButtonLayout(button, BUTTONOFFSET + buttons.get(i).getMaxWidth() + i*buttonPadding, HEIGHT*2/3);
+		Button rpsButton = createMenuButton(RPS_PNG, RPS_TAG);
+
+		buttons = new ArrayList<Button>(Arrays.asList(segregationButton, watorButton, fireButton, gameoflifeButton, rpsButton));
+		double buttonXPadding = (WIDTH - BUTTONOFFSET*2 - buttons.get(0).getWidth())/BUTTONS_PER_LINE;
+		double buttonYPadding = (HEIGHT/2 - BUTTONOFFSET - buttons.get(0).getHeight()*2)/BUTTONS_PER_LINE;
+
+		int line = 0;
+		while (line <= Math.floor(buttons.size()/BUTTONS_PER_LINE)) {
+			for (int i = line; i < line + BUTTONS_PER_LINE; i++) {
+				if (line*BUTTONS_PER_LINE + i < buttons.size()) {
+					Button button = buttons.get(line*BUTTONS_PER_LINE + i);
+					setMenuButtonLayout(button, BUTTONOFFSET + button.getMaxWidth() + i*buttonXPadding, HEIGHT/2 + line*buttonYPadding);
+				}
+			}
+			line++;
 		}
 		myRoot.getChildren().addAll(buttons);
 	}
-	
+
 	private void setMenuButtonLayout(Button button, Double x, Double y) {
 		button.setLayoutX(x);
 		button.setLayoutY(y);
 	}
-	
+
 	private Button createMenuButton(String imageName, String buttonText) {
 		Image buttonImage = new Image(getClass().getClassLoader().getResourceAsStream(imageName));
 		Button simButton = new Button();
 		simButton.setGraphic(new ImageView(buttonImage));
 		simButton.setAccessibleText(buttonText);
-		
+
 		return simButton;
 	}
 
diff --git a/src/main.java b/src/main.java
index 91e455f..b6cd182 100644
--- a/src/main.java
+++ b/src/main.java
@@ -35,6 +35,7 @@ public class main extends Application {
 	 */
 	@Override
 	public void start(Stage stage) {
+		//TODO move this stuff into MenuWindow?
 		menuStage = stage;
 		menuStage.setTitle(MENUTITLE);
 		menuWindow = new MenuWindow(menuStage);