Fixed #15

Now have 3 different sizes(4k, 1080p, <1080p), each having their own array size options

Author: dlarocque

src/com/example/algorithmvisualizer/ArrDisplay.java

@@ -54,7 +54,7 @@ public ArrDisplay(AlgVisualizer algVisualizer, ContentWindow frame) {
 	public void paintComponent(Graphics g) {
 		Graphics2D graphics2d = (Graphics2D) g;
 		graphics2d.setColor(Color.DARK_GRAY);
-		graphics2d.fillRect(0, 0, frame.getWidth(), frame.getArrDisplayHeight());
+		graphics2d.fillRect(0, 0, frame.getArrDisplayWidth(), frame.getArrDisplayHeight());
 		if (algVisualizer.getSort().equals("Not Sorting") || isComplete) {
 			swappedIndex1 = -1;
 			swappedIndex2 = -1;
@@ -65,7 +65,7 @@ public void paintComponent(Graphics g) {
 		}
 		// Iterate through the array and drawn every index
 		for (int i = 0; i < arr.length; i++) {
-			int width = (int) (frame.getWidth() / (double) arr.length);
+			int width = (int) (frame.getArrDisplayWidth() / (double) arr.length);
 			int height = arr[i] * (frame.getArrDisplayHeight() / arr.length);
 			int x = i * width;
 			int y = frame.getArrDisplayHeight() - height;

src/com/example/algorithmvisualizer/ContentWindow.java

@@ -3,6 +3,8 @@
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
+import java.awt.Toolkit;
+
 import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JFrame;
@@ -17,8 +19,10 @@
 public class ContentWindow extends JFrame {
 
 	private static final long serialVersionUID = 1L;
-	private int contentWidth = 900;
-	private int arrDisplayHeight = 900;
+	private int arrDisplayHeight;
+	private int arrDisplayWidth;
+	private int contentWidth;
+	private int contentHeight;
 	private AlgVisualizer algVisualizer;
 	private JPanel arrPanel;
 	private ArrDisplay arrDisplay;
@@ -34,29 +38,54 @@ public class ContentWindow extends JFrame {
 	private JLabel performanceLabel;
 
 	public ContentWindow(AlgVisualizer algVisualizer) {
-		super("Algorithm Visualizer");	// Set the name of the frame
+		super("Algorithm Visualizer"); // Set the name of the frame
 		this.algVisualizer = algVisualizer;
 		initComponents(); // initialize the components of the frame
-		setFrame();		  // Set up the frame and add all of the initialized components
+		setFrame(); // Set up the frame and add all of the initialized components
 	}
 
 	/*
-	 * Initializes all of the components that will be in this frame.
-	 * Add the action / change listeners and set their colors.
+	 * Initializes all of the components that will be in this frame. Add the action
+	 * / change listeners and set their colors.
 	 */
 	public void initComponents() {
 
+		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+		double screenWidth = screenSize.getWidth();
+		double screenHeight = screenSize.getHeight();
+		String[] sizeOptions;
+		
+		if (screenHeight > 1080.0) { // 4k
+			arrDisplayHeight = 1000;
+			contentWidth = arrDisplayHeight;
+			sizeOptions = new String[] { "10", "50", "100", "250", "500", "1000" };
+		} else if (screenHeight < 1080.0) { // too small for original dimensions
+			arrDisplayHeight = 500;
+			contentWidth = arrDisplayHeight + 400;
+			sizeOptions = new String[] { "10", "50", "100", "250", "500" };
+		} else { // Original dimensions
+			arrDisplayHeight = 900;
+			contentWidth = arrDisplayHeight;
+			sizeOptions = new String[] { "10", "50", "100", "300", "450", "900" };
+		}
+
+		contentHeight = arrDisplayHeight + 110;
+		arrDisplayWidth = arrDisplayHeight;
+		algVisualizer.setSizeOptions(sizeOptions);
+
 		arrDisplay = new ArrDisplay(algVisualizer, this);
 		arrDisplay.setArr(algVisualizer.getArr());
-		arrDisplay.setPreferredSize(new Dimension(contentWidth, arrDisplayHeight));
+		arrDisplay.setPreferredSize(new Dimension(arrDisplayWidth, arrDisplayHeight));
 
 		// Panels in the frame that will hold all components.
 		// JPanels use the flowLayout to manage their components automatically.
 		buttonPanel = new JPanel();
 		buttonPanel.setBackground(Color.DARK_GRAY);
 
 		arrPanel = new JPanel();
+		arrPanel.setBackground(Color.DARK_GRAY);
 		arrPanel.add(arrDisplay);
+		arrDisplay.setAlignmentX(0);
 
 		// Initialize all components and add action listeners
 		resetButton = new JButton("Reset");
@@ -92,7 +121,8 @@ public void initComponents() {
 				algVisualizer.getInitFPS());
 		FPSslider.addChangeListener(algVisualizer);
 		FPSslider.setBackground(Color.DARK_GRAY);
-
+		//FPSslider.setPreferredSize(new Dimension(75,25));
+		
 		performanceLabel = new JLabel();
 		performanceLabel.setHorizontalAlignment(SwingConstants.CENTER);
 	}
@@ -110,7 +140,8 @@ public void setFrame() { // Add JButtons / components to button panel
 		buttonPanel.add(sizeChanger);
 		buttonPanel.add(FPSslider);
 		// Initialize and make the frame visible
-		setPreferredSize(new Dimension(contentWidth, arrDisplayHeight + 105)); // 105 is the height of the performance label and the button panel
+		setPreferredSize(new Dimension(contentWidth, contentHeight)); // 105 is the height of the performance label and
+																		// the button panel
 		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 		setResizable(false); // Cannot be resizable, causes visual issues
 		add(buttonPanel, BorderLayout.PAGE_START); // Button panel added to the top of the frame
@@ -138,13 +169,22 @@ public ArrDisplay getArrDisplay() {
 		return arrDisplay;
 	}
 
-	public int getWidth() {
+	public int getContentWidth() {
 		return contentWidth;
 	}
-
+	
+	public int getContentHeight() {
+		return contentWidth;
+	}
+	
+	public int getArrDisplayWidth() {
+		return arrDisplayHeight;
+	}
+	
 	public int getArrDisplayHeight() {
 		return arrDisplayHeight;
 	}
+	
 
 	public JButton getBubbleButton() {
 		return bubbleButton;