From 45627a40b29ac713110b1ef4ac5c7c1cf4ecb74a Mon Sep 17 00:00:00 2001
From: chehaoc <chehao.chang@student.unimelb.edu.au>
Date: Wed, 23 Oct 2019 18:47:49 +1100
Subject: [PATCH] stroke description changed & eraser bug fixed
---
src/GUI/DrawingArea.java | 2 +-
src/GUI/PaintGUI.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/GUI/DrawingArea.java b/src/GUI/DrawingArea.java
index 6b62358..9e80b51 100644
--- a/src/GUI/DrawingArea.java
+++ b/src/GUI/DrawingArea.java
@@ -357,7 +357,7 @@ public class DrawingArea extends JPanel implements MouseMotionListener, MouseLis
/// Eraser is continuously drawing "small white circle" from current point to previous point ///
case ERASE:
- ((Ellipse2D) drawing).setFrame(currentPoint.getX(), currentPoint.getY(), 10, 10);
+ ((Ellipse2D) drawing).setFrame(currentPoint.getX(), currentPoint.getY(), eraserSize, eraserSize);
g2.setColor(Color.WHITE);
g2.fill(drawing);
g2.draw(drawing);
diff --git a/src/GUI/PaintGUI.java b/src/GUI/PaintGUI.java
index 385ce53..0286c63 100644
--- a/src/GUI/PaintGUI.java
+++ b/src/GUI/PaintGUI.java
@@ -21,7 +21,7 @@ public class PaintGUI extends JPanel {
DrawingArea drawingArea;
String[] shapes = {"Freehand", "Line", "Circle", "Rectangle", "Oval", "Eraser", "Text"};
- String[] strokes = {"Small", "Medium", "Large"};
+ String[] strokes = {"Thin", "Medium", "Thick"};
String[] eraserSizes = {"Small", "Medium", "Large"};
JFrame frame;
JButton clearBtn, newBtn, openBtn, saveBtn, saveAsBtn;
@@ -302,13 +302,13 @@ public class PaintGUI extends JPanel {
String strokeChosen = (String) strokeOptions.getSelectedItem();
switch (strokeChosen) {
- case "Small":
+ case "Thin":
drawingArea.setStroke(3);
break;
case "Medium":
drawingArea.setStroke(6);
break;
- case "Large":
+ case "Thick":
drawingArea.setStroke(10);
break;
}
--
GitLab