Replace DrawingArea.java

src/client/DrawingArea.java

+package client;
+
 import javax.imageio.ImageIO;
 import javax.swing.*;
 import java.awt.*;
@@ -15,7 +17,7 @@ import java.io.IOException;
 public class DrawingArea extends JPanel {
 
 /// enum for all different mode ///
-    enum Mode { FREEHAND, LINE, CIRCLE, RECTANGLE, OVAL, ERASE }
+    enum Mode { FREEHAND, LINE, CIRCLE, RECTANGLE, OVAL, ERASE, TEXT }
 
 /// Canvas size parameter ///
     private final static int AREA_WIDTH = 600;
@@ -33,6 +35,10 @@ public class DrawingArea extends JPanel {
 /// Default mode and color ///
     private Color shapeColor = new Color(0, 0, 0);
     private Mode currentMode = Mode.FREEHAND;
+    private Stroke lineStroke = new BasicStroke(3);
+    private int eraserSize = 10;
+    private int textSize = 60;
+    private String textString = "Test";
 
 /// Shape to be drawn on the canvas ///
     private Shape drawing;
@@ -79,6 +85,42 @@ public class DrawingArea extends JPanel {
 
                         drawing = new Rectangle2D.Double();
                         break;
+
+                    case TEXT:
+
+
+                        g2.setFont(new Font("TimesRoman", Font.PLAIN, textSize));
+                        g2.drawString(textString, startPoint.x, startPoint.y);
+
+
+
+//                        FontRenderContext frc = g2.getFontRenderContext();
+//                        Font f = new Font("Helvetica", Font.PLAIN, textSize);
+//                        TextLayout textTl = new TextLayout(textString, f, frc);
+////                        AffineTransform transform = new AffineTransform();
+//                        drawing = textTl.getOutline(null);
+////                        transform = g2.getTransform();
+////                        transform.translate(startPoint.x, startPoint.y);
+////                        g2.transform(transform);
+////                        g2.fill(drawing);
+
+//                        Font f = getFont().deriveFont(Font.BOLD, 70);
+//                        GlyphVector v = f.createGlyphVector(getFontMetrics(f).getFontRenderContext(), "Hello");
+//                        v.setGlyphPosition(0, startPoint);
+//                        v.setGlyphPosition(1, startPoint);
+//                        v.setGlyphPosition(2, startPoint);
+//                        v.setGlyphPosition(3, startPoint);
+//                        v.setGlyphPosition(4, startPoint);
+
+//                        drawing = v.getOutline();
+//                        drawing.
+//                        g2.setPaint(Color.BLUE);
+//                        g2.draw(drawing);
+
+                        break;
+
+
+
                 }
             }
         });
@@ -101,6 +143,7 @@ public class DrawingArea extends JPanel {
 
                         ((Line2D) drawing).setLine(currentPoint, previousPoint);
                         g2.setColor(shapeColor);
+                        g2.setStroke(lineStroke);
                         g2.draw(drawing);
                         previousPoint = currentPoint;
                         break;
@@ -114,7 +157,7 @@ public class DrawingArea extends JPanel {
 /// 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);
@@ -139,6 +182,17 @@ public class DrawingArea extends JPanel {
 
                         ((Rectangle2D) drawing).setFrame(x, y, width, height);
                         break;
+
+                    case TEXT:
+
+
+
+                        break;
+
+//                        AffineTransform transform = new AffineTransform();
+//                        transform.translate(currentPoint.x, currentPoint.y);
+//                        g2.transform(transform);
+//                        g2.fill(drawing);
                 }
 
                 repaint();
@@ -277,70 +331,100 @@ public class DrawingArea extends JPanel {
         currentMode = Mode.ERASE;
     }
 
-/// Drawing color setters ///
-
-    public void setColorAqua() {
-        shapeColor = new Color(0,255, 255);
-    }
-
-    public void setColorBlack() {
-        shapeColor = new Color(0, 0, 0);
-    }
-
-    public void setColorBlue() {
-        shapeColor = new Color(0, 0, 255);
-    }
-
-    public void setColorFuchsia() {
-        shapeColor = new Color(255, 0, 255);
-    }
-
-    public void setColorGray() {
-        shapeColor = new Color(128, 128, 128);
-    }
-
-    public void setColorGreen() {
-        shapeColor = new Color(0, 128, 0);
-    }
-
-    public void setColorLime() {
-        shapeColor = new Color(0, 255, 0);
-    }
-
-    public void setColorMaroon() {
-        shapeColor = new Color(128,0, 0);
-    }
-
-    public void setColorNavy() {
-        shapeColor = new Color(0, 0, 128);
+    public void setModeText(String string, int size) {
+        currentMode = Mode.TEXT;
+        textString = string;
+        textSize = size;
     }
 
-    public void setColorOlive() {
-        shapeColor = new Color(128, 128, 0);
-    }
-
-    public void setColorPurple() {
-        shapeColor = new Color(128, 0, 128);
-    }
-
-    public void setColorRed() {
-        shapeColor = new Color(255, 0, 0);
-    }
-
-    public void setColorSilver() {
-        shapeColor = new Color(192, 192, 192);
-    }
-
-    public void setColorTeal() {
-        shapeColor = new Color(0, 128, 128);
-    }
-
-    public void setColorWhite() {
-        shapeColor = new Color(255, 255, 255);
-    }
+/// Drawing color setters ///
 
-    public void setColorYellow() {
-        shapeColor = new Color(255, 255, 0);
-    }
+    public void setColor(Color color) {
+        shapeColor = color;
+    }
+
+/// Drawing stroke setter ///
+
+    public void setStroke(int size) {
+        lineStroke = new BasicStroke(size);
+    }
+
+    public void setEraserSize(int size) {
+        eraserSize = size;
+    }
+
+//
+///// Font setter ///
+//
+//    public void setText(String text, int size) {
+//
+//        textString = text;
+//        textSize = size;
+//
+//    }
+//
+//    public void setColorAqua() {
+//        shapeColor = new Color(0,255, 255);
+//    }
+//
+//    public void setColorBlack() {
+//        shapeColor = new Color(0, 0, 0);
+//    }
+//
+//    public void setColorBlue() {
+//        shapeColor = new Color(0, 0, 255);
+//    }
+//
+//    public void setColorFuchsia() {
+//        shapeColor = new Color(255, 0, 255);
+//    }
+//
+//    public void setColorGray() {
+//        shapeColor = new Color(128, 128, 128);
+//    }
+//
+//    public void setColorGreen() {
+//        shapeColor = new Color(0, 128, 0);
+//    }
+//
+//    public void setColorLime() {
+//        shapeColor = new Color(0, 255, 0);
+//    }
+//
+//    public void setColorMaroon() {
+//        shapeColor = new Color(128,0, 0);
+//    }
+//
+//    public void setColorNavy() {
+//        shapeColor = new Color(0, 0, 128);
+//    }
+//
+//    public void setColorOlive() {
+//        shapeColor = new Color(128, 128, 0);
+//    }
+//
+//    public void setColorPurple() {
+//        shapeColor = new Color(128, 0, 128);
+//    }
+//
+//    public void setColorRed() {
+//        shapeColor = new Color(255, 0, 0);
+//    }
+//
+//    public void setColorSilver() {
+//        shapeColor = new Color(192, 192, 192);
+//    }
+//
+//    public void setColorTeal() {
+//        shapeColor = new Color(0, 128, 128);
+//    }
+//
+//    public void setColorWhite() {
+//        shapeColor = new Color(255, 255, 255);
+//    }
+//
+//    public void setColorYellow() {
+//        shapeColor = new Color(255, 255, 0);
+//    }
 
 }
\ No newline at end of file