From ae1621875d844739a84e2f74c322587c8ddef986 Mon Sep 17 00:00:00 2001 From: hugh5 Date: Thu, 24 Nov 2022 04:29:14 +1000 Subject: [PATCH] fixed array not drawing properly --- src/MainWindow.java | 2 +- src/SortingPanel.java | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/MainWindow.java b/src/MainWindow.java index 6db4ffb..8a24d46 100644 --- a/src/MainWindow.java +++ b/src/MainWindow.java @@ -11,7 +11,7 @@ public class MainWindow implements ActionListener, ChangeListener { private final JFrame window; private MenuPanel menuPanel; private SortingPanel sortingPanel; - public static final int MAX = 383; + public static final int MAX = 256; public static final int MIN = 1; private final Logger logger = Logger.getLogger(this.getClass().getName()); diff --git a/src/SortingPanel.java b/src/SortingPanel.java index 5128516..be4e445 100644 --- a/src/SortingPanel.java +++ b/src/SortingPanel.java @@ -27,15 +27,17 @@ public SortingPanel() { } public void paint(Graphics g) { - int y = getHeight() - 20; int scalar = getHeight() / max; int width = Math.min(getWidth() / array.length, 100); g.setFont(new Font("Monospaced", Font.PLAIN, 16)); for (int i = 0; i < array.length; i++) { - g.setColor(map.get(i)); - g.fillRect(i * width, y, width - 1, -scalar * array[i]); g.setColor(Color.BLACK); -// g.drawString(String.valueOf(array[i]), i * width + width / 4, y + 15); + g.setColor(map.get(i)); + g.fillRect(i * width, getHeight() - scalar * array[i], width - 1, scalar * array[i]); + if (width >= 24) { + g.setColor(Color.WHITE); + g.drawString(String.valueOf(array[i]), i * width + width / 4, getHeight() - 5); + } } }