Enhance the visuals

Author: Hopson97

src/main/java/sortVisualiser/ArrayCanvas.java

@@ -1,37 +1,36 @@
 package sortVisualiser;
 
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
 import java.util.Random;
+import javax.swing.JPanel;
 import static util.Sleep.sleepFor;
 
 /**
  * The array that can be sorted
  * @author mhops
  */
-public class SortArray {
-    private final ArrayCanvas arrayVisualiser;
+public class SortArray extends JPanel {
+    public static final int WIN_WIDTH = 1280;
+    public static final int WIN_HEIGHT = 720;
+    private static final int BAR_WIDTH = 8;
+    private static final int NUM_BARS = WIN_WIDTH / BAR_WIDTH;
     private int[] array;
+    private int[] accessColourMod;
 
-    public SortArray(int len, ArrayCanvas arrayVisualiser) {
-        array = new int[len];
-        for (int i = 0; i < len; i++) {
+    public SortArray() {
+        setBackground(Color.darkGray);
+        array = new int[NUM_BARS];
+        accessColourMod = new int[NUM_BARS];
+        for (int i = 0; i < NUM_BARS; i++) {
             array[i] = i;
-        }
-        shuffleArray();
-        
-        this.arrayVisualiser = arrayVisualiser;
-    }
-    
-    private void shuffleArray() {
-        Random rng = new Random();
-        for (int i = 0; i < array.length; i++) {
-            int swapWithIndex = rng.nextInt(array.length - 1);
-            int temp = array[i];
-            array[i] = array[swapWithIndex];
-            array[swapWithIndex] = temp;
+            accessColourMod[i] = 0;
         }
     }
 
-    public int size() {
+    public int arraySize() {
         return array.length;
     }
 
@@ -43,7 +42,50 @@ public void swapUpdate(int firstIndex, int secondIndex) {
         int temp = array[firstIndex];
         array[firstIndex] = array[secondIndex];
         array[secondIndex] = temp;
-        arrayVisualiser.repaint();
+        
+        accessColourMod[firstIndex] = 100;
+        accessColourMod[secondIndex] = 100;
+        repaint();
         sleepFor(10000);
     }
+    
+    /**
+     * Gets the canvas size
+     * @return size
+     */
+    @Override
+    public Dimension getPreferredSize() {
+        return new Dimension(WIN_WIDTH, WIN_HEIGHT);
+    }
+    
+    public void resetColours() {
+        for (int i = 0; i < NUM_BARS; i++) {
+            accessColourMod[i] = 0;
+        }
+        repaint();
+    }
+    
+    /**
+     * Draws the array
+     * @param g The graphics device for drawing
+     */
+    @Override
+    public void paintComponent(Graphics g) {
+        Graphics2D graphics = (Graphics2D)g;
+        super.paintComponent(graphics);
+       
+        graphics.setColor(Color.white);
+        for (int x = 0; x < NUM_BARS; x++) {
+            int height = getValue(x) * 3;
+            int xBegin = x + (BAR_WIDTH - 1) * x;
+            int yBegin = WIN_HEIGHT - height;
+            
+            int val = accessColourMod[x] * 2;
+            graphics.setColor(new Color(255, 255 - val, 255 - val));
+            graphics.fillRect(xBegin, yBegin, BAR_WIDTH, height);
+            if (accessColourMod[x] > 0) {
+                accessColourMod[x]-= 5;
+            }
+        }
+    }
 }

src/main/java/sortVisualiser/SortArray.java

@@ -1,15 +1,21 @@
 package sortVisualiser;
 
-import java.awt.Dimension;
+import java.util.ArrayList;
 import javax.swing.JFrame;
+import sortVisualiser.algorithms.BubbleSort;
+import sortVisualiser.algorithms.ISortAlgorithm;
+import sortVisualiser.algorithms.Shuffle;
+import static util.Sleep.sleepFor;
 
 /**
  * The main class for the sort visualiser GUI
  * @author Matt Hopson
  */
 public class SortVisualiser {
     private JFrame window;
-    private ArrayCanvas sortArray;
+    private SortArray sortArray;
+    
+    private ArrayList<ISortAlgorithm> sortQueue;
 
     /**
      * Creates the GUI
@@ -18,15 +24,26 @@ public SortVisualiser() {
         window = new JFrame("Sort Visualiser");
         window.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 
-        sortArray = new ArrayCanvas();
+        sortArray = new SortArray();
         window.add(sortArray);
         window.pack();
         window.setVisible(true);
 
-        sortArray.run();
+        sortQueue = new ArrayList<>();
+        sortQueue.add(new Shuffle());
+        sortQueue.add(new BubbleSort());
+    }
+    
+    public void run() {
+        for (ISortAlgorithm algorithm : sortQueue) {
+            algorithm.runSort(sortArray);
+            sortArray.resetColours();
+            sleepFor(2000000);
+        }
     }
 
     public static void main(String... args) {
         SortVisualiser sortVisualiser = new SortVisualiser();
+        sortVisualiser.run();
     }
 }

src/main/java/sortVisualiser/SortVisualiser.java

@@ -10,7 +10,7 @@ public class BubbleSort implements ISortAlgorithm
 {
     @Override
     public void runSort(SortArray array) {
-        int len = array.size();
+        int len = array.arraySize();
         for(int i = 0; i < len - 1; i++) {
             for (int j = 0; j < len - i - 1; j++) {
                 if (array.getValue(j) > array.getValue(j + 1)) {

src/main/java/sortVisualiser/algorithms/BubbleSort.java

@@ -0,0 +1,22 @@
+package sortVisualiser.algorithms;
+
+import java.util.Random;
+import sortVisualiser.SortArray;
+
+/**
+ *
+ * @author mhops
+ */
+public class Shuffle implements ISortAlgorithm
+{
+
+    @Override
+    public void runSort(SortArray array) {
+        Random rng = new Random();
+        for (int i = 0; i < array.arraySize(); i++) {
+            int swapWithIndex = rng.nextInt(array.arraySize() - 1);
+            array.swapUpdate(i, swapWithIndex);
+        }
+    }
+
+}