display works for higher values

Author: KonradMagiera

src/algorithm/Algorithm.java

@@ -18,13 +18,10 @@ public Algorithm(GuiController gui, List<Double> list) {
     }
 
     public void draw() {
-        Platform.runLater(new Runnable() {
-            @Override
-            public void run() {
-                gui.drawArray();
-                // write() is for testing
-                write();
-            }
+        Platform.runLater(() -> {
+            gui.drawArray();
+            // write() is for testing
+            // write();   
         });
         try {
             Thread.sleep(175);
@@ -68,11 +65,8 @@ protected Task<Void> createTask() {
             protected Void call() {
                 try {
                     sort();
-                    Platform.runLater(new Runnable() {
-                        @Override
-                        public void run() {
-                            unlock();
-                        }
+                    Platform.runLater(() -> {
+                        unlock();
                     });
                 } catch (Exception e) {
 

src/algorithm/QuickSort.java

@@ -5,25 +5,25 @@
 import java.util.List;
 import java.util.Stack;
 
-public class QuickSort extends Algorithm{
+public class QuickSort extends Algorithm {
 
     private final Stack<Integer> stack;
-    
+
     public QuickSort(GuiController gui, List<Double> list) {
         super(gui, list);
         stack = new Stack<>();
     }
-    
+
     @Override
     protected void sort() {
         sort(getList());
     }
-    
-    private void sort(List<Double> list){
-        if(list.size() > 1){
+
+    private void sort(List<Double> list) {
+        if (list.size() > 1) {
             stack.push(0);
-            stack.push(list.size() -1);
-            while(!stack.isEmpty()){
+            stack.push(list.size() - 1);
+            while (!stack.isEmpty()) {
                 int end = stack.pop();
                 int start = stack.pop();
                 int mid = partition(list, start, end);
@@ -38,7 +38,7 @@ private void sort(List<Double> list){
             }
         }
     }
-    
+
     private int partition(List<Double> list, int low, int high) {
         double pivot = list.get(high);
 
@@ -56,5 +56,5 @@ private int partition(List<Double> list, int low, int high) {
         Collections.swap(list, i + 1, high);
         draw();
         return i + 1;
-    }  
+    }
 }

src/graphics/GuiController.java

@@ -1,25 +1,6 @@
 package graphics;
 
-import algorithm.Algorithm;
-import algorithm.BitonicSort;
-import algorithm.BubbleSort;
-import algorithm.CoctailSort;
-import algorithm.CombSort;
-import algorithm.CycleSort;
-import algorithm.HeapSort;
-import algorithm.InsertionSort;
-import algorithm.IterativeQuickSort;
-import algorithm.RecursiveMergeSort;
-import algorithm.MergeSort;
-import algorithm.OddEvenSort;
-import algorithm.PancakeSort;
-import algorithm.QuickSort;
-import algorithm.RecursiveBubbleSort;
-import algorithm.RecursiveInsertionSort;
-import algorithm.RecursiveQuickSort;
-import algorithm.SelectionSort;
-import algorithm.ShellSort;
-import algorithm.StoogeSort;
+import algorithm.*;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
@@ -32,6 +13,7 @@
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
+import javafx.geometry.Pos;
 import javafx.scene.control.Button;
 import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.Label;
@@ -56,13 +38,13 @@ public class GuiController implements Initializable {
     private Button restoreB;
 
     private List<Double> list;
-    private int wid = 10;
-    private int hei = 10;
+    private double wid = 10;
+    private double hei = 10;
     private Stage stage;
     private FileChooser fileChooser;
     private Algorithm algorithm;
     private double min;
-    private final double multiplier = 1.1;
+    private final double multiplier = 1.5;
     private File openedFile;
 
     @Override
@@ -71,7 +53,8 @@ public void initialize(URL url, ResourceBundle rb) {
                 "Insertion sort", "Iterative quick sort", "Merge sort", "Odd-Even sort", "Pancake sort",
                 "Quick sort", "Recursive bubble sort", "Recursive insertion sort", "Recursive merge sort", "Recursive Quick sort",
                 "Selection sort", "Shell sort", "Stooge sort");
-//        sortingAlgorithm.getItems().addAll("Quick sort end", "Recursive Quick sort end");
+//        sortingAlgorithm.getItems().add("Quick sort");
+        sortingAlgorithm.setValue("Quick sort");
         startB.setDisable(true);
         list = new ArrayList<>();
     }
@@ -84,8 +67,8 @@ public void calculateSizeMultipliers() {
             } else {
                 min = Math.abs(min);
             }
-            wid = (int) (display.getWidth() / list.size());
-            hei = (int) (display.getHeight() / ((double) Collections.max(list) + multiplier * min));
+            wid =  display.getWidth() / list.size();
+            hei =  display.getHeight() / ((double) Collections.max(list) + multiplier * min);
         }
     }
 
@@ -100,8 +83,10 @@ public void drawArray() {
             display.getChildren().add(r);
             Label label = new Label(list.get(i).toString());
             label.setFont(new Font(16));
-            label.setLayoutX(wid * i + wid / 3);
+            label.setLayoutX(wid * i);
             label.setLayoutY((display.getHeight()) - (hei * (list.get(i) + multiplier * min)) / 2);
+            label.setPrefWidth(wid);
+            label.setAlignment(Pos.CENTER);
             display.getChildren().add(label);
         }
     }
@@ -155,7 +140,7 @@ private void loadFromFile() {
             }
         }
     }
-
+    
     @FXML
     private void loadArray(ActionEvent event) {
         // create fileChooser to open txt file