From 7a1d504443b96e3a624b92b7e5dd42db0ac091fe Mon Sep 17 00:00:00 2001
From: Hai HoDac <hhodac@student.unimelb.edu.au>
Date: Thu, 24 Oct 2019 23:20:49 +1100
Subject: [PATCH] fixed dragging line stroke uncomment all drawing relation
methods (EXCEPT the notifyUserDrawing)
---
src/GUI/DrawingArea.java | 1 +
src/server/DrawingController.java | 20 ++++++++++----------
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/GUI/DrawingArea.java b/src/GUI/DrawingArea.java
index 570ad5b..a670fea 100644
--- a/src/GUI/DrawingArea.java
+++ b/src/GUI/DrawingArea.java
@@ -116,6 +116,7 @@ public class DrawingArea extends JPanel implements MouseMotionListener, MouseLis
/// Eraser has no border color ///
Color borderColor = currentMode != Mode.ERASE ? shapeColor : Color.WHITE;
g2.setColor(borderColor);
+ g2.setStroke(lineStroke);
g2.draw(drawing);
}
}
diff --git a/src/server/DrawingController.java b/src/server/DrawingController.java
index ce95c36..efae67e 100644
--- a/src/server/DrawingController.java
+++ b/src/server/DrawingController.java
@@ -34,7 +34,7 @@ public class DrawingController extends UnicastRemoteObject implements IDrawingCo
@Override
public boolean broadcastText(String fromClient, String text, Font font, Color color, Point startPoint) throws RemoteException {
- System.out.print("Broadcasting drawing to everyone...");
+// System.out.print("Broadcasting drawing to everyone...");
g2 = (Graphics2D) bufferedImage.getGraphics();
g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
@@ -55,7 +55,7 @@ public class DrawingController extends UnicastRemoteObject implements IDrawingCo
}
}
- System.out.print("...DONE\n");
+// System.out.print("...DONE\n");
return true;
}
@@ -63,7 +63,7 @@ public class DrawingController extends UnicastRemoteObject implements IDrawingCo
@Override
public boolean broadcastDrawing(String fromClient, Shape drawing, String mode, Color color, int strokeSize) throws RemoteException {
- System.out.print("Broadcasting drawing to everyone...");
+// System.out.print("Broadcasting drawing to everyone...");
g2 = (Graphics2D) bufferedImage.getGraphics();
g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
@@ -97,13 +97,13 @@ public class DrawingController extends UnicastRemoteObject implements IDrawingCo
}
}
- System.out.print("...DONE\n");
+// System.out.print("...DONE\n");
return true;
}
public boolean broadcastDraggingDrawing(String fromClient, Shape drawing, String mode, Color color, int strokeSize) throws RemoteException {
- System.out.print("Broadcasting dragging drawing to everyone...");
+// System.out.print("Broadcasting dragging drawing to everyone...");
g2 = (Graphics2D) bufferedImage.getGraphics();
g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
@@ -137,13 +137,13 @@ public class DrawingController extends UnicastRemoteObject implements IDrawingCo
}
}
- System.out.print("...DONE\n");
+// System.out.print("...DONE\n");
return true;
}
public boolean broadcastClearCanvas(String fromClient) throws RemoteException {
- System.out.print("Broadcasting canvas clearance to everyone...");
+// System.out.print("Broadcasting canvas clearance to everyone...");
IDrawingUpdate client;
@@ -159,7 +159,7 @@ public class DrawingController extends UnicastRemoteObject implements IDrawingCo
}
}
- System.out.print("...DONE\n");
+// System.out.print("...DONE\n");
return true;
}
@@ -178,7 +178,7 @@ public class DrawingController extends UnicastRemoteObject implements IDrawingCo
public boolean broadcastUpdateImage(String fromClient) throws RemoteException {
- System.out.print("Broadcasting new image loading to everyone...");
+// System.out.print("Broadcasting new image loading to everyone...");
try {
@@ -206,7 +206,7 @@ public class DrawingController extends UnicastRemoteObject implements IDrawingCo
err.printStackTrace();
}
- System.out.print("...DONE\n");
+// System.out.print("...DONE\n");
return true;
}
--
GitLab